diff options
| author | Zhenlei Huang <zlei@FreeBSD.org> | 2023-10-17 07:05:25 +0000 |
|---|---|---|
| committer | Zhenlei Huang <zlei@FreeBSD.org> | 2023-10-24 04:46:31 +0000 |
| commit | 71f147c60771fb4d6cbab2833c1206e007305044 (patch) | |
| tree | 7b851f47553d6afc216d7e81b34a840ae714d0e2 | |
| parent | 180695b8e6434891c418cfdde9a32eee8c8fb6f0 (diff) | |
| download | src-71f147c60771fb4d6cbab2833c1206e007305044.tar.gz src-71f147c60771fb4d6cbab2833c1206e007305044.zip | |
x86: Prefer consistent naming for loader tunables
The following loader tunables do have corresponding sysctl MIBs but
with inconsistent naming. That may be historical reason. Let's prefer
consistent naming for them so that it will be easier to maintain.
1. hw.dmar.timeout -> hw.iommu.dmar.timeout
2. hw.lapic_eoi_suppression -> hw.apic.eoi_suppression
3. hw.lapic_tsc_deadline -> hw.apic.timer_tsc_deadline
4. hw.x2apic_enable -> hw.apic.x2apic_mode
Those tunables are for field debugging, no need to keep old names for
compatibility.
Reviewed by: kib
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D42248
(cherry picked from commit 12cce5994b92f8235f379d660ccb28da8e69f55b)
(cherry picked from commit 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76)
(cherry picked from commit 8ca5539ae1e693709553729edd7e34b90d734a85)
| -rw-r--r-- | sys/x86/acpica/madt.c | 2 | ||||
| -rw-r--r-- | sys/x86/iommu/intel_drv.c | 2 | ||||
| -rw-r--r-- | sys/x86/x86/local_apic.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c index 5c1e5b9f8848..33ba0cf8af20 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -203,7 +203,7 @@ madt_setup_local(void) else if (bootverbose) printf("x2APIC available but disabled %s\n", reason); user_x2apic = x2apic_mode; - TUNABLE_INT_FETCH("hw.x2apic_enable", &user_x2apic); + TUNABLE_INT_FETCH("hw.apic.x2apic_mode", &user_x2apic); if (user_x2apic != x2apic_mode) { if (bios_x2apic && !user_x2apic) printf("x2APIC disabled by tunable and " diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 02daa05b0cad..cab3e4882433 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -433,7 +433,7 @@ dmar_attach(device_t dev) dmar_quirks_post_ident(unit); timeout = dmar_get_timeout(); - TUNABLE_UINT64_FETCH("hw.dmar.timeout", &timeout); + TUNABLE_UINT64_FETCH("hw.iommu.dmar.timeout", &timeout); dmar_update_timeout(timeout); for (i = 0; i < DMAR_INTR_TOTAL; i++) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index 759c1ae8625a..99c7299bd3b9 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -556,7 +556,7 @@ native_lapic_init(vm_paddr_t addr) (cpu_feature2 & CPUID2_TSCDLT) != 0 && tsc_is_invariant && tsc_freq != 0) { lapic_timer_tsc_deadline = 1; - TUNABLE_INT_FETCH("hw.lapic_tsc_deadline", + TUNABLE_INT_FETCH("hw.apic.timer_tsc_deadline", &lapic_timer_tsc_deadline); } @@ -589,7 +589,7 @@ native_lapic_init(vm_paddr_t addr) "KVM -- disabling lapic eoi suppression\n"); lapic_eoi_suppression = 0; } - TUNABLE_INT_FETCH("hw.lapic_eoi_suppression", + TUNABLE_INT_FETCH("hw.apic.eoi_suppression", &lapic_eoi_suppression); } |