From nobody Tue Oct 24 04:44:50 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 4SDzxZ4Pscz4xV9m; Tue, 24 Oct 2023 04:44:50 +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 4SDzxZ2QqDz3KGQ; Tue, 24 Oct 2023 04:44:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122690; 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=25fsae4AP4TwSUeimUU0J91xcyLO7b7kKTX+6Euy70E=; b=nacJ8hOQUw8c+mLKnHGXsGGXRvAIbGw/wfqTAjUnK9wkdSZ5zukHS5P3Kjy0+DO4YMJP6d 7Mu6MxnnDS+1c4AgGnsmQSA7xFfiNwZMznxxCoTc62fDJ2QO+pmEsZoOUmyjw5YkSLMZks qLmc7F6NwqTwUfi14V0TOmAV/WDBGUx2cEcltCjmEV2C9MBTE5OedKMF6LmDL0zvlPSs5X Y8jSOYnDbu4Wo4+84LaWV7t2r38wlBua9A+EpF2Zc7mNDhQi3Zl5M2EEX0Uf/UNh78XHVP zgL1fD1pCAJDo3tMUpcTzuk88QiqV3csHiTQ6Adnj5DdrsWxcTLJz+criqm0oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122690; a=rsa-sha256; cv=none; b=PaJ55ImgHEJ8y5Ds7pMX8aupksczE/FmYLHrS21bq4B7vFRbklvDGzHigZK6qkv50GQeai t9FsmOzuyOzWEAw3vy2LuRBs7920DuTuxmEzHUGoWCdYFUun/A2HJG0pHIe+PORyc9vxo5 oPMDJzAtp6J7+qKTsQKM6ErNvdUyhUAfF2jxyTr2F2noRq7S1f0h4OFC3rXft8VckdOANp TskSe1v0p5c0iazqSVxcwX+5kIqaiQySaHHxCOlE2MKDAazC/lWP3qI+LHEXm/Hf06WRvz c5ca+dhWlzxGL/BpXs3aC0+d8pkW8z8WwFlG6LsBRYkcZyksmJkPj8S0IUax3Q== 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=1698122690; 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=25fsae4AP4TwSUeimUU0J91xcyLO7b7kKTX+6Euy70E=; b=iBrou6qITeOcCk7KzbGSQQDj+QKmEW5qzY5JsCgYrxBoAmdF4BNUEqkOjpwSYO+EFnvUiY rXH4IuzN94Ew39b/hq7AJPY15R+ZpzIX40xGwE55Rq9joxVKlbij5/GHNkVqsr3TXWXWXg PQVqNF7NUQjiKkC3ZEDi/3I892ZTPEByTKSu+RvVpa2YWJgkYxXL2pPqlx1q4Ysrf3prYp rSqgBlwwq89M4K9fgBRvaEpQFhlOUgEdUjH+PfXYZPIJOzjhA3W4kN9WlvSxgw6vUk4ram HUfj04WW+ifzWAVMnERURvLjRJBjmuPS+xhTeYWo8wwsTidftLnYMEbt54wydw== 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 4SDzxZ1X1lz18NS; Tue, 24 Oct 2023 04:44:50 +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 39O4iog0005077; Tue, 24 Oct 2023 04:44:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4iopg005075; Tue, 24 Oct 2023 04:44:50 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:44:50 GMT Message-Id: <202310240444.39O4iopg005075@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: 8ca5539ae1e6 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8ca5539ae1e693709553729edd7e34b90d734a85 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8ca5539ae1e693709553729edd7e34b90d734a85 commit 8ca5539ae1e693709553729edd7e34b90d734a85 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang 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); }