From nobody Sat Oct 21 01:32:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SC3qH501Kz4xFl0; Sat, 21 Oct 2023 01:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SC3qH4X5Jz3Y5y; Sat, 21 Oct 2023 01:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3YjTWwZC7Ec5tGLAXAq4cAfjdX8IwZCw28r3FVSby0=; b=ZMMK/Hr/ODJO0oO7hPDJVqfiHuAKBhnHN9ecTRXLfl5b4SJfEvvp9L3htfkGjVisVym7cH DOwZGoGpnfLXXa8w2x8tweZBTLLG6a6RGYsj20+KdUNFpTNs3eeelWYzNJrdsocMHTXbWX FDzfgAYOT+UsvD3A3PMkXEs1MdPuFKjV6H1jtatgoFsEBZSKBbcDZBc+aDCFtPQuANqF0I MWvHhGnpqVq5QIOAsd9iJvOseT0q5tPh4X2lXp79qKWC/ZCR5S2aqhKwCKw207aqh0VSzW zvcFTcm+6wVxirejgCGvpesB2w8ST/ne+QDkPPLekV8B/1kX3Iv0ryfgEbe72Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697851963; a=rsa-sha256; cv=none; b=oQJxva7Whsbh6yi/6M14JwzUrdDRLlzfREQ7L9aZf71zn7mW4ectu0t3Wh2nfzoKVx12sP reBk7z5fRmQGNAgeGOMhybmMp5BiKWRnyT56jLSZwIxf4hIVQtpa7uQRtdXlpTxMI8Tkwb YoO+yOyFaCoPnEKeQzn2wfhEshfuuCJJtX3VxIgFnGSzo29vq63AVherw8NyepHOmOar2K 4/Bgb3uNPhlrSd61owgKFwnTJ1gItvDgmoFR5li90XvvGrhoKdxXNvbzRJi1QkuWYNqb7Q 3wxkNgm0tL1mjJdbe3LGdjPq2JhvOcoNuzxA3NJO/kXK9nYqD6Sv4hh7eBMI8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697851963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G3YjTWwZC7Ec5tGLAXAq4cAfjdX8IwZCw28r3FVSby0=; b=dbFYywknbgwitv82bG4nuEmhugpydqNi7VwBL4azZx7mEDjPDq4bwjUBtlyLzGHQlM6GCp BIeNPTXrDzzY/IZ/HWc/TVqMdOWYRQRRY/TANj1IWRcIGcOH+nqQjZnnJp5VMDmC0EmVAk cS2UWKwmFoF3GGpsMHd3WdYqC5Ivw7WiJqu5vRX5X9JXb2jJykKnDIJ/co5wMrF7P19z79 5vyvjzlzgA1WjdxwlZj3g3FqqBFg2fDVOiceqSi8E+m6miV0V9WwVQO8ce0eJmJebeBw23 PtGG84jLalq2F2uhh5+uJPecOjNZCU0Vxp/Tw47q4FusBR8388LoN1Sm34X1FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SC3qH3dvzzwcG; Sat, 21 Oct 2023 01:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39L1WhRE088552; Sat, 21 Oct 2023 01:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39L1Wh7R088549; Sat, 21 Oct 2023 01:32:43 GMT (envelope-from git) Date: Sat, 21 Oct 2023 01:32:43 GMT Message-Id: <202310210132.39L1Wh7R088549@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 12cce5994b92 - main - x86: Prefer consistent naming for loader tunables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12cce5994b92f8235f379d660ccb28da8e69f55b Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=12cce5994b92f8235f379d660ccb28da8e69f55b commit 12cce5994b92f8235f379d660ccb28da8e69f55b Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-21 01:31:58 +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 --- 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 3d7c5a67375b..200eec1fbb28 100644 --- a/sys/x86/acpica/madt.c +++ b/sys/x86/acpica/madt.c @@ -221,7 +221,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 a5821df6b835..ebdf24976504 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 43fe4625cd08..6a913883cc5c 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -493,7 +493,7 @@ 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); } @@ -526,7 +526,7 @@ 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); }