Page MenuHomeFreeBSD
Differential D15882

net/subnetcalc: update to 2.4.9
ClosedPublic
Actions

Authored by fernape on Jun 18 2018, 3:12 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 15, 2:54 AM
Unknown Object (File)
Mon, Apr 14, 10:58 AM
Unknown Object (File)
Mon, Apr 14, 4:50 AM
Unknown Object (File)
Mon, Apr 14, 1:00 AM
Unknown Object (File)
Mon, Apr 14, 12:21 AM
Unknown Object (File)
Sun, Apr 13, 11:48 PM
Unknown Object (File)
Sun, Apr 13, 10:33 PM
Unknown Object (File)
Tue, Mar 25, 2:12 AM
View All 84 Files
Subscribers
mat

Details

Reviewers
tcberner
tz
Commits
rP473848: net/subnetcalc: update to 2.4.9
Summary

Sent by freebsd_ports@k-worx.org in PR 229108

Awaiting maintainer (dreibh@iem.uni-due.de) approval

Test Plan
  • portlint -AC OK
  • poudriere builds for {10.4,11.1}{amd64,i386}, 12i386 OK
  • run test in 10.4 amd64 OK

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 17456
Build 17287: arc lint + arc unit

Event Timeline

fernape created this revision.Jun 18 2018, 3:12 PM
Herald added a subscriber: mat. · View Herald TranscriptJun 18 2018, 3:12 PM
Harbormaster completed remote builds in B17407: Diff 44005.Jun 18 2018, 3:12 PM
tcberner requested changes to this revision.Jun 18 2018, 6:03 PM
tcberner added inline comments.
net/subnetcalc/Makefile
17–18

^prefer cmake:outsource if it works

23

^ you should be able to just set CMAKE_INSTALL_MANDIR to something sensible instead of patching.

This revision now requires changes to proceed.Jun 18 2018, 6:03 PM
fernape updated this revision to Diff 44084.Jun 19 2018, 5:13 PM
  • Use outsource building
  • Use CMAKE_INSTALL_MANDIR* variables instead of post-patch
Harbormaster completed remote builds in B17449: Diff 44084.Jun 19 2018, 5:13 PM
tcberner added inline comments.Jun 19 2018, 5:43 PM
net/subnetcalc/Makefile
18

^once should be enough :) -- also, use "\" to break the line, and not add CMAKE_ARGS+= -- makes it more readable.

fernape updated this revision to Diff 44099.Jun 19 2018, 8:11 PM
  • Set DCMAKE_INSTALL_MANDIR only
Harbormaster completed remote builds in B17456: Diff 44099.Jun 19 2018, 8:11 PM
tcberner accepted this revision.Jun 21 2018, 4:39 PM
This revision is now accepted and ready to land.Jun 21 2018, 4:39 PM
Closed by commit rP473848: net/subnetcalc: update to 2.4.9 (authored by fernape). · Explain WhyJul 3 2018, 5:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
net/
subnetcalc/
8 lines
6 lines

Diff 44099

View Options

net/subnetcalc/Makefile

Show First 20 Lines • Show All 387 Lines • ▼ Show 20 Linesstart_all_aps(void)
pmap_invalidate_all(kernel_pmap); pmap_invalidate_all(kernel_pmap);
/* copy the AP 1st level boot code */ /* copy the AP 1st level boot code */
bcopy(mptramp_start, (void *)PHYS_TO_DMAP(boot_address), bootMP_size); bcopy(mptramp_start, (void *)PHYS_TO_DMAP(boot_address), bootMP_size);
if (bootverbose) if (bootverbose)
printf("AP boot address %#lx\n", boot_address); printf("AP boot address %#lx\n", boot_address);
/* save the current value of the warm-start vector */ /* save the current value of the warm-start vector */
if (!efi_boot) if (firmware_type != FW_UEFI)
kibUnsubmitted
Not Done
Inline Actions

In all that cases, check for == FW_BIOS, and not != FW_UEFI

kib: In all that cases, check for == FW_BIOS, and not != FW_UEFI
ehem_freebsd_m5p.comAuthorUnsubmitted
Done
Inline Actions

Same issue as above, #define efi_boot (firmware_type == FW_UEFI) would preserve existing logic. Now I can believe the current logic is wrong, but you're certain this is a correct change?

