Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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 v3] arm: topology: Consider clock-frequency property from parent /cpus node
Date:   Wed, 26 Apr 2023 16:19:01 +0200
Message-Id: <20230426141901.10671-1-stefan.wiehler@nokia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hemtgnt4vb2tGqBCZWId8NQAOcBZNgLCUcPgImg6Kx0Jf7q/DhY/U4wHk5Ix?=
 =?us-ascii?Q?RhpawruiaqHAtlw4Ghdg5LzJSOGHRePdy7U1mgFVjox3RXI2q+tuU6/EeXwf?=
 =?us-ascii?Q?2tMvgmBFzSyXH0ZZKuZ2PlgnLQna4k+es5OxYVcxFU1GiHat1X/+uLY+FXLM?=
 =?us-ascii?Q?koKVIiNwTfTAyTgxJbg+fj1jANo1WHCr5Y6Kwd6sIkb5KiTvN6icjyZrClJb?=
 =?us-ascii?Q?0uLpzw3FWuoYNiIvqllxUOzzM23KrIQLGWoZex7hLpfPdap7D5n0u14U+TDS?=
 =?us-ascii?Q?piMvR3wn5EiYVA8xAbVeg2EhWY11NCp/TcPMWAzPP3JPX4/4+6yjyzg682A1?=
 =?us-ascii?Q?7tqPyL46PToU3CpAYb2JwyB2yOaHnWy3Z874YFjQdv11XDkUGpEs0rwRjNls?=
 =?us-ascii?Q?wRmLsAHctBXNClph5hzIeQdH/EMI8Iu04UeWuicaK+TSu6d41Jnj7UnjatNx?=
 =?us-ascii?Q?UEg83UirGJDl7Avq4/V3JZb2Xua4KZbDVF/FIpKwAyNM67+E9a+akpjGGhFs?=
 =?us-ascii?Q?9ve3+dVaQnHpNzhtPenoqLdcip3dpApM9KLW5Cf096iIKyo0EaLwttfbrwaN?=
 =?us-ascii?Q?lWKWO2BrxPepDHV7M9Hr0C1z5izEIkzsmtf712xTQ4cTTBY8gzXiD52fNS0O?=
 =?us-ascii?Q?X+dct8dMB3XAStv60c2UkHy1JcReNjDxMNTowUwR9VZw4aJ52C1kvIECOPaH?=
 =?us-ascii?Q?9vwfCq0OshhkDboCWrLOCbfZWmkN1RlLhPtsL8qxQVKa9aqfjoyGLu8VVgYE?=
 =?us-ascii?Q?yphV5sx0aEwpxEi/OwURhTa3WLNc9GdpUWK+ZEuSmsa+Fun3S9L6YLa5NHkj?=
 =?us-ascii?Q?f/fpYKjEWYU2QZhsa1rj8VtHKnpaGhc9BXE6m0imn70MI1IQORRIvHBKrCj7?=
 =?us-ascii?Q?El9gWJQFblgheswGFibMAf/zh0UQr0e+A+KR1IomC4Vl51gnU4z5NuPU6ZtZ?=
 =?us-ascii?Q?hCIkq3pfuLQ2Ekwr/+o2inHpxDKxLcAWPZyEenKVpUJN7PJlhJ09zcNiXkLH?=
 =?us-ascii?Q?lgHicFDKOrEtCqbSlv3orPDxwxXiUd6fmwKmVJTT+1xFs06mLX4E9RYraDyG?=
 =?us-ascii?Q?1nzgqBzlmW2th74kaRLJoKSf6+AlaEzc+zVUbNXB5pJqr8Q8j//bRxQ0Vn7V?=
 =?us-ascii?Q?usJpSkPFOtjxg23lH9SZt2SEJyT8L8FognpZscUjT9ihg4TYWXgxmDMampUX?=
 =?us-ascii?Q?eWMtgJtlSSusxEtfHK1sZ/93IWs36zl4QIGh+WWosVPY0ERpaCVqCp77/XBV?=
 =?us-ascii?Q?tXEmOmiBDenBb8T13DG9VEhChBX3GBwPSmIRSjxA3UdSi2DGDoBiAalutZCO?=
 =?us-ascii?Q?MF54XddhCkmvZf63Ig1Sp+1z07UB4oqpdeRH967Hcsch+NY591IZykr7VWA2?=
 =?us-ascii?Q?0LXMjwd44LpqA1hovX5xiuSsfWCTr149ZNoRqOvxovcjDiTgGyuHINA5aEAz?=
 =?us-ascii?Q?ou04cwi0cJId01SpG8w7KXea7yqhTDuqNl6BiaCo6V6h3AbPErTVA444kolS?=
 =?us-ascii?Q?GEbLtx0lk0RLQuQirCokJlx97ciIn8xlYf+HPHbvjlWMwqPjiq1IfDtNQ+3V?=
 =?us-ascii?Q?tRqMVWai2qIwRcsaNwbNfPwtuKAUUGzK3Ht8k3h39Ci9ofuK/hWfEVpcFPGn?=
 =?us-ascii?Q?VQ=3D=3D?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7738a223-ad52-46dc-4f6d-08db4661385c
X-MS-Exchange-CrossTenant-AuthSource: AM7PR07MB6705.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 14:19:17.5823
 (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: 5BITT8N8zJQXY/XVMFD7wYdwAYVue/AW3TV3SpgppFzqUsei6z8OrsXqH/VADuG4HduL6eL9v2K0/T0Tb+c7KxMTS95Sa8mr4vXAn95Nft4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR07MB8150
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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>
---
- Refactored /cpus node lookup
- Add missing node refcount decrement via of_node_put(); of_get_property() does
not need it
- Track lifetime of /cpus node separately
---
 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.31.0