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:   Qing Wang <wangqing@vivo.com>
To:     Sudeep Holla <sudeep.holla@arm.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        linux-kernel@vger.kernel.org
Cc:     dietmar.eggemann@arm.com, Wang Qing <wangqing@vivo.com>
Subject: [PATCH V2] arch_topology: support parsing cluster_id from DT
Date:   Wed, 11 May 2022 02:52:56 -0700
Message-Id: <1652262776-3056-1-git-send-email-wangqing@vivo.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6ZxHmwidXHJBKBUdCgMTCV9whrgYaV6i6mByQWj3WG9nLVZeHpNfhLu6XUJo?=
 =?us-ascii?Q?vktOxjJ1SQ/n87+17D5p9M/GBuEPQTUG0izfBVd/DXJrAUabOU+Dxl7wItjp?=
 =?us-ascii?Q?sGeeOzYUVTQaqDeGeBKY0JHeNC955U0t7eboAOB1u+6jmkE6mL2j5+Ef2Exi?=
 =?us-ascii?Q?ZGlY0J7PWzuJ+isGIQKkN2BY0povZnW3dgxGr5VldzqvVAMz4NH1OsqJNvIq?=
 =?us-ascii?Q?nJJCjGsV/GNIPMhCGfHE0jR1B/fJgHimBbUi9sfr+shBWd6w8Y+Ak9Pf4qo9?=
 =?us-ascii?Q?kNmlk2PHkiL/JXjIAH8UFeZNC/Mwy/RyysrXwjkSokJeia9wTv+67xK9gv/l?=
 =?us-ascii?Q?uAp5qv2jDi8aXASnd2RvZEw0r2XbW6l3KdqDCJ3hEka4LhSMat1YFHmuzmLQ?=
 =?us-ascii?Q?kbcNLoaZzpTdoNlJOlGK+2Eb81MT5FpHshTs/dp0S9q6Y/+ktWdXMJG0fvjz?=
 =?us-ascii?Q?UHnhjdZ1fFdNZA3HaAURpSBEOqbbKByppnCBeOrZ9e26but94aw8IVFL7wOz?=
 =?us-ascii?Q?ALcq5CPXXd782sQqLopU+2TFgzCvdPlA9s46/hS/S7tViQuwGp+dljHdE8Ck?=
 =?us-ascii?Q?zC6miPlDhFxIRlEtESarzXYArVH5sCQnCPulhMpMDSvpTVCLrVoj4K2tOSSO?=
 =?us-ascii?Q?oNG12G4Iw18Q7VgmC7uoLxLBLH9eV19u0RDJwhRYI2kUgHSz4V0Xn7Sh+Jwm?=
 =?us-ascii?Q?RZ7las9mzWirt0BVpFreUpUJaYJADxG70jjEVGed+3i+fWcwKCFpTduTP7DG?=
 =?us-ascii?Q?5ftMVndeum2pP0tksNIYnUbaEoGXjjZq67qPvtDaMj7Deovl9qQKudLKzxIh?=
 =?us-ascii?Q?tsU9TKJA0Ct/9pII6uYViinHeFlCihyL0mOADb+q//sujhN8HNCe6cGgeeUi?=
 =?us-ascii?Q?wxrB1hJPoRHk5RaPlS/CbuUrRy76s1AT7OKaFy/rAtxsysbR9L3tz0Hwgb+j?=
 =?us-ascii?Q?NGOeRZ7X8h15eLCX35k/HxitvyLr+WwEnUtvFkY6Ubf2NMJggwwDiYZRAgms?=
 =?us-ascii?Q?KODmKVqdXo0o5Cr2VR0gy6zN9WP09518zMo3CUNbJsFH7GUfcSZA7uUVrug6?=
 =?us-ascii?Q?DN+qtwHcNizUiVfirmmwkJ/pkbv6B6bT1XaOQ9LqNDsUBUw7/6+W3PNleMdi?=
 =?us-ascii?Q?p91YkRUag9g0r9Ysy8g8wmP/Q5gH9kcdNqiGuGSlL8czSo6D6T12npdO+DyM?=
 =?us-ascii?Q?6YL2RnJ8VBDV1FglSDT9+jGsGTxIcqWNDqYsZY8iQkwyFmXzxyVyv6NSjDWU?=
 =?us-ascii?Q?Tk3rcjRnBgU660mhMUraDSBzGABod+YTtm+PzBiUdnWCtWzZPt20cVKmuChn?=
 =?us-ascii?Q?s7fJ5h2IRn9KvyMYgRdqXJorxezjRkj9te+rqqIoAe+0GO56FTydDcuq3h49?=
 =?us-ascii?Q?gugvomm8B9xnL7IpqkXQB5GudejqoaQOhKEJBcqZMCW5lOo7yHtE91NVQT5t?=
 =?us-ascii?Q?biLECd5lQ4UHvU1ceFvkX2DYfpZ6hnCjx9i0dpYtHoQ0o1KYxDwjGq67Aoje?=
 =?us-ascii?Q?tcmdW8U/o1QzJhgG2JCUvbVMoapnQUD6sBHGNY3qn4RmDGCfp74KH0MJ8Xow?=
 =?us-ascii?Q?BoXCG3mrHwRGCLVwf6tMUbIgjZYg3ut16W0i3bIWMlQrbYewcnwE/DpxErZv?=
 =?us-ascii?Q?8dxsoYtfd9ZQf5T4wXjZaoHRVES7wL7CwoNiFjtRyQMpvcncmfa2ItpcDAQ4?=
 =?us-ascii?Q?YdRucunbnIK3s00eIuUsgUqSzw6iKwYtc8fggfU8v7IHPHW58vq5pLcsTfEO?=
 =?us-ascii?Q?zGW1O9mNCA=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cb7d537b-b734-4fc0-cbde-08da33341b20
