git: 8ca5539ae1e6 - stable/13 - x86: Prefer consistent naming for loader tunables

The branch stable/13 has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=8ca5539ae1e693709553729edd7e34b90d734a85

commit 8ca5539ae1e693709553729edd7e34b90d734a85
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2023-10-17 07:05:25 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2023-10-24 04:43:56 +0000

    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)
---
 sys/x86/acpica/madt.c     | 2 +-
 sys/x86/iommu/intel_drv.c | 2 +-
 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 e63fd86a7c9b..6da4b23901a2 100644
--- a/sys/x86/acpica/madt.c
+++ b/sys/x86/acpica/madt.c
@@ -224,7 +224,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 72c6d5b7df44..6aa1c9d090cf 100644
--- a/sys/x86/iommu/intel_drv.c
+++ b/sys/x86/iommu/intel_drv.c
@@ -429,7 +429,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 68468110e522..15a69c207a98 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -568,7 +568,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);
 		}
 
@@ -601,7 +601,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);
 	}