ehem_freebsd_m5p.com: Same issue as above, `#define efi_boot (firmware_type == FW_UEFI)` would preserve existing…
mpbioswarmvec = *((u_int32_t *) WARMBOOT_OFF); mpbioswarmvec = *((u_int32_t *) WARMBOOT_OFF);
outb(CMOS_REG, BIOS_RESET); outb(CMOS_REG, BIOS_RESET);
mpbiosreason = inb(CMOS_DATA); mpbiosreason = inb(CMOS_DATA);
/* setup a vector to our boot code */ /* setup a vector to our boot code */
if (!efi_boot) { if (firmware_type != FW_UEFI) {
*((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET;
*((volatile u_short *)WARMBOOT_SEG) = (boot_address >> 4); *((volatile u_short *)WARMBOOT_SEG) = (boot_address >> 4);
} }
outb(CMOS_REG, BIOS_RESET); outb(CMOS_REG, BIOS_RESET);
outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */
/* Relocate pcpu areas to the correct domain. */ /* Relocate pcpu areas to the correct domain. */
#ifdef NUMA #ifdef NUMA
Show All 30 Lines#endif
bootpcpu = &__pcpu[cpu]; bootpcpu = &__pcpu[cpu];
bootSTK = (char *)bootstacks[cpu] + bootSTK = (char *)bootstacks[cpu] +
kstack_pages * PAGE_SIZE - 8; kstack_pages * PAGE_SIZE - 8;
bootAP = cpu; bootAP = cpu;
/* attempt to start the Application Processor */ /* attempt to start the Application Processor */
if (!start_ap(apic_id, boot_address)) { if (!start_ap(apic_id, boot_address)) {
/* restore the warmstart vector */ /* restore the warmstart vector */
if (!efi_boot) if (firmware_type != FW_UEFI)
*(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec; *(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec;
panic("AP #%d (PHY# %d) failed!", cpu, apic_id); panic("AP #%d (PHY# %d) failed!", cpu, apic_id);
} }
CPU_SET(cpu, &all_cpus); /* record AP in CPU map */ CPU_SET(cpu, &all_cpus); /* record AP in CPU map */
} }
/* restore the warmstart vector */ /* restore the warmstart vector */
if (!efi_boot) if (firmware_type != FW_UEFI)
*(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec; *(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec;
outb(CMOS_REG, BIOS_RESET); outb(CMOS_REG, BIOS_RESET);
outb(CMOS_DATA, mpbiosreason); outb(CMOS_DATA, mpbiosreason);
/* Destroy transient 1:1 mapping */ /* Destroy transient 1:1 mapping */
kernel_pmap->pm_pmltop[0] = old_pml45; kernel_pmap->pm_pmltop[0] = old_pml45;
invlpg(0); invlpg(0);
▲ Show 20 Lines • Show All 642 Lines • Show Last 20 Lines
View Options

net/subnetcalc/distinfo

Show First 20 Lines • Show All 387 Lines • ▼ Show 20 Linesstart_all_aps(void)
pmap_invalidate_all(kernel_pmap); pmap_invalidate_all(kernel_pmap);
/* copy the AP 1st level boot code */ /* copy the AP 1st level boot code */
bcopy(mptramp_start, (void *)PHYS_TO_DMAP(boot_address), bootMP_size); bcopy(mptramp_start, (void *)PHYS_TO_DMAP(boot_address), bootMP_size);
if (bootverbose) if (bootverbose)
printf("AP boot address %#lx\n", boot_address); printf("AP boot address %#lx\n", boot_address);
/* save the current value of the warm-start vector */ /* save the current value of the warm-start vector */
if (!efi_boot) if (firmware_type != FW_UEFI)
kibUnsubmitted
Not Done
Inline Actions

In all that cases, check for == FW_BIOS, and not != FW_UEFI

kib: In all that cases, check for == FW_BIOS, and not != FW_UEFI
ehem_freebsd_m5p.comAuthorUnsubmitted
Done
Inline Actions

Same issue as above, #define efi_boot (firmware_type == FW_UEFI) would preserve existing logic. Now I can believe the current logic is wrong, but you're certain this is a correct change?

ehem_freebsd_m5p.com: Same issue as above, `#define efi_boot (firmware_type == FW_UEFI)` would preserve existing…
mpbioswarmvec = *((u_int32_t *) WARMBOOT_OFF); mpbioswarmvec = *((u_int32_t *) WARMBOOT_OFF);
outb(CMOS_REG, BIOS_RESET); outb(CMOS_REG, BIOS_RESET);
mpbiosreason = inb(CMOS_DATA); mpbiosreason = inb(CMOS_DATA);
/* setup a vector to our boot code */ /* setup a vector to our boot code */
if (!efi_boot) { if (firmware_type != FW_UEFI) {
*((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET;
*((volatile u_short *)WARMBOOT_SEG) = (boot_address >> 4); *((volatile u_short *)WARMBOOT_SEG) = (boot_address >> 4);
} }
outb(CMOS_REG, BIOS_RESET); outb(CMOS_REG, BIOS_RESET);
outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */
/* Relocate pcpu areas to the correct domain. */ /* Relocate pcpu areas to the correct domain. */
#ifdef NUMA #ifdef NUMA
Show All 30 Lines#endif
bootpcpu = &__pcpu[cpu]; bootpcpu = &__pcpu[cpu];
bootSTK = (char *)bootstacks[cpu] + bootSTK = (char *)bootstacks[cpu] +
kstack_pages * PAGE_SIZE - 8; kstack_pages * PAGE_SIZE - 8;
bootAP = cpu; bootAP = cpu;
/* attempt to start the Application Processor */ /* attempt to start the Application Processor */
if (!start_ap(apic_id, boot_address)) { if (!start_ap(apic_id, boot_address)) {
/* restore the warmstart vector */ /* restore the warmstart vector */
if (!efi_boot) if (firmware_type != FW_UEFI)
*(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec; *(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec;
panic("AP #%d (PHY# %d) failed!", cpu, apic_id); panic("AP #%d (PHY# %d) failed!", cpu, apic_id);
} }
CPU_SET(cpu, &all_cpus); /* record AP in CPU map */ CPU_SET(cpu, &all_cpus); /* record AP in CPU map */
} }
/* restore the warmstart vector */ /* restore the warmstart vector */
if (!efi_boot) if (firmware_type != FW_UEFI)
*(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec; *(u_int32_t *)WARMBOOT_OFF = mpbioswarmvec;
outb(CMOS_REG, BIOS_RESET); outb(CMOS_REG, BIOS_RESET);
outb(CMOS_DATA, mpbiosreason); outb(CMOS_DATA, mpbiosreason);
/* Destroy transient 1:1 mapping */ /* Destroy transient 1:1 mapping */
kernel_pmap->pm_pmltop[0] = old_pml45; kernel_pmap->pm_pmltop[0] = old_pml45;
invlpg(0); invlpg(0);
▲ Show 20 Lines • Show All 642 Lines • Show Last 20 Lines