diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2016-04-01 08:47:23 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2016-04-01 08:47:23 +0000 |
| commit | 5c8e0b3bcb13ce71525b27ab2f20b079b86df0de (patch) | |
| tree | 877739349e48d14a0aa63fc9399ab3f51024d890 | |
| parent | 1ea448225c1d0c796da2db3106682a12ad0c5db0 (diff) | |
| download | src-test2-5c8e0b3bcb13ce71525b27ab2f20b079b86df0de.tar.gz src-test2-5c8e0b3bcb13ce71525b27ab2f20b079b86df0de.zip | |
Notes
| -rw-r--r-- | sys/x86/x86/local_apic.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 1fc085657bf0..82efae3a09ed 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -511,7 +511,7 @@ native_lapic_init(vm_paddr_t addr) } #ifdef SMP -#define LOOPS 1000000 +#define LOOPS 1000000 /* * Calibrate the busy loop waiting for IPI ack in xAPIC mode. * lapic_ipi_wait_mult contains the number of iterations which @@ -535,7 +535,7 @@ native_lapic_init(vm_paddr_t addr) r2 = r * 1000000; lapic_ipi_wait_mult = r1 >= r2 ? r1 / r2 : 1; if (bootverbose) { - printf("LAPIC: ipi_wait() us multiplier %jd (r %jd tsc %jd)\n", + printf("LAPIC: ipi_wait() us multiplier %ju (r %ju tsc %ju)\n", (uintmax_t)lapic_ipi_wait_mult, (uintmax_t)r, (uintmax_t)tsc_freq); } @@ -1762,14 +1762,13 @@ SYSINIT(apic_setup_io, SI_SUB_INTR, SI_ORDER_THIRD, apic_setup_io, NULL); static int native_lapic_ipi_wait(int delay) { - uint64_t i, counter; + uint64_t rx; /* LAPIC_ICR.APIC_DELSTAT_MASK is undefined in x2APIC mode */ if (x2apic_mode) return (1); - counter = lapic_ipi_wait_mult * delay; - for (i = 0; delay == -1 || i < counter; i++) { + for (rx = 0; delay == -1 || rx < lapic_ipi_wait_mult * delay; rx++) { if ((lapic_read_icr_lo() & APIC_DELSTAT_MASK) == APIC_DELSTAT_IDLE) return (1); |