From patchwork Mon Aug 14 08:53:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 135267 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp2626047vqi; Mon, 14 Aug 2023 02:36:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH6/HXwN4NlWWkIcqFqZj68XY8psMloNjXVtrE0tL6arFqofr3vm2q/LvDKSgkP4oElfyeB X-Received: by 2002:a17:903:1c3:b0:1bd:c105:e07e with SMTP id e3-20020a17090301c300b001bdc105e07emr8136303plh.6.1692005814066; Mon, 14 Aug 2023 02:36:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692005814; cv=none; d=google.com; s=arc-20160816; b=dqVNCv0IrHPCgslam2KRi2FiR/mCfl69CA0o8VzcTRzBgLNaLTbKNCFDHjDkpQfaRw AUGM5TvuEm75g8d1Ic6irb/+Ii2iSJvYYIY9t+I8k7q2Bjsl4i+ZxkY/5tlJwc/ObSXC 2M561Ce8tejnYtCGZEkk6wkUR1we1vXGKaSDrhH5aQE3OxsY0yscOvd7f3HJiADq0ZTO 8nSrrcbqmlJLbxXuHHko5dNto7gk5Gp3rrCUiE7Z6/18nqwjkM0+KdahYdkSqSoc83Eh ejqXovtnowhtA0ljzE2L2U9PPoUbPptB/I2h6sA2q8xYNprwj31H6B2UcPeGGCVg9OUm n7Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=8+6vOcIueVcOIj2konXv5XCSnSsK5weDJeCrayvpOfg=; fh=ca5tXezAtPlZGlsalu21G7LS5/6b6bbud23Wzq6B/0o=; b=oeX6nFJv4j7SIYRH2o44bBeFZ+LIsyWMd/CLj/FjOTxgAllz7JSdtlexF115EPwUde Btm33j2H3rzAxW5D7ENf1GY0boSoA1/KYn7zrB/+Qu8Xv0gUOkWrwKqI/vR3UTJ7DWOs gKsau7y0yCAN4U8FTZwTJRBIUw0ydEku+zQXiLplZb9jgYzaV1/QSwXJkvi3kDAH1NV2 n6pPID8GJ2otFZRXPWMhRwzb1twdh1oQ72Iw/ROfkqEB8a6oRdi71q0saa4f3TEc7/cu +3gVeP4Cvdr86v5oLkc+hJymKuPlda4+j3dN1hxKEDXYVQb8/KG5ElB1//KM43KgaaDa d2tA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=fPzk2+J4; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jy4-20020a17090342c400b001b87bd2f7b0si7622401plb.402.2023.08.14.02.36.41; Mon, 14 Aug 2023 02:36:54 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=fPzk2+J4; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235234AbjHNIya (ORCPT + 99 others); Mon, 14 Aug 2023 04:54:30 -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) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774196688240294156 X-GMAIL-MSGID: 1774196688240294156 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 @@ -134,15 +135,13 @@ static DEVICE_ATTR_RO(power1_crit); static void do_read_registers_on_cu(void *_data) { struct fam15h_power_data *data = _data; - int cpu, cu; - - cpu = smp_processor_id(); + int cu; /* * With the new x86 topology modelling, cpu core id actually * is compute unit id. */ - cu = cpu_data(cpu).cpu_core_id; + cu = topology_core_id(smp_processor_id()); rdmsrl_safe(MSR_F15H_CU_PWR_ACCUMULATOR, &data->cu_acc_power[cu]); rdmsrl_safe(MSR_F15H_PTSC, &data->cpu_sw_pwr_ptsc[cu]);