Received-SPF: pass (google.com: domain of linux-kernel+bounces-48142-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Stefan Wiehler <stefan.wiehler@nokia.com>
To: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Stefan Wiehler <stefan.wiehler@nokia.com>
Subject: [PATCH RESEND] arm: topology: Fix missing clock-frequency property warning
Date: Thu,  1 Feb 2024 13:36:06 +0100
Message-ID: <20240201123605.3037829-2-stefan.wiehler@nokia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?M5yE5GRioq03tPzu+n6LghJFQuVMW9Z1jApzmgYBJ+9iVgiqPE3I+c7q9gJy?=
 =?us-ascii?Q?LvtpL/Ep2OvaOCGP3HZVJlNkWX0sD6PRDdW8QSkioB2PEQVBv6t8yGikBm7E?=
 =?us-ascii?Q?uFUaq3BtgzqCKZulDVdVtC4P9MBXadKfLeYrgv5Zn+pqGCKVn1XFNdl6VIU3?=
 =?us-ascii?Q?6eHHhG00RMTewa0DFD9eP8OAYscbX6P47VfdbtwTHLrAV0a4mKvCN/kOd2Zr?=
 =?us-ascii?Q?UAJUdJLkFYW4oYb+esRaeOFgIHB7GAMPB3NFAUSbNnCReSO4Ivf75/y2WOgY?=
 =?us-ascii?Q?B64S4DsNucHqYiewPCX9Pl2kzxan83/6lzJMXm51I3Soq6ns1inQIxH77Nam?=
 =?us-ascii?Q?bnmQvLbfKneEz8pY2ttHBZyRBfzgwESM7eTdCfE4Bk4MOBtC3BCtMOWN4C5G?=
 =?us-ascii?Q?swELTeQjFD2IHGUMaWM71bp+o6X5cScOxUOU77DPHKzumuTo1SRiT+tNNfcv?=
 =?us-ascii?Q?tgv1t6q4tCNXoARYTVkvjMNADKQbS/zlYhoicX8TpUG/owoz/nfRGwInhSOB?=
 =?us-ascii?Q?w8nTlMza8T4TPLbXMQkRPEUW0gbhHxP3ZAFqbkDtWt7dK8uScFLkIpr81DXN?=
 =?us-ascii?Q?MBq93EHcl3FCFb7H35W9lFix0m2OefBSOnUY593xF3DYoUj+tSngwnyAd9GR?=
 =?us-ascii?Q?TCdTb0Hp4fy7A8lTdMhaoWqM34O5u8OX9dZdiPnQsT72IaBhifxsfSaR4au2?=
 =?us-ascii?Q?4Pfn+pIYijetIWovKX1oMvUYh3WfSoRAog2uPD91jpXpwoVCh6O8PESmTwRD?=
 =?us-ascii?Q?3dDB5vi/8G9E/94hPoEAWyBY2tL+aF8vC/34e8WIs/TvVviZsu4DWARLCb36?=
 =?us-ascii?Q?J8cSKqVJaBlj9psUkBNcn+ERZTQCCokp5SvCYSVdKr0nJkcBIURqq/bu0Pmd?=
 =?us-ascii?Q?0a+x4xi8MkXZNz/pE8IwqP2SEnHZKqwJYQypWor2TWrgQnrIYJrn1qJ8HyhS?=
 =?us-ascii?Q?UML8/X5S63Lwrzy5whzou9RLQB+u8vpPqbyIibC5bJ1v8YaoR26RTmYGBpED?=
 =?us-ascii?Q?I5bME51w0tJ0QsW00Y5drXRiLRbxGRnAc8kjU3Ht64vKQDHVdSWPRr54HAVZ?=
 =?us-ascii?Q?9C9yyqYbe1Q2hrGWpAGky7fIlZJfwMZqNInc/uTf4th3s2bHmyccKArfvcbc?=
 =?us-ascii?Q?oEe2Rv6Ew9084ub795LT5wlmD9LmflLOxNrTcaX7i6RWX2hSEusWoLvVyafb?=
 =?us-ascii?Q?+iBQXn+NpOeiIRXzNDYoriMWWUDM+NEXei8Z0fH4/+5VVtuHOEB9+gpCHHe7?=
 =?us-ascii?Q?QT4+dIXUqCDmrkcuRdUp3bauPjSMtCwyCjGNdYUQbW1adf+jHa3zSnaiuViR?=
 =?us-ascii?Q?K/wML2riKEKGV41EPaniPsj8A/T5OpiaMLwVSImyWnQx9RyHr5CcnGN8gG8h?=
 =?us-ascii?Q?HyGoXJDHEiygXHCKgfBsTtWn35N1AifcdFbR4k2I3gmeMKmOeqpBYzXcoj3+?=
 =?us-ascii?Q?Os15OxXmILNkXtL8xqlwl2PMIWXtB+bpcmKG4szrWdHZRYjsZgERsTtV7MJv?=
 =?us-ascii?Q?TpkM8rgXYrETRxRTXkw1AqUE48XHO6r2RwXwQgEx1uSguO13J46GRt3kaDgr?=
 =?us-ascii?Q?XGIrDRDy5fg2nZasOkHhmGYoY4GMCRHMHpPJmCiXoy//YT8eCvyJO13JRcsp?=
 =?us-ascii?Q?TA=3D=3D?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 02824d18-236d-4f11-8dd6-08dc23227bc4
X-MS-Exchange-CrossTenant-AuthSource: PAWPR07MB9688.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2024 12:36:59.3113
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jvcqXyKJS/rXDWNZebNpGxU5hFvAOhG3HtzKYvsJBwcY8+tNOlietosqVe7I5jSwT8Id7da4jHru3iVBdG82LZcOb+wRQQtVWvwa42mdtxA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR07MB6694

If the clock-frequency property is not set in the cpu node but in the
parent /cpus node, the following warning is emitted:

  /cpus/cpu@X missing clock-frequency property

The devicetree specification in section 3.8 however specifies that
"properties that have identical values across cpu nodes may be placed in
the /cpus node instead.  A client program must first examine a specific cpu
node, but if an expected property is not found then it should look at the
parent /cpus node."

Signed-off-by: Stefan Wiehler <stefan.wiehler@nokia.com>
---
 arch/arm/kernel/topology.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index ef0058de432b..32fc1c8d9d11 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -85,15 +85,24 @@ static bool cap_from_dt = true;
 static void __init parse_dt_topology(void)
 {
 	const struct cpu_efficiency *cpu_eff;
-	struct device_node *cn = NULL;
+	struct device_node *pcn = NULL, *cn = NULL;
 	unsigned long min_capacity = ULONG_MAX;
 	unsigned long max_capacity = 0;
 	unsigned long capacity = 0;
 	int cpu = 0;
+	const __be32 *common_rate;
+	int common_rate_len;
 
 	__cpu_capacity = kcalloc(nr_cpu_ids, sizeof(*__cpu_capacity),
 				 GFP_NOWAIT);
 
+	pcn = of_find_node_by_path("/cpus");
+	if (!pcn) {
+		pr_err("missing CPU root device node\n");
+		return;
+	}
+	common_rate = of_get_property(pcn, "clock-frequency", &common_rate_len);
+
 	for_each_possible_cpu(cpu) {
 		const __be32 *rate;
 		int len;
@@ -121,8 +130,12 @@ static void __init parse_dt_topology(void)
 
 		rate = of_get_property(cn, "clock-frequency", &len);
 		if (!rate || len != 4) {
-			pr_err("%pOF missing clock-frequency property\n", cn);
-			continue;
+			if (common_rate && common_rate_len == 4) {
+				rate = common_rate;
+			} else {
+				pr_err("%pOF missing clock-frequency property\n", cn);
+				continue;
+			}
 		}
 
 		capacity = ((be32_to_cpup(rate)) >> 20) * cpu_eff->efficiency;
@@ -154,6 +167,8 @@ static void __init parse_dt_topology(void)
 
 	if (cap_from_dt)
 		topology_normalize_cpu_scale();
+
+	of_node_put(pcn);
 }
 
 /*
-- 
2.42.0