From patchwork Mon Jul 24 17:43:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 125136 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1968599vqg; Mon, 24 Jul 2023 11:11:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlHA8BYaSbCDDA8+n9WU/xiGIZQwxTqkmeO2agY4BhK15fm5pACob/7kdPKhSP737Agk6hWb X-Received: by 2002:a05:6a20:3216:b0:134:6839:c497 with SMTP id hl22-20020a056a20321600b001346839c497mr9655436pzc.11.1690222293964; Mon, 24 Jul 2023 11:11:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690222293; cv=none; d=google.com; s=arc-20160816; b=WlamYlmJ7GTNQl/WzG7JgM4//7ROtUoOk2MSzQ6ceLCeqs0IANUPzzQPrwzN3gx9PO fCALqN5o8yawONmqaLrxGuOjWc0/+wEQeM5Zg+1mCi3iXKg4K9H1ld+MYyOGhNDLIg6h AQUKjiAu7hrnQgGN6otm7/+yVD0wFfAqqVxWXAmPCY76c7YwURd5p1LcFZ18CCqSBRfz uaAM0gefYL5NFvJH8dG4wUL7PEZesfy/WaiaysKjdsLZ2C4HBYvPb4h10QyYpiL3x65E 4cJwFc3Nybh9gSD50ezng8TFET3Rj9YIsYcV12E+S7jlL7f9YahUnRRHRtj24/SFWRaF /qpA== 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=CslJ+Xs2tAisZ7a4ZqDrI1gRhP1PqFVCqCsoM4wylLI=; fh=rjhgVOooDwKNbe30aYeT7iENspsYIt6i5XjfvsOTva0=; b=InG6asgDuA5y/jRUwPiMwxGvzeheF3n2ff7raOwoagOn17XJJyY+9jlSjlCO8aIn6f cbAj73ifMktdcUY8ylBlZSd4jL1V3A0AqfJdbglnl88UMxDducoHhpa/vVy02QaJhIo3 m5CIbviaw8Tbbe7W8IrkpiqQtQlogFAcpDpo22fkDwF7mDq3TMy4tvR+lRWAqXmAEC2/ ZKLK9sXOaqxF5zQmxleO3u88rqVWpgybzkXvNZ7/8i5n7IqxcP5pD4tcAxYjgDidBEMl jRGQUuflCkAhOvQadGI6TqNkIomAUewxb+OYCYH5ZVu2xGZ30ETJEuZTr3wzJhPgsOQn JBoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=R2wnfNQm; 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 bo10-20020a056a000e8a00b006862f983a83si9165503pfb.217.2023.07.24.11.11.20; Mon, 24 Jul 2023 11:11:33 -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=R2wnfNQm; 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 S229877AbjGXRoo (ORCPT + 99 others); Mon, 24 Jul 2023 13:44:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230287AbjGXRoD (ORCPT ); Mon, 24 Jul 2023 13:44:03 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C5FC199F; Mon, 24 Jul 2023 10:44:00 -0700 (PDT) Message-ID: <20230724172843.988600888@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1690220638; 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=CslJ+Xs2tAisZ7a4ZqDrI1gRhP1PqFVCqCsoM4wylLI=; b=R2wnfNQmqunLRY9XPRWZg+VJw3KkrEOy42EITG+7Nz9+T0sJ6IwMAswXMV+NJYWPf9MyMd QTE6xm1vDiMz7ZXLx7/ISd32xcTS3GKMjMp+MQqqJ3FSXOmRRtm8MaceBKqbPnQJQ4UAub RQX/v14hTjdZI4A41NwNuoClA0M4y9P0QLX8HsXM18Eg4KAviW2gmcZba34D7rvSe9C7nM iXobfegv5hhHmpGMdwtnm4ndfMNUdVMgGU9dXE81ogAm2vGQ12lQEA71H4PMGIJOF57LDX w6pT2xtPTP0WfAe9tSP9yV0y2BbQAGFT3CL2IedsbcUnIEFzOIvFZO/IrW9b3g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1690220638; 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=CslJ+Xs2tAisZ7a4ZqDrI1gRhP1PqFVCqCsoM4wylLI=; b=7QbHM3qHvKAKOdgO+brAqUON4uCmq5hCWTk4SrwJ50NA5zPUME/eAvnAQTCjC6+RhSXwFH m9OpPsbrFwyslvAQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , linux-hwmon@vger.kernel.org, Jean Delvare , Huang Rui , Guenter Roeck , "James E.J. Bottomley" , Dick Kennedy , James Smart , "Martin K. Petersen" , linux-scsi@vger.kernel.org, Steve Wahl , Mike Travis , Dimitri Sivanich , Russ Anderson Subject: [patch 05/29] hwmon: (fam15h_power) Use topology_core_id() References: <20230724155329.474037902@linutronix.de> MIME-Version: 1.0 Date: Mon, 24 Jul 2023 19:43:58 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772326531781527260 X-GMAIL-MSGID: 1772326531781527260 Use the provided topology helper function instead of fiddling in cpu_data. Signed-off-by: Thomas Gleixner Cc: linux-hwmon@vger.kernel.org Cc: Jean Delvare Cc: Huang Rui Cc: Guenter Roeck 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]);