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 RESENDv2] arm: topology: Consider clock-frequency property from parent /cpus node
Date:   Fri, 16 Dec 2022 13:41:58 +0100
Message-Id: <20221216124157.13270-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?1IqxEPT7XrNJWe22pp6Su5rzhrimZq2O5zMsSaseFPHabg66YG9i8mkT/QwJ?=
 =?us-ascii?Q?z/dbMMG0+tshu/QT84HudLVfwPCDR0FIXSBFiHw6cykC5gLpShHQy0VwKzNe?=
 =?us-ascii?Q?DcJjUc3/hZKg2gO1c9WlNXTrEyx4Xoj6dasmC1XaF+jiPI7b5xfsc4YLbf4a?=
 =?us-ascii?Q?XkgFdNuqRuTYISUZR9Byo1PVopdxd5109JawdANAKO4Agdbjl+At92w2TYre?=
 =?us-ascii?Q?k6boQk7aUf34r+OdXf2CqH8B2aOunxO0/2paNQEEgIay52Cunw1WpJFnKzpW?=
 =?us-ascii?Q?PE8MN2G2b9LcmdjFJ3ywe3UQCj4JEpcsGAZQzIonDPUu9zsgP0HEXwBFOqlI?=
 =?us-ascii?Q?kIajkqSGJeaqwikR9Tqvb1CQda1Afno3xV9JwmUpoMljdtgo0DWOsub1wdcN?=
 =?us-ascii?Q?S32yL4Fi9u27EKQgloWCgZVw/14UHdhz9KzjRoBz/5yVkV3vREzo9K6I39Ct?=
 =?us-ascii?Q?unxt8lk+GzuEbva7YGH3YLue3IpoQCvsf2hlA9QaXnGWF/TjEW1lCiGjgqtT?=
 =?us-ascii?Q?rdma43VdAAjTlEihxoMvX03Agnf1QwEHDIIsUY+RFyweRkB8RzH9pkD/tKmA?=
 =?us-ascii?Q?KY7PbiOlGeScV9Cqgpqp5ns10Cy6C6mPr4OetWF/oepNxhUh3ZkU7JFT4xmQ?=
 =?us-ascii?Q?zhF6TnSBaxh7Ag+YyPme2nEfYuI72/OCrOo+1aEMVHSq9XirDrqAdfcT7vXS?=
 =?us-ascii?Q?TftQhL7EIhT9yY6dOvRw4qgWyODSTqfhfXeO80bIsRwvp55eNAMsKIpjZ6si?=
 =?us-ascii?Q?U5DVjfrvtaGEONYJ/KYlyU+gqa9Qpk7l7TKNg2nwiJB4rBFC+wMJEx9PFAof?=
 =?us-ascii?Q?Z6CVP1HE5gUdBr0a3JHhsJj734B5BmpHBbAy1HJBSC9a2urQ4rggQytqjk5d?=
 =?us-ascii?Q?isAwL3S0V4aYECNtL2vxNLcha9nJtooO2+AcMKUQYpZtOW6jvwidjngKTVF6?=
 =?us-ascii?Q?ZIWkUqTjlMSySwy+H01FurOfUTBtDxqBeGkv2YlLzMfXJjlMzmZW0AWbc2Y/?=
 =?us-ascii?Q?SVS0tqq0uaWa5zRXKMDce82BZ6rip4VAiReI62CUa7J9STeXqtHsrOGzldOi?=
 =?us-ascii?Q?GglxVOqr0RNCDvgV60HExzjSJwDKgzE21JZtegc8GuT/UmrWIaCn4HqbMcGq?=
 =?us-ascii?Q?n91JxWiDyHorG//lRpSgkK3vgwpXSK4OHfxR3GCBmdHl5yYo+U2mESroxajC?=
 =?us-ascii?Q?J99uJWWNQswT/F2ZPLbSHw1nirys6vk5vapr+3GnwURk32dyE5luouomAJ1X?=
 =?us-ascii?Q?MUVwki1PodHYAn5fQahanECtg0s3dgiEL5JpFxS3Y9CEYzipiwO9qLCjC1SH?=
 =?us-ascii?Q?yB3cZZWXAaf+9iF3B66NJk2owdNEtVKzFfi1Hq2p0COqDqrzqGtFLz3rK7Ws?=
 =?us-ascii?Q?8DEwFUiqKdjOkgn9lGNMIGkPDD2lKw+F8QPLsgyG5Z3kav62aU9FruffFPt3?=
 =?us-ascii?Q?AG+Ea1k5ae+6uysW7TOc11pSObVHW/ZLfnw1Z5pl7OUIvs8Q8hIUtp8fGDlW?=
 =?us-ascii?Q?2nqY1J6UvuigSVRifewEjHJvG98Tjy8nr2Sb+OAG4JuSf5LxVLQ4mAdcjEHK?=
 =?us-ascii?Q?048EYoN/2hERDjjMlvXp/jInpeQJXe1PC3FDUhTMfHh24TPn0MSiR/0UEvcw?=
 =?us-ascii?Q?GA=3D=3D?=
X-OriginatorOrg: nokia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f2aa00c5-f260-484f-4e12-08dadf630aa6
X-MS-Exchange-CrossTenant-AuthSource: AM7PR07MB6705.eurprd07.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Dec 2022 12:42:50.0575
 (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: ylxxeNf9VmKSMankYEna13Mq874pPUdRpPGsxLOjTMBzQuNlQedzARhXqQL/8QHxglXUcOFefK17Q+Exa4beOrOi7r0t6VE5lCzwVH/ttkQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7767
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