From: Gabriel C <nix.or.die@gmail.com>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Clemens Ladisch <clemens@ladisch.de>, X86 ML <x86@kernel.org>,
Jean Delvare <jdelvare@suse.com>,
LKML <linux-kernel@vger.kernel.org>,
linux-hwmon@vger.kernel.org, Borislav Petkov <bp@suse.de>,
Yazen Ghannam <Yazen.Ghannam@amd.com>,
Brian Woods <brian.woods@amd.com>
Subject: Re: [PATCH 2/2] hwmon: (k10temp) Use API function to access System Management Network
Date: Sun, 29 Apr 2018 20:19:58 +0200 [thread overview]
Message-ID: <CAEJqkggwaQL3H-F=eJ5CWAMp0NNxQnbLkPK1LcUfP8ihsbJ-wA@mail.gmail.com> (raw)
In-Reply-To: <2db436f9-a335-9e25-d177-23095c2527ff@roeck-us.net>
2018-04-29 19:46 GMT+02:00 Guenter Roeck <linux@roeck-us.net>:
> On 04/28/2018 06:54 PM, Guenter Roeck wrote:
>>
>> The SMN (System Management Network) on Family 17h AMD CPUs is also
>> accessed
>> from other drivers, specifically EDAC. Accessing it directly is racy.
>> On top of that, accessing the SMN through root bridge 00:00 is wrong on
>> multi-die CPUs and may result in reading the temperature from the wrong
>> die. Use available API functions to fix the problem.
>>
>> For this to work, also change the Raven Ridge PCI device ID to point to
>> Data Fabric Function 3, since this ID is used by the API functions to
>> find the CPU node.
>>
>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>> ---
>> drivers/hwmon/k10temp.c | 11 ++++++-----
>> 1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
>> index b06bb1f90853..00e785afae0d 100644
>> --- a/drivers/hwmon/k10temp.c
>> +++ b/drivers/hwmon/k10temp.c
>> @@ -23,6 +23,7 @@
>> #include <linux/init.h>
>> #include <linux/module.h>
>> #include <linux/pci.h>
>> +#include <asm/amd_nb.h>
>> #include <asm/processor.h>
>> MODULE_DESCRIPTION("AMD Family 10h+ CPU core temperature monitor");
>> @@ -40,8 +41,8 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);
>> #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
>> #endif
>> -#ifndef PCI_DEVICE_ID_AMD_17H_RR_NB
>> -#define PCI_DEVICE_ID_AMD_17H_RR_NB 0x15d0
>> +#ifndef PCI_DEVICE_ID_AMD_17H_RR_DF_F3
>> +#define PCI_DEVICE_ID_AMD_17H_RR_DF_F3 0x14eb
>
>
> This should have been 0x15eb. I'll resend after a week or so, waiting for
> more feedback.
re-tested with that too .. Doesn't seems to matter here ..
with original patch:
crazy@ant:~/Work/Linux/linux$ sensors
k10temp-pci-00f3
Adapter: PCI adapter
Tdie: +22.2°C (high = +70.0°C)
Tctl: +22.2°C
k10temp-pci-00e3
Adapter: PCI adapter
Tdie: +23.8°C (high = +70.0°C)
Tctl: +23.8°C
k10temp-pci-00d3
Adapter: PCI adapter
Tdie: +23.0°C (high = +70.0°C)
Tctl: +23.0°C
k10temp-pci-00c3
Adapter: PCI adapter
Tdie: +25.0°C (high = +70.0°C)
Tctl: +25.0°C
k10temp-pci-00fb
Adapter: PCI adapter
Tdie: +22.8°C (high = +70.0°C)
Tctl: +22.8°C
k10temp-pci-00eb
Adapter: PCI adapter
Tdie: +23.2°C (high = +70.0°C)
Tctl: +23.2°C
k10temp-pci-00db
Adapter: PCI adapter
Tdie: +22.8°C (high = +70.0°C)
Tctl: +22.8°C
k10temp-pci-00cb
Adapter: PCI adapter
Tdie: +22.6°C (high = +70.0°C)
Tctl: +22.6°C
now with 0x15eb
crazy@ant:~/Work/Linux/linux$ sudo rmmod k10temp
crazy@ant:~/Work/Linux/linux$ git grep -w PCI_DEVICE_ID_AMD_17H_RR_DF_F3
arch/x86/kernel/amd_nb.c:#define PCI_DEVICE_ID_AMD_17H_RR_DF_F3 0x15eb
arch/x86/kernel/amd_nb.c: { PCI_DEVICE(PCI_VENDOR_ID_AMD,
PCI_DEVICE_ID_AMD_17H_RR_DF_F3) },
drivers/hwmon/k10temp.c:#ifndef PCI_DEVICE_ID_AMD_17H_RR_DF_F3
drivers/hwmon/k10temp.c:#define PCI_DEVICE_ID_AMD_17H_RR_DF_F3 0x15eb
drivers/hwmon/k10temp.c: { PCI_VDEVICE(AMD,
PCI_DEVICE_ID_AMD_17H_RR_DF_F3) },
crazy@ant:~/Work/Linux/linux$ sudo insmod ./drivers/hwmon/k10temp.ko
crazy@ant:~/Work/Linux/linux$ sensors
k10temp-pci-00f3
Adapter: PCI adapter
Tdie: +22.2°C (high = +70.0°C)
Tctl: +22.2°C
k10temp-pci-00e3
Adapter: PCI adapter
Tdie: +23.8°C (high = +70.0°C)
Tctl: +23.8°C
k10temp-pci-00d3
Adapter: PCI adapter
Tdie: +23.0°C (high = +70.0°C)
Tctl: +23.0°C
k10temp-pci-00c3
Adapter: PCI adapter
Tdie: +25.0°C (high = +70.0°C)
Tctl: +25.0°C
k10temp-pci-00fb
Adapter: PCI adapter
Tdie: +22.9°C (high = +70.0°C)
Tctl: +22.9°C
k10temp-pci-00eb
Adapter: PCI adapter
Tdie: +23.2°C (high = +70.0°C)
Tctl: +23.2°C
k10temp-pci-00db
Adapter: PCI adapter
Tdie: +22.8°C (high = +70.0°C)
Tctl: +22.8°C
k10temp-pci-00cb
Adapter: PCI adapter
Tdie: +22.8°C (high = +70.0°C)
Tctl: +22.8°C
>
>> #endif
>> /* CPUID function 0x80000001, ebx */
>> @@ -136,8 +137,8 @@ static void read_tempreg_nb_f15(struct pci_dev *pdev,
>> u32 *regval)
>> static void read_tempreg_nb_f17(struct pci_dev *pdev, u32 *regval)
>> {
>> - amd_nb_index_read(pdev, PCI_DEVFN(0, 0), 0x60,
>> - F17H_M01H_REPORTED_TEMP_CTRL_OFFSET, regval);
>> + amd_smn_read(amd_pci_dev_to_node_id(pdev),
>> + F17H_M01H_REPORTED_TEMP_CTRL_OFFSET, regval);
>> }
>> static ssize_t temp1_input_show(struct device *dev,
>> @@ -323,7 +324,7 @@ static const struct pci_device_id k10temp_id_table[] =
>> {
>> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
>> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },
>> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
>> - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_RR_NB) },
>> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_RR_DF_F3) },
>> {}
>> };
>> MODULE_DEVICE_TABLE(pci, k10temp_id_table);
>>
>
next prev parent reply other threads:[~2018-04-29 18:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-29 1:54 [PATCH 1/2] x86/amd_nb: Add support for Raven Ridge CPUs Guenter Roeck
2018-04-29 1:54 ` [PATCH 2/2] hwmon: (k10temp) Use API function to access System Management Network Guenter Roeck
2018-04-29 4:32 ` Gabriel C
2018-04-29 17:46 ` Guenter Roeck
2018-04-29 18:19 ` Gabriel C [this message]
2018-04-29 18:23 ` Guenter Roeck
2018-04-29 4:15 ` [PATCH 1/2] x86/amd_nb: Add support for Raven Ridge CPUs Gabriel C
2018-04-29 4:16 ` Gabriel C
2018-04-29 17:53 ` Borislav Petkov
2018-04-29 18:24 ` Guenter Roeck
2018-04-30 15:38 ` Ghannam, Yazen
2018-04-30 16:01 ` Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAEJqkggwaQL3H-F=eJ5CWAMp0NNxQnbLkPK1LcUfP8ihsbJ-wA@mail.gmail.com' \
--to=nix.or.die@gmail.com \
--cc=Yazen.Ghannam@amd.com \
--cc=bp@suse.de \
--cc=brian.woods@amd.com \
--cc=clemens@ladisch.de \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).