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:     Wang Qing <wangqing@vivo.com>
Subject: [PATCH] arch_topology: Do not set llc_sibling if llc_id is invalid
Date:   Sun, 10 Apr 2022 19:36:19 -0700
Message-Id: <1649644580-54626-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?h+BtS/Ntdcu3+8ggEZlAAjEHt+v2bhZ5n0bx0XgrV+T1ChbR1nYxpC0OncV8?=
 =?us-ascii?Q?WGH6H+TcLqB4jQWHuSLl7lA6OwWP18TJC8uC6ZdgwYZWXBaiU1Ca4ZxRFPwX?=
 =?us-ascii?Q?quXxHn1+WalxVuwINFq4aoQRlR2ggXwyjzP502UH9PmEybM78ligdA6GJPAF?=
 =?us-ascii?Q?EpZYrUVsrxvSahosrVhZy54+WV1cRe071C+sAmFJs/yZYdj/pFxXFLJzSNad?=
 =?us-ascii?Q?S2WQnHeeBDj6YXA+v1FusfjHOv35lhGXYayIQrrp6dYmnt8CX9Uw5lWYwbdu?=
 =?us-ascii?Q?e1qx9JOVhr3rm1JwFcbwj6i/ewfPLc6CAv3nuerntl3JiUtP/2xiVkQAq6wK?=
 =?us-ascii?Q?oqadxCCvowz3cJmO1Md9XkCUUziOCOOY2L3ouLqMWwuEoSCqADHNOODOUx0M?=
 =?us-ascii?Q?MPNCqMBXR2+9JN4CQYhUcXoe3Nl/jRqsuke0omboMX70froSH3KX/iJl1Yvl?=
 =?us-ascii?Q?I0RczmBZYmt8+uNzsVIlhzNDg0WykKA18r/seowK7mCMCqaeLhQakRg8fW7D?=
 =?us-ascii?Q?C3K5KI4BPM9QIjVDY50btsTg6HGTL+ecmO9ukTiaO9z9jy7yJkt7K6BNICD9?=
 =?us-ascii?Q?IqcrvnHh391ZywEUoLCUcxwIzzHeT3yaxGVsrftkuZvNDVKuS4KSFer/pzaf?=
 =?us-ascii?Q?A5UpHipJHc3JyZSyUNBobFGn0SK0Cn3zDwgGV2PARFfHrwKjrEJoc15X0vOV?=
 =?us-ascii?Q?SvQPt7qYWwy4Q87fn37vB2/5TMEiQv82hI5FphKiI/fK6zAtrWdAg7mpHXNN?=
 =?us-ascii?Q?UDKex3MMRhT7iUry/2hUixqx7Jc1LbhBLWQ4LGGYBuDNBaOJBFzEcYVtbIFo?=
 =?us-ascii?Q?+6M3PVlg6AS0zQ4LlMWHFs2pgxJm+D3UFcqgzYwYefYF0FHVFRPhTuOVyTP2?=
 =?us-ascii?Q?ogS5s+O3CpxxmB24ZM6d513CG5aZilfa1sm+q0M/Fh1BJqAzZG4c0cbtbVO/?=
 =?us-ascii?Q?C3oFr+g1wceGDwPyJRpO5QyTGumU7y7zRO/ajcXT6KlPbp9H/6SS/gGfNHv0?=
 =?us-ascii?Q?szBtcPOeiSC1H7n+C5N3ph/hU9fUp1MBoCO30TtYMY64J//PE2Q0YdabWIZp?=
 =?us-ascii?Q?fy5YFFW/bKnvI+1aZbgsPTHBJfwkSf3W1CCzYTyde7vw+ZUrEBd4GhctEyNq?=
 =?us-ascii?Q?j4dUDBFwezm0Megx8uavfidHEyem/qXqZuDWBVP7weQuWzwXb0p6OhauHUTZ?=
 =?us-ascii?Q?ATyKFmqB2qwGmrjqLM8Tpsv8liHWVeyG1/J+gD+RdGYpQlTveMuJk0gtLBKk?=
 =?us-ascii?Q?+EsYT7B9gWJOxNDeo0gKdk3SZ4FMynAX8ZzJZccybJpuBV6B/Q8Cex/NZOxc?=
 =?us-ascii?Q?2tiTDQGWfdOYMpTx5YRCVa13s15Y34OJdqj+9v5PkNnKMjHNv7G2ThTlySKR?=
 =?us-ascii?Q?rGqBeTrGwEfcBc+yDwzVonfLAqa6G9itVEOnNV8UARTCuSbFlJVhBirj2dyr?=
 =?us-ascii?Q?+gJpEVPiOpT5/3R9VYieKHN5uyUXC+O1kX9Tm4XHHx+kctMHxFvF+7mWO6Xx?=
 =?us-ascii?Q?zrj+Xp4SPJOv/SLI23yX40fz70SeSmbo52futQlO6e7PV35+YVOpjlrlJ6rg?=
 =?us-ascii?Q?fS1wc0ucdZM+s/dP9YHXGeczjnk1cQfwKqeAryFFrsdXVhdzp3fOW70YA1m3?=
 =?us-ascii?Q?6NiOmjfuJ4z2Npnv9rS3tbN7iLZapjp2moo0dh5ScHrvYzW75VB1Kji6wYxJ?=
 =?us-ascii?Q?IyvSrfDD+Lr8LqpsBk9MLCfUFZZzqrKrXKjRaezV0jgBTebMeHe80Pw3csN7?=
 =?us-ascii?Q?tiO5AP3Cdw=3D=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ab5c9352-4bea-4825-8a0b-08da1b6415ba
X-MS-Exchange-CrossTenant-AuthSource: SL2PR06MB3082.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 02:36:30.4853
 (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: 9eXq9CIDOtQTTVmLLrMTYBs3B+y+ZCWnJyP2TDFLbQQwiP1A/mfK9BQ+wd77xtb02gqTtLiHT9A7UQtKk1ZC9g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4028
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,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>

When ACPI is not enabled, cpuid_topo->llc_id = cpu_topo->llc_id = -1, which
will set llc_sibling 0xff(...), this is misleading.

Don't set llc_sibling(default 0) if we don't know the cache topology.

Signed-off-by: Wang Qing <wangqing@vivo.com>
---
 drivers/base/arch_topology.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 1d6636e..5c3a642
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -684,7 +684,7 @@ void update_siblings_masks(unsigned int cpuid)
 	for_each_online_cpu(cpu) {
 		cpu_topo = &cpu_topology[cpu];
 
-		if (cpuid_topo->llc_id == cpu_topo->llc_id) {
+		if (cpu_topo->llc_id != -1 && cpuid_topo->llc_id == cpu_topo->llc_id) {
 			cpumask_set_cpu(cpu, &cpuid_topo->llc_sibling);
 			cpumask_set_cpu(cpuid, &cpu_topo->llc_sibling);
 		}
-- 
2.7.4