Received-SPF: pass (google.com: domain of linux-kernel+bounces-17849-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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: Fri,  5 Jan 2024 14:00:50 +0100
Message-ID: <20240105130114.3499559-1-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?0ypJ2AyHbLm8lruwpXg1sxkP29jPycmDmcfqb4qc01qRPHDvSgBRciltKLil?=
 =?us-ascii?Q?s9Hsxq9hoKpJIcCvVHDu4PfaBDqpuXttaxh7HJE4/B5g5yLJBwNY3yAMH7l7?=
 =?us-ascii?Q?VMLPxCGtckHPZ+0OYz0PqV8ZouaePaYllJPXaiqY601WXQu1v06nGza0GnZ4?=
 =?us-ascii?Q?+1PWy3VbgBp5XnUOUzn38ZnowvUnznvp+OvMj2xKKnoF/90IvyOdh2NwRskH?=
 =?us-ascii?Q?ILyfFyMZx/QbrOXkrNDM7B0gIR8JcMaXutKmHjDQ3Sed6nUqBPBBaqxBbyEx?=
 =?us-ascii?Q?P1J6pskt+yBAi8GC4q2ALSl9YAF4JcxyBk1JPX+4fu345ta+uQtcxa51nZrb?=
 =?us-ascii?Q?2m1w/ZK00aGdpGRzmVQMnuItW/NlfLTqIaWtDknSU5xo8KBGCkeyCthg/AU3?=
 =?us-ascii?Q?QarhBuQttJKYYzNxLG2UrPD3AwX64gsi3qvNSWpnqjvfMuUXdEkqufP4zAPk?=
 =?us-ascii?Q?43azfmr1Wrh69nNsPwIAfHwmO+bzDPGlg80mofj+O9BG2vMBBVCXfValYiAr?=
 =?us-ascii?Q?+U5/xWW4RXKr53orU5CWQqe2FmqWd9PerwOs1VQ6EoVvs/pC/hK3WClAwW2B?=
 =?us-ascii?Q?5tWlzV21N9WQu7/iyXV8nEheSL68UZDx2NP0NXVo1oXIvtLjOo+5j8rRClyD?=
 =?us-ascii?Q?mRH+FFwr6vGckAnzsKmXGlmGEvJLXfbqSguGEUbv8JuejbALGZpBncQQ5kc5?=
 =?us-ascii?Q?YjLXx/VWnXiPxzKxuHu8vuLxIJGLnGX/CM+BG0DfuZKvfRKdu+A/5UT/Gled?=
 =?us-ascii?Q?/O985oTh3PcU9RmhRnZ1kPz7jxvJTkFHlsjjWV/7xbPtnYI9tHxYuB4LUThs?=
 =?us-ascii?Q?MS9hG01LgFtzHgxGtj5YHQN8YWbAjiUxVgrs5ZC3ELEeDUBIui/tSAMbBdi4?=
 =?us-ascii?Q?TUL59xaBJjueTxS2T3/l+2uVKYEC8iSvfyWnIQDl7NvjzsgN+UYMtLFf9D8m?=
 =?us-ascii?Q?V9SMw1BwjNhPT62dXQ2WE5thK9BG+x3vXvmC1Hnj11iK2bAm7J0YOf8dVaiv?=
 =?us-ascii?Q?PDQXFz5E+EsEVhJ9GAA4WgzTAHpuyaupqWb3P/NuDvyuTsfGLcdUbK86eIwl?=
 =?us-ascii?Q?hlulLi6EVND7942sU7XEoApPijM0SQmBvk595d1eXgI+5aaEClq+gjyLBQXn?=
 =?us-ascii?Q?BIbpVxmBaWhGDePuvRaUauU1moee5/iSCw87NYy3FE8RhYflUaynl95oR7Yy?=
 =?us-ascii?Q?M9tx2naG0ApRrc+81sJgT6N25i8PLxmBJol9ovLRHzQku0o9kXb3rXCQ74HB?=
 =?us-ascii?Q?vqrK0aWfE0CMLUTROoU+ANx5ckqYeJQcgLfR6t5Y/dl3Hlo88BsirzYjgcLM?=
 =?us-ascii?Q?BWdyhsC0G1TW2f6n/SSmjauJcXNrjxOWmMsveJDBoLu+bngzxdhc6h75qW97?=
 =?us-ascii?Q?VQPN5P6CeDcrsqSVEPBpJidQ2V6IYU8YUBY1+a7xRWH9NjDjFIJZRkqEPN2G?=
 =?us-ascii?Q?Im5pvhyHbHwcp8ZsJHoa7UoBlp1r6KMHh7cPJUQsicUNsU1y57B3REpYeR4z?=
 =?us-ascii?Q?J2tp3Rj7gCFjL4Qi9rYK09i8XTyxZfnD00rtNF9U39603HCRofv6NgarvbJA?=
 =?us-ascii?Q?DHtSx7etbaY1pPjPdGqS+vTvc/N9PwqFptAFf1i4pT+li9kqp042gtowspiW?=
 =?us-ascii?Q?/w=3D=3D?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4ef32067-f961-4c10-6d4a-08dc0dee73c9
X-MS-Exchange-CrossTenant-AuthSource: AM7PR07MB6705.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2024 13:01:37.6852
 (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: eVcm1vLkXj6JKu96VRvLulOfDmSuXAXttu0cfBpzkei6CPvU6Wiez2fDO6tLUHG99e21CaoOsF0NZRoTJqvSFdu0i9fuZawp10tYww4xuX0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR07MB6552

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