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 RESEND] arm: topology: Consider clock-frequency property from parent /cpus node
Date:   Tue, 29 Nov 2022 08:57:11 +0100
Message-Id: <20221129075710.8407-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?gVxVFICDMIFlVQiyNUX/c3QPmxfFB4Svt7abkCyU4PsXX3v9vwhB548qyLjc?=
 =?us-ascii?Q?1Bb0JL+1rczGyNNVdX5BsczEHg5lbfe9O8y4tTPwUUa8q7PHg6SJzX4pA/8z?=
 =?us-ascii?Q?NGWF7dwzwokhGl12cpqLwnPI92aYK93bajaZZ2FdYm1ZSPHKNy10kFZ61BgP?=
 =?us-ascii?Q?uvOj5VsJp697eaTX1m57OG0Hy9gfxumXXn58uezNjlWup1z1Tk2R80Bwv/3g?=
 =?us-ascii?Q?r85OEnEmYB2vjmRIejUfuUEz/0/ujGv96KdvTGzpIkh94LTb2ncl2sROOU0T?=
 =?us-ascii?Q?cIlaE+HC5SakyK86T3XjAp0Gy0m9xYOXlct4BfDokNE68eUDmJaMm3Dt16Ig?=
 =?us-ascii?Q?Uj3l2dKkljwMUKUlckOiJCvK9V8MFlJIel/TcP8MBrz1fBrvWTfao5V64Ovg?=
 =?us-ascii?Q?TGYtHt0rcfZiHCFltRdOUF6izt0hu0yatDPshLSIamzxsGQoX89M0VN6F5Cl?=
 =?us-ascii?Q?v/QvNXO3DquI7qT3gd53QZpCLOAG4UCEN9QZb2+4iTQm/Je65qVUZr9grIj6?=
 =?us-ascii?Q?MLyRyoZ9mIhkvWVMRLCm+TU7DglKtua8WlciFT6ROzyuzKrhWFy5Dbl0j9GH?=
 =?us-ascii?Q?2CP5eQ9rhnK8tVniH7udwPIHExTg+xM0mfSoJFaVuM3spJqG/BHnfh6MkB/Q?=
 =?us-ascii?Q?nNfwU9ZWdcfen+qd9s4bFogKQ6rJ3h18fia2FgontYL4uQUNA97NUW3Ie3As?=
 =?us-ascii?Q?QqsYxq1z+NcGFuR0JfmESVjh7/wIJ3qJJPv76Am7wCke20CO7J8QDhGbbN/H?=
 =?us-ascii?Q?6EShWE7XaZWsFef7xa29mmjIAITzZ6q+rq0Y9B6ngjjCctM+Yx6j6A5hs9eF?=
 =?us-ascii?Q?njtqO/3+W2AzkZusFjtCd8EhUfC/nqx8lKa7DNuSM013b1HYnME3dQUhwGq3?=
 =?us-ascii?Q?K3NrNYeP9mtAQQuf+35ANLMCoFU+64S7tMEDqbJg+5WlDD5roc/TJtKow4Of?=
 =?us-ascii?Q?VnOfi7tzg4KFceROS8xVbe0gkYIkf7QlIz/kIMy/j6Lg/fm/faFt8MwLcziM?=
 =?us-ascii?Q?i8VsDlA24HnMqDjhoBmC8sbrf5XXIlAjE7n0hiye8mMLfQeVg1VD6PIaDlX0?=
 =?us-ascii?Q?prdAw456Q+RgOjPIP/Q5+mTX7jELd2J8666hKju+WwwYLMONHXGIWiCCtTZ6?=
 =?us-ascii?Q?EZAANrUJcskurlLRa5AOXtqKtmy/w7MNB3/3HD3R79pakzrR8fUxe8Ybg2QB?=
 =?us-ascii?Q?KZ7aOLs3qFKgH9aeOu2ayyTDNqzL8VoMUsrdI0FiVefdWOEizSYRpMCeBfRB?=
 =?us-ascii?Q?4CqhQpyscRWrYyCE45naddfaadpJJyDNZQoUTanRHO4qWAs+TukRRo/Tfpkj?=
 =?us-ascii?Q?HSMJmtP9w7fHUH+5eKmTBI5ikP+enGXihRyWMsFxrpAMwqh3qz++Kkq8z0Fc?=
 =?us-ascii?Q?x1LIsv/LGFCqprq8+t1LbsJrPq8FN+9v2BT8KFB3ocbuQXOpPIvgKLYFrACj?=
 =?us-ascii?Q?2tqcdspC276DkCOya9vlB17enADebXQ76nqrqw8uwI/QOovXxJqKc+L3u9bZ?=
 =?us-ascii?Q?zAPJumiymK2X8Ia4A7T3CJZE3A4KbTQFAVUQnZItEcpCJuazkjhUdRJgAAgS?=
 =?us-ascii?Q?mOz9caWlOGycjaD/sT7XOGVEo19gB0nvXm9xsC9NOzcg3DCoqk3SE7yd7iik?=
 =?us-ascii?Q?zw=3D=3D?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 52c2de65-ef9f-4453-8ecd-08dad1df7a1c
X-MS-Exchange-CrossTenant-AuthSource: AM7PR07MB6705.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2022 07:58:18.4044
 (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: /d/tv3L0t1CYCWBVGRL5ULgVHBW5JeLllU13oMdfSUswGKEpk4oGiEBdTpp0DnqROi6tO4Jq4WJLVNvetskjafuLD+K0794JYCNizxUqvas=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR07MB9599
X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE 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>
---
 arch/arm/kernel/topology.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index ef0058de432b..fe03f1426353 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -90,10 +90,20 @@ static void __init parse_dt_topology(void)
 	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);
 
+	cn = of_get_cpu_node(cpu, NULL);
+	if (!cn)
+		pr_err("missing device node for CPU %d\n", cpu);
+	cn = of_get_parent(cn);
+	if (!cn)
+		pr_err("missing parent node for CPU %d\n", cpu);
+	common_rate = of_get_property(cn, "clock-frequency", &common_rate_len);
+
 	for_each_possible_cpu(cpu) {
 		const __be32 *rate;
 		int len;
@@ -121,8 +131,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;
-- 
2.31.0