From nobody Tue Oct 24 04:40:49 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 4SDzrx5NGJz4xTw7; Tue, 24 Oct 2023 04:40: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 4SDzrx4HPgz3HTL; Tue, 24 Oct 2023 04:40:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698122449; 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=27HTRIz0qe9QIBjaUtPegGB99uaeB40hDM8hMEIZ92s=; b=BM3T049+ui+Wp+9AYOYONyCoYif9lkzLr9AXslK0T4NU7r6XJHD+Q9/vQglwrfNXPlU1zw 5jvsuJ7F9YyYF57pr0bHwfK2xYnycrcL/Hsq3ifJCPXCs44QZOt7KSkuBY+u6W/gJym8o+ SUIt3r953mNf3IWmeYMCa5UxcqpjfgnhjoRO0CyYhFNocX3tqa2F8of255VSHrvf42uH1Y jxpbY2row57p2sQ3kvrEDAs1m4jEemroC2xqVJAJ7VX+P5GQXXU8KhpOSRDFarmj3j2933 OhacBiTrH1rtoBxAiguil7b4peuCazmwJhELl3eE8mFYtsSt0f5x3YMppF3iLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698122449; a=rsa-sha256; cv=none; b=YbGmFruiv37rzw9pEMuBZJs6cZkH/8f/xYRcDvowDiiymEsv0SrDHBEN+Ne/3ijzTuGVvf IRVEha9zfiD4UfgMZTT5nMd/zHQIPpDxREV6+IwSuEfAq1Ppz03SoE53vlCeT2jipTrDaJ TAVyJwnHGus3fvrfbk93ZdpdSRumb6IWL/BoMC4jVklvwf3p4wYB6tEHUJMWUB104qL8Kb h6IucUVd9TqkaIycdb1HLQP7Jz+DRNdmwJn0vL5lnssqyKhNt+XbaUVG4BKHlf5JHK/J2u ogNwzNO3AJVhf21yg3WS/o8p4vYyIkgq1JYVBrT/Xu0IIlHTRxfrcXim/2ogTQ== 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=1698122449; 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=27HTRIz0qe9QIBjaUtPegGB99uaeB40hDM8hMEIZ92s=; b=o+fNIkWe7KWfoQLb/pgc+5MkXdmHaw3Jyv/ro2JwKWViY106UCaP+GU9U4jYEpFELLF+Se PgRFVIlVXFZVlBF2JhOWr2rwoll9B/fDdDTo4120Y5aWYNW1aQNVhSHzMNRqKMgqImmoC7 I2G1jwQvULf/VsrhGbUAEyXGWiych3FstrFSon3tG0oCFkYn/LtUZaGwalDYzq0DJ7nZTC J7fjfPrFZEs8rzpM7dfMjUxpZwjpQKDlZLLnvk/lbnIBRpiKq2g5ROy+tg2HFHvy/rtiaq U5MsXsKbkCyXfYdFDA6js5QjQglDV72m53NQ9g8oz/Qd4ebpxyBM3CzIcLCvqg== 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 4SDzrx2w1Yz17xy; Tue, 24 Oct 2023 04:40: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 39O4ento099500; Tue, 24 Oct 2023 04:40:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O4ensG099497; Tue, 24 Oct 2023 04:40:49 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:40:49 GMT Message-Id: <202310240440.39O4ensG099497@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: 6cd7e3d118f2 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76 commit 6cd7e3d118f247a8f6bc0f8162a9cb67155b7c76 Author: Zhenlei Huang AuthorDate: 2023-10-17 07:05:25 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-24 04:39:32 +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) --- 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); }