From patchwork Wed Aug 2 10:21:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 129778 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp381360vqx; Wed, 2 Aug 2023 04:24:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlEDSrl91K1ZIq0QWL9zAXn9Qeye7w8ANRS9Pa7OtLl2ZeFI478CIGr1C+/uao013gsQEj7v X-Received: by 2002:a17:907:784a:b0:99b:c952:309a with SMTP id lb10-20020a170907784a00b0099bc952309amr4689099ejc.39.1690975457161; Wed, 02 Aug 2023 04:24:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690975457; cv=none; d=google.com; s=arc-20160816; b=h4RWnXE8sZSFcI7V2xeFFjBD/ww64CuqkCW2+Fsjm0XBm7ClH2URE6sWN4IoOCD2yc Np0sq/bkJ+thdJWfIY01b8wzC8Vz9egF9lPus3CL6rJUvszMpnsvdy/55oa8X45a4dnH RLzaF1DVqFs9i2FoyzVFdixws7NkzKceZZNM/kojBB1F2fRaZNb6fTF0SQTBfwBQuxIN D9el+eHlJZJz1+bbtO5WymsxmwsQ34Oo1iAJJQjYb13V8d3Z8x5HbSnMy4mmrbts+3wa 9IEPmQHJRXghYlRtdHuKo7QFkn/9on8SH5TJdDEg04iI+fgZl/giQwyc3oINGx06xH5y e+Qw== 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=W37gGs0lCrcES4uNg1Zl0+g2c0hE6iWg5mZxC7Tosgc=; fh=MnN2MnOA8nDLSq9u+W1PRucOA//pCn2JLDh027elLCk=; b=uU5fuR9FYBfP44R42RN6hfyR+mxXWW4E5pj7EFSe4LHBfMHT4a4lnsTOxsqRFq8/Rg gsM1Emd82Fna6WNxQ8IOLBbfLxN7uzk4eyBhO0RydSlOG/DPHsb2NZQnQn+l/hhxcOKl IO8WV6tOfY4hcpJnRWaqkEs9tuxCYIGBnFoJto0qN0s+MFG8vqnm+KeSsj42r0MxcQul Yy+k4yS2ftlfdow2urd9gdBegLR/yoWMkBg7hKHgW4hlJWLIhiJGokYhJD18P1JZEp76 9lBmwYbNxmEKUiWRwomBtSnRf2VMDhCQr9E8lIDvb8mMhD5nJYVeIPhZ3cVjb3CBjstp kX6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=F+C9H0Dt; 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 b27-20020a170906151b00b0099c518e9e51si131508ejd.127.2023.08.02.04.23.52; Wed, 02 Aug 2023 04:24:17 -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=F+C9H0Dt; 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 S233821AbjHBKVt (ORCPT + 99 others); Wed, 2 Aug 2023 06:21:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232728AbjHBKVR (ORCPT ); Wed, 2 Aug 2023 06:21:17 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33C8A2720; Wed, 2 Aug 2023 03:21:10 -0700 (PDT) Message-ID: <20230802101933.104722355@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690971669; 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=W37gGs0lCrcES4uNg1Zl0+g2c0hE6iWg5mZxC7Tosgc=; b=F+C9H0DtgncTnkKKBoGxFVPsR6sHb0qwuu7W+vof+Q/fWU0keEEA+c/rOi4bZSuoDiaiXP oYt/1oPQsa8rXyPAUwBncl1m7T/6ut3RVLIuIxsC2nMsxHJdLdMpz9SCzWoBW9I4rJrjt2 BoBpbBoBA0LSCLnAY+5EX6gNiTiK62C7Drb7EQV+gqf+XYzYr73P6OD1OpTDAygwQBX4cd BFxZi2MYFacfwyZuB3UynU1qPO14p72U2rUpWDBwOL5advuWSVgXeIiBt79x23CEHVDjBD xdjcA6e7bNRdpjwDfHuSacW44OECgcf35t5mYoDfv1Coh3aMgGVSFKYVUm8rKg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690971669; 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=W37gGs0lCrcES4uNg1Zl0+g2c0hE6iWg5mZxC7Tosgc=; b=aR/ClK7pK4d9Nw2NUuBu457SIW7LhYP+u61EVLZ0/hmwVXpsc9Nc7pYCjXgLciQPL8W47x UEnwG0GlNyzhmhBA== 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 , Guenter Roeck , linux-hwmon@vger.kernel.org, Jean Delvare Subject: [patch V3 07/40] hwmon: (fam15h_power) Use topology_core_id() References: <20230802101635.459108805@linutronix.de> MIME-Version: 1.0 Date: Wed, 2 Aug 2023 12:21:08 +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,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1773116280861686836 X-GMAIL-MSGID: 1773116280861686836 Use the provided topology helper function instead of fiddling in cpu_data. Signed-off-by: Thomas Gleixner Acked-by: Guenter Roeck Cc: linux-hwmon@vger.kernel.org Cc: Jean Delvare Cc: Huang Rui --- 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]);