From nobody Tue Feb 18 15:24:20 2025 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 4Yy3GY0vf5z5nlr2; Tue, 18 Feb 2025 15:24:21 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yy3GY0GfNz3cGR; Tue, 18 Feb 2025 15:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739892261; 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=0Axla0jrxwxrm8PkNTcy1eIi1JacOJW5JYOVmWhuRZk=; b=bjz7U+hD3TyK5LqGJvSNjdwkMgr9Xi4qqXetKr1VkeVq+Fr5EIP7EA0je5qB4j1TMCT5Sh z4MQFq1y32AGyTvGk4YSDjkiEpanfqayKdgQcZtT0BS0qOMBz0YWaJA8tw/ToSuz3hrR+m RhmZRrQii97DZ7O7EvMhY9fAvpMMD2sG/OFuVZvN6zpx8oEeOBSaUSuN5vWOnj6W9Cacne q2SfgK6+8MkPK3Crfu5Ji7x3kTHRuvbioHqvTEZH593XO8mllpXuC/odA2gt3KxP//oa9h 9SbzBCy/jAcsS8oY1KrPMDljmyrbW1veMFqeRGCXYidlDGWsKsitxO25/ziLpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739892261; a=rsa-sha256; cv=none; b=gDN2M5QQk7E73Ecli4+e10kkFQRptePOgMkinS8Rjd1lM9ypmioQj4t/gk+Wr9RD1yF54x DKZYv0c6RwupYaf1YFMmiE8wscBX+y8nIjoxP8pzPfHR0HPAR8jp5/0TTsVk9z+C9SEqPa DDSiWrVIzSdTnu9126psLQ1aKxgHQXAgjEgQe9sG4N14wImpBb0y/mNYZjNdNnSC2D7DMN 9jFw5z8tNIT5iAVYtQnqR7NolfGFqpUwBwBG7j5CEsCdiRvxAmCPTDQYxBHPQPtA86FZqE ArX0sQROzSaW+4VyQBFFbJfhqD+LMLj6H4e/Nhkp2MfPcM2rRWJOZJQS+7q3Fw== 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=1739892261; 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=0Axla0jrxwxrm8PkNTcy1eIi1JacOJW5JYOVmWhuRZk=; b=aT8+q6v7moP/nVUcb5BcX59uSIKmz2WLZUR3ILjecHtJZ9WQLUxHNYpD+WQNgHsj0fLmyb p16EYO0X1qo3roiNVW7Df8eKsyRXruD1H+beHKr89kirpHgtxqqGnQrs0kxMV2H9KeL3tx sGaFPn0FKCWCYiRK3xVpZqDevriKs5iJHuRlr5CNPf3t/H5tlZONug4cH4qdlJjpIKHS26 FP0VPYksUs1Z/8gixWonfzojMoJIywKJZ3cLTC0QpSyPwL84YqwKN2oQcAt/69VclcKbF2 rGfGS6eXURfUc2r7Sy0xjbUpsIezA8Cruc/jcirDfnqjLK+bCKZsrmu6xhcz7g== 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 4Yy3GX6FZnz8wB; Tue, 18 Feb 2025 15:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51IFOKON059170; Tue, 18 Feb 2025 15:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IFOKUq059167; Tue, 18 Feb 2025 15:24:20 GMT (envelope-from git) Date: Tue, 18 Feb 2025 15:24:20 GMT Message-Id: <202502181524.51IFOKUq059167@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: 904510b2ac56 - stable/13 - powerpc: Remove flag CTLFLAG_TUN from sysctl knob hw.platform 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 904510b2ac56900be976dbe739cfb64cb3d37a24 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=904510b2ac56900be976dbe739cfb64cb3d37a24 commit 904510b2ac56900be976dbe739cfb64cb3d37a24 Author: Zhenlei Huang AuthorDate: 2025-02-13 14:42:45 +0000 Commit: Zhenlei Huang CommitDate: 2025-02-18 15:23:37 +0000 powerpc: Remove flag CTLFLAG_TUN from sysctl knob hw.platform Prior to change [1] this flag is useless but harmless. After the change plat_name[] will be fetched from kernel environment after invoking the platform probe function `platform_probe_and_attach()`. The probe function runs at early boot stage prior to `mi_startup()` thus it is too late and pointless to set plat_name[] after the probe. Nathan mentioned that the logic to specify the platform pre-dates the powerpc64 work, and is from the original pre-FDT Book-E bringup from like 2008, so it's irrelevant these days. Instead of fixing setting the sysctl knob hw.platform, let's clean it up now. [1] 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag to ... Discussed with: nwhitehorn Reviewed by: olce (previous version), jhibbits, #powerpc MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D48897 (cherry picked from commit b61fbbed73ea3bf0c84589b56cca160c46a3739d) (cherry picked from commit 7775f4c5c75221cd9b2aadf12fb1d9a329c08be4) --- sys/powerpc/powerpc/platform.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c index 0d1ab792abef..4d21ddd36b77 100644 --- a/sys/powerpc/powerpc/platform.c +++ b/sys/powerpc/powerpc/platform.c @@ -65,9 +65,9 @@ static platform_t plat_obj; static struct kobj_ops plat_kernel_kops; static struct platform_kobj plat_kernel_obj; -static char plat_name[64] = ""; -SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RDTUN, - plat_name, 0, "Platform currently in use"); +static char plat_name[64]; +SYSCTL_CONST_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD, plat_name, + "Platform currently in use"); static struct mem_affinity mem_info[VM_PHYSSEG_MAX + 1]; static int vm_locality_table[MAXMEMDOM * MAXMEMDOM]; @@ -364,16 +364,7 @@ platform_probe_and_attach() if (prio > 0) continue; - /* - * Check if this module was specifically requested through - * the loader tunable we provide. - */ - if (strcmp(platp->name,plat_name) == 0) { - plat_def_impl = platp; - break; - } - - /* Otherwise, see if it is better than our current best */ + /* See if it is better than our current best */ if (plat_def_impl == NULL || prio > best_prio) { best_prio = prio; plat_def_impl = platp;