X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2022 09:53:31.5296
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Vvry7CVkz64ILYWeyKC/EuPdZ7uK0G223+PuQWpDLXcv1/lHbKk9UYuPWIW0LvrGKccq9RuZEcY81FM8hsokTg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS2PR06MB3528
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham 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

From: Wang Qing <wangqing@vivo.com>

Use nested cluster structures in DT to support describing multi-level
cluster topologies and increase the parsing of nested cluster.

Notice: the clusters describing in DT currently are not physical
boundaries, since changing "cluster" to "socket" is too involved and error
prone, this patch will not have any effect on one-level cluster topo, but
can support the mutil-level cluster topo to support CLUSTER_SCHED.

Signed-off-by: Wang Qing <wangqing@vivo.com>
---
 drivers/base/arch_topology.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 1d6636ebaac5..5a407cff0ab1 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -491,7 +491,7 @@ static int __init get_cpu_for_node(struct device_node *node)
 }
 
 static int __init parse_core(struct device_node *core, int package_id,
-			     int core_id)
+			     int cluster_id, int core_id)
 {
 	char name[20];
 	bool leaf = true;
@@ -507,6 +507,7 @@ static int __init parse_core(struct device_node *core, int package_id,
 			cpu = get_cpu_for_node(t);
 			if (cpu >= 0) {
 				cpu_topology[cpu].package_id = package_id;
+				cpu_topology[cpu].cluster_id = cluster_id;
 				cpu_topology[cpu].core_id = core_id;
 				cpu_topology[cpu].thread_id = i;
 			} else if (cpu != -ENODEV) {
@@ -528,6 +529,7 @@ static int __init parse_core(struct device_node *core, int package_id,
 		}
 
 		cpu_topology[cpu].package_id = package_id;
+		cpu_topology[cpu].cluster_id = cluster_id;
 		cpu_topology[cpu].core_id = core_id;
 	} else if (leaf && cpu != -ENODEV) {
 		pr_err("%pOF: Can't get CPU for leaf core\n", core);
@@ -544,13 +546,15 @@ static int __init parse_cluster(struct device_node *cluster, int depth)
 	bool has_cores = false;
 	struct device_node *c;
 	static int package_id __initdata;
+	static int cluster_id __initdata;
 	int core_id = 0;
 	int i, ret;
 
 	/*
-	 * First check for child clusters; we currently ignore any
-	 * information about the nesting of clusters and present the
-	 * scheduler with a flat list of them.
+	 * nesting of clusters :
+	 * level 1:  package_id
+	 * level 2:  cluster_id
+	 * level 3+: ignore
 	 */
 	i = 0;
 	do {
@@ -559,6 +563,14 @@ static int __init parse_cluster(struct device_node *cluster, int depth)
 		if (c) {
 			leaf = false;
 			ret = parse_cluster(c, depth + 1);
+			if (depth == 0) {
+				package_id++;
+				cluster_id = 0;
+			} else if (depth == 1)
+				cluster_id++;
+			else
+				pr_err("Ignore nested clusters with more than two levels!\n");
+
 			of_node_put(c);
 			if (ret != 0)
 				return ret;
@@ -582,7 +594,8 @@ static int __init parse_cluster(struct device_node *cluster, int depth)
 			}
 
 			if (leaf) {
-				ret = parse_core(c, package_id, core_id++);
+				ret = parse_core(c, package_id, (depth == 2)?cluster_id : -1,
+					       core_id++);
 			} else {
 				pr_err("%pOF: Non-leaf cluster with core %s\n",
 				       cluster, name);
@@ -599,9 +612,6 @@ static int __init parse_cluster(struct device_node *cluster, int depth)
 	if (leaf && !has_cores)
 		pr_warn("%pOF: empty cluster\n", cluster);
 
-	if (leaf)
-		package_id++;
-
 	return 0;
 }
 
-- 
2.7.4