From nobody Thu Jan 11 14:32:33 2024 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 4T9nFF6CZvz567cc; Thu, 11 Jan 2024 14:32:33 +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 4T9nFF4JMxz4SYZ; Thu, 11 Jan 2024 14:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983553; 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=9HyqWhEJOhP/vsQhSje2AEs5MyO8/MjEwfMvArjcRWw=; b=yHRYThn68qZuPKARYd9lo+BY8P73iFyJczl+PIupZ6wrY9lxLgnmoAdtOWMpTECiJsSgWd fBMVUmFnrd/fY6FYjD7EGDC94XUw9EtmtaE3xdDSEXWtuzUZuLt77/hYYa7sUgEUSqxFLR cebulJMjisTDVlbarGPRI+INW7ns7AlmU5ryzs50P/Ng+8GEv/dfE91p9tdDtdqgFOC20k TVUI3B9lsMMuf38WHKNLLR0452o2XxnAGXdBl+dZ8IPx0WsG9hFXOy04NEBL1oc/CpEYJU dvBQgxmP4Y3WJgKXdXYYKrhn9oLXOpaorHszoNZqcXgBWZ/W7Y8HS3GhOjSdDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704983553; 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=9HyqWhEJOhP/vsQhSje2AEs5MyO8/MjEwfMvArjcRWw=; b=qAETwSeWCGBTknECn524eNtF6KmLFwTN0O611yb4qs8aEWJXVoSOKBSTPe6Kw25zJgNq5c qODpzgjaXEmExNKayLoA8TQUn/FwDxVbUf1T3nQ5rl9cxSvMI6Hz7KY1iMtFHrYv0zoeqi e1Fb8babRFZJovmkC7wa9821wAuFQ/nDcusnQxlCZM8qE8hdsyzYqdukUyhebgYSILAIDt aYQfZmLEOAj792mH6S9wUWgk98Q8v23PhUa7yREFc8Yqd4YCH1pbzllPYnzta2+kXoCe/j Vq8Q0A9JjP5tGRRK+uVaARh4Hcvea0uWXc67uSeaPPk1DZJwBnCatLbK5QEJCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704983553; a=rsa-sha256; cv=none; b=ui5OeiBwO9qdF63CbeamyBvrUFyuYPlz2skZZ+J+GUJ9yooyy2iNO3S2yrusJco/BBO2ck wnn5Azq5Nq7aw9YvKQ6Oeqq1xHzWcSKvfZ0vt0xmQ4kDbJlmPTk0IHwQQUnsu11yCbpWGe nxPQFgQY3cRHzm5yC/3jRJAr2QejvwPQag7VD5zxW0bOckNrC1VUCDPjQMfnm2MlVrjWzg m7/vUWUzpN78nyW/z7+wEJsvpdiMwQnU+aMKkIcRyYGDp4JuBLai4UUw41kHIhXyqSjkeU 9Gk2O8n8MftaViM84Dm1JcspcAkxfrrh98brHoaxT4ZiacRQs+aQS3KcseQY/Q== 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 4T9nFF3PXzzMdr; Thu, 11 Jan 2024 14:32:33 +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 40BEWX0D024112; Thu, 11 Jan 2024 14:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BEWXjb024109; Thu, 11 Jan 2024 14:32:33 GMT (envelope-from git) Date: Thu, 11 Jan 2024 14:32:33 GMT Message-Id: <202401111432.40BEWXjb024109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e24406084951 - stable/14 - identcpu: Let the hw.model be readable in capability mode 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e24406084951373757e55687377b08c08b21a488 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e24406084951373757e55687377b08c08b21a488 commit e24406084951373757e55687377b08c08b21a488 Author: Mark Johnston AuthorDate: 2024-01-04 13:26:53 +0000 Commit: Mark Johnston CommitDate: 2024-01-11 14:19:08 +0000 identcpu: Let the hw.model be readable in capability mode On some platforms this static information can be derived directly from the CPU, and there doesn't seem much use in restricting it. Reviewed by: emaste, imp, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43281 (cherry picked from commit 0aba5dd2af57ea3ae90eb49d7745c4c5b6f0ab6b) --- sys/arm/arm/identcpu-v6.c | 2 +- sys/arm64/arm64/identcpu.c | 2 +- sys/powerpc/powerpc/cpu.c | 2 +- sys/x86/x86/identcpu.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm/arm/identcpu-v6.c b/sys/arm/arm/identcpu-v6.c index 1302d24daf02..6293a5ccaceb 100644 --- a/sys/arm/arm/identcpu-v6.c +++ b/sys/arm/arm/identcpu-v6.c @@ -56,7 +56,7 @@ SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD, machine, 0, "Machine class"); static char cpu_model[64]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_CAPRD, cpu_model, sizeof(cpu_model), "Machine model"); static char hw_buf[81]; diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index fced2ffab258..698a98e3da1d 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -107,7 +107,7 @@ SYSCTL_PROC(_hw, HW_MACHINE, machine, CTLTYPE_STRING | CTLFLAG_RD | "Machine class"); static char cpu_model[64]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_CAPRD, cpu_model, sizeof(cpu_model), "Machine model"); #define MAX_CACHES 8 /* Maximum number of caches supported diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c index 518623af9de4..19907e3973e7 100644 --- a/sys/powerpc/powerpc/cpu.c +++ b/sys/powerpc/powerpc/cpu.c @@ -239,7 +239,7 @@ static void cpu_6xx_print_cacheinfo(u_int, uint16_t); static int cpu_feature_bit(SYSCTL_HANDLER_ARGS); static char model[64]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, model, 0, ""); +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_CAPRD, model, 0, ""); static const struct cputab *cput; diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 7fa35bd50244..3163053a123f 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -158,7 +158,7 @@ SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD | CTLFLAG_CAPRD, #endif char cpu_model[128]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_MPSAFE, +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD | CTLFLAG_CAPRD | CTLFLAG_MPSAFE, cpu_model, 0, "Machine model"); static int hw_clockrate;