On Tue, Oct 25, 2022 at 02:24:24PM -0700, James J. Lippard wrote:
> I'm one of several people experiencing this issue with OpenBSD 7.2 on
> VMware ESXi 7.5. Scott C. has given me help in trying to track the issue
> down; a patched -current kernel to remove the acpi_delay code added in
> 7.2 makes the issue go away.
Thanks for your report.
I have one more patch for you to try. Attached at the end. Hopefully
it will confirm the root problem. Send the resulting dmesg and we'll
see whether the problem is actually the acpitimer(4).
> Below is output from sysctl machdep, sysctl hw, and dmesg:
>
> [...]
> machdep.tscfreq=1900013052
> machdep.invarianttsc=1
This is probably the true TSC frequency...
> sysctl hw:
> hw.machine=amd64
> hw.model=Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz
... it would match the nominal CPU frequency listed in the CPU string.
I'm going to snip some of these dmesgs for reference, too.
> dmesg (which includes 7.1, post-upgrade, and with patched -current
> kernel):
>
> OpenBSD 7.1 (GENERIC.MP) #3: Sun May 15 10:27:01 MDT 2022
>
> r...@syspatch-71-amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 6424494080 (6126MB)
> avail mem = 6212485120 (5924MB)
> random: good seed from bootblocks
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xe0010 (242 entries)
> bios0: vendor Phoenix Technologies LTD version "6.00" date 11/12/2020
> bios0: VMware, Inc. VMware Virtual Platform
> acpi0 at bios0: ACPI 4.0
> acpi0: sleep states S0 S1 S4 S5
> acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
> acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3)
> S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3)
> PE50(S3) S1F0(S3) [...]
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 1899.75 MHz, 06-56-03
> cpu0:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu0: 256KB 64b/line 8-way L2 cache
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
> cpu0: apic clock running at 65MHz
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 1899.62 MHz, 06-56-03
> cpu1:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu1: 256KB 64b/line 8-way L2 cache
> cpu1: disabling user TSC (skew=-2507)
> cpu1: smt 0, core 0, package 2
> ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 24 pins
> acpimcfg0 at acpi0
> acpimcfg0: addr 0xf0000000, bus 0-127
> acpihpet0 at acpi0: 14318179 Hz
7.1-release. This dmesg worked right.
> OpenBSD 7.2 (GENERIC.MP) #758: Tue Sep 27 11:57:54 MDT 2022
> dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 6424494080 (6126MB)
> avail mem = 6212378624 (5924MB)
> random: good seed from bootblocks
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xe0010 (242 entries)
> bios0: vendor Phoenix Technologies LTD version "6.00" date 11/12/2020
> bios0: VMware, Inc. VMware Virtual Platform
> acpi0 at bios0: ACPI 4.0
> acpi0: sleep states S0 S1 S4 S5
> acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
> acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3)
> S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3)
> PE50(S3) S1F0(S3) [...]
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 586.43 MHz, 06-56-03
> cpu0:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB
> 64b/line 8-way L2 cache, 9MB 64b/line 12-way L3 cache
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
> cpu0: apic clock running at 20MHz
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 578.34 MHz, 06-56-03
> cpu1:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB
> 64b/line 8-way L2 cache, 9MB 64b/line 12-way L3 cache
> cpu1: smt 0, core 0, package 2
> ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 24 pins
> acpimcfg0 at acpi0
> acpimcfg0: addr 0xf0000000, bus 0-127
> acpihpet0 at acpi0: 14318179 Hz
7.2-release. This dmesg shows the problem.
> OpenBSD 7.2-current (GENERIC.MP) #0: Thu Oct 20 23:15:55 MST 2022
> r...@chaos.int.discord.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 6424494080 (6126MB)
> avail mem = 6212366336 (5924MB)
> random: good seed from bootblocks
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xe0010 (242 entries)
> bios0: vendor Phoenix Technologies LTD version "6.00" date 11/12/2020
> bios0: VMware, Inc. VMware Virtual Platform
> acpi0 at bios0: ACPI 4.0
> acpi0: sleep states S0 S1 S4 S5
> acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
> acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3)
> S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3)
> PE50(S3) S1F0(S3) [...]
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> delay_init: changing delay implementation: 0 -> 1000
> acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> tsc: using RDTSCP instead of LFENCE;RDTSC
> cpu0: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 589.50 MHz, 06-56-03
> cpu0:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB
> 64b/line 8-way L2 cache, 9MB 64b/line 12-way L3 cache
> tsc: calibrating with acpitimer0(1000): 3579545 Hz
> tsc: acpitimer0: calibration round 1: 357998 ticks (100012us) -> 591017127 Hz
> tsc: acpitimer0: calibration round 2: 358005 ticks (100014us) -> 586193942 Hz
> tsc: acpitimer0: calibration round 3: 358012 ticks (100016us) -> 595784934 Hz
> tsc: using calibrated frequency: 586193942 Hz
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
> cpu0: apic clock running at 20MHz
> delay_init: changing delay implementation: 1000 -> 3000
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 580.92 MHz, 06-56-03
> cpu1:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB
> 64b/line 8-way L2 cache, 9MB 64b/line 12-way L3 cache
> cpu1: smt 0, core 0, package 2
> ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 24 pins
> acpimcfg0 at acpi0
> acpimcfg0: addr 0xf0000000, bus 0-127
> acpihpet0 at acpi0: 14318179 Hz
> tsc: calibrating with acpihpet0(1000): 14318179 Hz
> tsc: acpihpet0: calibration round 1: 437669 ticks (30567us) (failed)
> tsc: acpihpet0: calibration round 2: 437688 ticks (30568us) (failed)
> tsc: acpihpet0: calibration round 3: 437680 ticks (30568us) (failed)
7.3-current. The first patch we tried.
> OpenBSD 7.2-current (GENERIC.MP) #0: Mon Oct 24 11:17:30 MST 2022
> r...@chaos.int.discord.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> real mem = 6424494080 (6126MB)
> avail mem = 6212358144 (5924MB)
> random: good seed from bootblocks
> mpath0 at root
> scsibus0 at mpath0: 256 targets
> mainbus0 at root
> bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xe0010 (242 entries)
> bios0: vendor Phoenix Technologies LTD version "6.00" date 11/12/2020
> bios0: VMware, Inc. VMware Virtual Platform
> acpi0 at bios0: ACPI 4.0
> acpi0: sleep states S0 S1 S4 S5
> acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
> acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3)
> S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3)
> PE50(S3) S1F0(S3) [...]
> acpitimer0 at acpi0: 3579545 Hz, 24 bits
> acpitimerattach: 11684664 11218419149
> [...]
> acpitimerattach: 11706635 11222287880
> acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
> cpu0 at mainbus0: apid 0 (boot processor)
> cpu0: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 1899.78 MHz, 06-56-03
> cpu0:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB
> 64b/line 8-way L2 cache, 9MB 64b/line 12-way L3 cache
> measure_tsc_freq: calibrating with acpitimer0(1000), 3579545 Hz: count
> 12968274 13326197 tsc 11899750466 12089733765 usecs 99991: 1900003990 Hz
> measure_tsc_freq: calibrating with acpitimer0(1000), 3579545 Hz: count
> 13332087 13690005 tsc 12092860208 12282840782 usecs 99989: 1900014741 Hz
> measure_tsc_freq: calibrating with acpitimer0(1000), 3579545 Hz: count
> 13696131 14054050 tsc 12286092061 12476073119 usecs 99990: 1900000580 Hz
> cpu0: smt 0, core 0, package 0
> mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
> cpu0: apic clock running at 65MHz
> delay_init: changing delay implementation: 0 -> 3000
> cpu1 at mainbus0: apid 2 (application processor)
> cpu1: Intel(R) Xeon(R) CPU D-1528 @ 1.90GHz, 1899.75 MHz, 06-56-03
> cpu1:
> FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,FMA3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,MOVBE,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,RDTSCP,LONG,LAHF,ABM,3DNOWP,PERF,ITSC,FSGSBASE,TSC_ADJUST,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,RDSEED,ADX,SMAP,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,XSAVEOPT,MELTDOWN
> cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB
> 64b/line 8-way L2 cache, 9MB 64b/line 12-way L3 cache
> cpu1: smt 0, core 0, package 2
> ioapic0 at mainbus0: apid 1 pa 0xfec00000, version 20, 24 pins
> acpimcfg0 at acpi0
> acpimcfg0: addr 0xf0000000, bus 0-127
> acpihpet0 at acpi0: 14318179 Hz
> measure_tsc_freq: calibrating with acpihpet0(1000), 14318179 Hz: count 6847
> 1438392 tsc 14642719381 14832683300 usecs 99980: 1900019193 Hz
> measure_tsc_freq: calibrating with acpihpet0(1000), 14318179 Hz: count
> 1451036 2882581 tsc 14834360798 15024324625 usecs 99980: 1900018273 Hz
> measure_tsc_freq: calibrating with acpihpet0(1000), 14318179 Hz: count
> 2894462 4326005 tsc 15025901064 15215864369 usecs 99980: 1900013052 Hz
7.3-current again. The second patch.
Okay, here is the third patch. Revert the earlier one and boot this.
Index: arch/amd64/amd64/machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/machdep.c,v
retrieving revision 1.281
diff -u -p -r1.281 machdep.c
--- arch/amd64/amd64/machdep.c 16 Oct 2022 15:03:39 -0000 1.281
+++ arch/amd64/amd64/machdep.c 26 Oct 2022 02:17:58 -0000
@@ -2094,6 +2094,8 @@ delay_init(void(*fn)(int), int fn_qualit
{
static int cur_quality = 0;
if (fn_quality > cur_quality) {
+ printf("%s: changing delay implementation: %d -> %d\n",
+ __func__, cur_quality, fn_quality);
delay_func = fn;
cur_quality = fn_quality;
}
Index: arch/amd64/amd64/tsc.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/tsc.c,v
retrieving revision 1.30
diff -u -p -r1.30 tsc.c
--- arch/amd64/amd64/tsc.c 24 Oct 2022 00:56:33 -0000 1.30
+++ arch/amd64/amd64/tsc.c 26 Oct 2022 02:17:58 -0000
@@ -243,6 +243,9 @@ measure_tsc_freq(struct timecounter *tc)
delay_usec = 100000;
for (i = 0; i < 3; i++) {
+ printf("%s: indirect calibration with %s(%d), %llu Hz: ",
+ __func__, tc->tc_name, tc->tc_quality, tc->tc_frequency);
+
s = intr_disable();
err1 = get_tsc_and_timecount(tc, &tsc1, &count1);
@@ -251,19 +254,48 @@ measure_tsc_freq(struct timecounter *tc)
intr_restore(s);
- if (err1 || err2)
+ printf("count %llu %llu tsc %llu %llu ",
+ count1, count2, tsc1, tsc2);
+ if (err1 || err2) {
+ printf("(failed)\n");
continue;
+ }
usec = calculate_tc_delay(tc, count1, count2);
+ printf("usecs %d: ", usec);
if ((usec < (delay_usec - RECALIBRATE_DELAY_THRESHOLD)) ||
- (usec > (delay_usec + RECALIBRATE_DELAY_THRESHOLD)))
+ (usec > (delay_usec + RECALIBRATE_DELAY_THRESHOLD))) {
+ printf("(failed)\n");
continue;
+ }
frequency = calculate_tsc_freq(tsc1, tsc2, usec);
+ printf("%llu Hz\n", frequency);
min_freq = MIN(min_freq, frequency);
success++;
+
+ printf("%s: direct calibration with %s(%d), %llu Hz: ",
+ __func__, tc->tc_name, tc->tc_quality, tc->tc_frequency);
+ uint64_t cnt_max, cnt_total = 0, tsc_total = 0;
+ uint32_t cnt1, cnt2;
+
+ cnt_max = tc->tc_frequency / 10; /* 100K usecs */
+ cnt2 = tc->tc_get_timecount(tc) & tc->tc_counter_mask;
+ tsc2 = tsc_rdtsc();
+ while (cnt_total < cnt_max) {
+ CPU_BUSY_CYCLE();
+ cnt1 = cnt2;
+ tsc1 = tsc2;
+ cnt2 = tc->tc_get_timecount(tc) & tc->tc_counter_mask;
+ tsc2 = tsc_rdtsc();
+ cnt_total += (cnt2 - cnt1) & tc->tc_counter_mask;
+ tsc_total += tsc2 - tsc1;
+ }
+ printf("cycles %llu tsc %llu: %llu Hz\n",
+ cnt_total, tsc_total,
+ tsc_total * tc->tc_frequency / cnt_total);
}
return (success > 1 ? min_freq : 0);
Index: dev/acpi/acpitimer.c
===================================================================
RCS file: /cvs/src/sys/dev/acpi/acpitimer.c,v
retrieving revision 1.16
diff -u -p -r1.16 acpitimer.c
--- dev/acpi/acpitimer.c 25 Aug 2022 17:43:34 -0000 1.16
+++ dev/acpi/acpitimer.c 26 Oct 2022 02:17:58 -0000
@@ -102,8 +102,6 @@ acpitimerattach(struct device *parent, s
acpi_timecounter.tc_name = sc->sc_dev.dv_xname;
tc_init(&acpi_timecounter);
- delay_init(acpitimer_delay, 1000);
-
#if defined(__amd64__)
extern void cpu_recalibrate_tsc(struct timecounter *);
cpu_recalibrate_tsc(&acpi_timecounter);
Index: dev/acpi/acpihpet.c
===================================================================
RCS file: /cvs/src/sys/dev/acpi/acpihpet.c,v
retrieving revision 1.29
diff -u -p -r1.29 acpihpet.c
--- dev/acpi/acpihpet.c 12 Sep 2022 10:58:05 -0000 1.29
+++ dev/acpi/acpihpet.c 26 Oct 2022 02:17:58 -0000
@@ -269,8 +269,6 @@ acpihpet_attach(struct device *parent, s
hpet_timecounter.tc_name = sc->sc_dev.dv_xname;
tc_init(&hpet_timecounter);
- delay_init(acpihpet_delay, 2000);
-
#if defined(__amd64__)
extern void cpu_recalibrate_tsc(struct timecounter *);
cpu_recalibrate_tsc(&hpet_timecounter);
