From nobody Tue Oct 24 14:37:49 2023 X-Original-To: dev-commits-src-branches@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 4SFF5n5Dzcz4y6vj; Tue, 24 Oct 2023 14:37:49 +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 4SFF5n3Hxdz4lVF; Tue, 24 Oct 2023 14:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698158269; 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=vHRfU4Vm+3bGQMru1d32EpuV6FRc7cba7msqkXoFmAc=; b=hnvEj+QiDOsZx1qnev4p2/PXguRpJcMEnxXHskT/EFLxiKoUK+84okLWAtsaQqmci8e3P/ vSDsmwYS2s4GAjZUZDtYliBBCDRQixbd1QzwjYvwvIePuTo4dnOiHk7y0IXaGS0MpGMnSf eWaH00RR4FXrL61hhy+00taB74MlxstqQkiDAu2gBR0O2Zus8DxNq/X1PAoC5BbLIgMq3+ 9jguNenyaOFnnE9FORBfnzFoHl69qhjTRxqH7LhGzMRc10b7iC5LW6427lm6KeYsRDGr5P uH6E+0c+kkqn2Ki2my1U5nqbaUESNL36RWMH7x7dUF8zZ9tdZUVZMOzFty0hmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698158269; a=rsa-sha256; cv=none; b=uzIdlzbpOLBbD3e4QiEbYHGe7o3GQ2uXmif/S2bi/VXUpx/nhZOLjpYpaxnyNiIPi4lT9Q YVcKbnMjSAxZp4uUc22dWABCsRMamFBaV62JO63W10RIZ+oBljL/PRm4nqJ4IQNbyxvAWD t/eq3XewmnfCmKV84saugJ9ZtbUyJ3x3bXeWrS4VJDn8uqvBS4COV1Mg8nRqLuHqSmW6px Z+FHhCeA1/9b9Y8vW3QRnsBTZS6NuA16RarUYVvtPeSR6u/f88D9tNycOdvoHH+ChBOSle TOQEGbLeTB2o+84hcbpzgI1dDPqjamvfKlHJsRe6gp0MKnCnuBGaMNxyu0gPOQ== 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=1698158269; 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=vHRfU4Vm+3bGQMru1d32EpuV6FRc7cba7msqkXoFmAc=; b=ycQ4usdn6ziYU+nh3He4l5CR+owTuhHg+3vgWvg8XjAFB1w5gz7mqlBsnSrymdSP9QOBQW ju/hqwIaJVpgZM+q2Ywhm8EbadxsCS1wku7cvgjrKp1oxYWDDmN96o4fy64n/IP/MC3j1c CEG3b1BZyVGyD3mCKyJjT2gX+6xRABsh2guAFB3sGcrPut4yGbprPL8YFhHsUVTPpWJz9s ctbVNG5eNepQL4BluIdXpV7CTxIlXyeX5YnXy5PcqZ+lVjYeGc9JeEObk3loXzwojEMNVG by+rSheCZ+YF46SMCjch8UoUX1ve6OTGgLtVRVpf5L9MSf7Uh3VYEQjhgSR2Lg== 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 4SFF5n27RYzBy7; Tue, 24 Oct 2023 14:37:49 +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 39OEbnh9089811; Tue, 24 Oct 2023 14:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OEbnjS089808; Tue, 24 Oct 2023 14:37:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 14:37:49 GMT Message-Id: <202310241437.39OEbnjS089808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 62d60fad87db - releng/14.0 - x86: Prefer consistent naming for loader tunables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 62d60fad87dbb65cfd0088c424c6f66e36d566c4 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=62d60fad87dbb65cfd0088c424c6f66e36d566c4 commit 62d60fad87dbb65cfd0088c424c6f66e36d566c4 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 14:35:52 +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 Approved by: re (gjb) 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 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 b382368cc626..012aa1e9a836 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); }