From nobody Thu Sep 11 12:57:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F12FC07E8A for ; Mon, 14 Aug 2023 08:54:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235243AbjHNIyb (ORCPT ); Mon, 14 Aug 2023 04:54:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234625AbjHNIxt (ORCPT ); Mon, 14 Aug 2023 04:53:49 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 540E591 for ; Mon, 14 Aug 2023 01:53:48 -0700 (PDT) Message-ID: <20230814085112.506988471@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1692003227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=8+6vOcIueVcOIj2konXv5XCSnSsK5weDJeCrayvpOfg=; b=fPzk2+J4fdut/Xv+4xRxKIHbg5QOGgBxAwmk+dsyGmjQ7b4HTZSWBG5ZTMnmBqgIXEZAPp bWPBnoXrjdSQUDs+WcusTiN7AFQUuR1NJIGogDsUfoM5bwSyo2GPtN8Q/rqpm6g/o6lTpZ fu/5OmGKqCKvzaf7jzICYs6puoAqb8ucUL/5bSSwAYrdLARUuDcflK47UMNJyEnLB13uUn oi+inRUOvwLEndabC5Lvv50XW5ewdWDH2vJeH4Y2UdqnsOzclcQfIqlk05H5cIFuomqrWH qNv8YR5xMMlM/lRuiA56PxJXA2cl7X34lXoMT+rk1w6RrEaS5dXN1tfkv7p4Rg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1692003227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=8+6vOcIueVcOIj2konXv5XCSnSsK5weDJeCrayvpOfg=; b=4oA3sMpg/OV8OMkmWdqy/4PuV2Mtdyv+g+ukz9FM2HO0WdJYqfg80p5wtnKtSQ6n1Joq8q 1b1fyLljTosEmzDg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Michael Kelley , Wei Liu , Pu Wen , Qiuxu Zhuo , Sohil Mehta , Guenter Roeck Subject: [patch V4 08/41] hwmon: (fam15h_power) Use topology_core_id() References: <20230814085006.593997112@linutronix.de> MIME-Version: 1.0 Date: Mon, 14 Aug 2023 10:53:46 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Use the provided topology helper function instead of fiddling in cpu_data. Signed-off-by: Thomas Gleixner Tested-by: Juergen Gross Tested-by: Sohil Mehta Tested-by: Michael Kelley Acked-by: Guenter Roeck --- drivers/hwmon/fam15h_power.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include =20 @@ -134,15 +135,13 @@ static DEVICE_ATTR_RO(power1_crit); static void do_read_registers_on_cu(void *_data) { struct fam15h_power_data *data =3D _data; - int cpu, cu; - - cpu =3D smp_processor_id(); + int cu; =20 /* * With the new x86 topology modelling, cpu core id actually * is compute unit id. */ - cu =3D cpu_data(cpu).cpu_core_id; + cu =3D topology_core_id(smp_processor_id()); =20 rdmsrl_safe(MSR_F15H_CU_PWR_ACCUMULATOR, &data->cu_acc_power[cu]); rdmsrl_safe(MSR_F15H_PTSC, &data->cpu_sw_pwr_ptsc[cu]);