* [PATCH] hwmon: (k10temp) Add support for Stoney Ridge and Bristol Ridge CPUs
@ 2018-04-29 16:16 Guenter Roeck
2018-04-29 16:28 ` Gabriel C
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2018-04-29 16:16 UTC (permalink / raw)
To: Clemens Ladisch
Cc: linux-hwmon, linux-kernel, Brian Woods, Gabriel C, Guenter Roeck
Add support for Stoney Ridge and Bristol Ridge (Family 15h Model 0x70)
CPUs. Registers match those of Family 15h Model 0x60.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/hwmon/k10temp.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 34b5448b00be..f014e03eee5a 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -36,6 +36,10 @@ MODULE_PARM_DESC(force, "force loading on processors with erratum 319");
/* Provide lock for writing to NB_SMU_IND_ADDR */
static DEFINE_MUTEX(nb_smu_ind_mutex);
+#ifndef PCI_DEVICE_ID_AMD_15H_M70H_NB_F3
+#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3 0x15b3
+#endif
+
#ifndef PCI_DEVICE_ID_AMD_17H_DF_F3
#define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
#endif
@@ -319,6 +323,7 @@ static const struct pci_device_id k10temp_id_table[] = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M60H_NB_F3) },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M70H_NB_F3) },
{ 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) },
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hwmon: (k10temp) Add support for Stoney Ridge and Bristol Ridge CPUs
2018-04-29 16:16 [PATCH] hwmon: (k10temp) Add support for Stoney Ridge and Bristol Ridge CPUs Guenter Roeck
@ 2018-04-29 16:28 ` Gabriel C
2018-04-29 16:30 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Gabriel C @ 2018-04-29 16:28 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Clemens Ladisch, linux-hwmon, LKML, Brian Woods
2018-04-29 18:16 GMT+02:00 Guenter Roeck <linux@roeck-us.net>:
> Add support for Stoney Ridge and Bristol Ridge (Family 15h Model 0x70)
> CPUs. Registers match those of Family 15h Model 0x60.
>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/hwmon/k10temp.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
> index 34b5448b00be..f014e03eee5a 100644
> --- a/drivers/hwmon/k10temp.c
> +++ b/drivers/hwmon/k10temp.c
> @@ -36,6 +36,10 @@ MODULE_PARM_DESC(force, "force loading on processors with erratum 319");
> /* Provide lock for writing to NB_SMU_IND_ADDR */
> static DEFINE_MUTEX(nb_smu_ind_mutex);
>
> +#ifndef PCI_DEVICE_ID_AMD_15H_M70H_NB_F3
> +#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3 0x15b3
> +#endif
> +
> #ifndef PCI_DEVICE_ID_AMD_17H_DF_F3
> #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
> #endif
> @@ -319,6 +323,7 @@ static const struct pci_device_id k10temp_id_table[] = {
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M60H_NB_F3) },
> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M70H_NB_F3) },
> { 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) },
> --
> 2.7.4
>
Is working fine for me on an A6-9220 APU.
Tested-by: Gabriel Craciunescu <nix.or.die@gmail.com>
Regards
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hwmon: (k10temp) Add support for Stoney Ridge and Bristol Ridge CPUs
2018-04-29 16:28 ` Gabriel C
@ 2018-04-29 16:30 ` Guenter Roeck
0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2018-04-29 16:30 UTC (permalink / raw)
To: Gabriel C; +Cc: Clemens Ladisch, linux-hwmon, LKML, Brian Woods
On 04/29/2018 09:28 AM, Gabriel C wrote:
> 2018-04-29 18:16 GMT+02:00 Guenter Roeck <linux@roeck-us.net>:
>> Add support for Stoney Ridge and Bristol Ridge (Family 15h Model 0x70)
>> CPUs. Registers match those of Family 15h Model 0x60.
>>
>> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>> ---
>> drivers/hwmon/k10temp.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
>> index 34b5448b00be..f014e03eee5a 100644
>> --- a/drivers/hwmon/k10temp.c
>> +++ b/drivers/hwmon/k10temp.c
>> @@ -36,6 +36,10 @@ MODULE_PARM_DESC(force, "force loading on processors with erratum 319");
>> /* Provide lock for writing to NB_SMU_IND_ADDR */
>> static DEFINE_MUTEX(nb_smu_ind_mutex);
>>
>> +#ifndef PCI_DEVICE_ID_AMD_15H_M70H_NB_F3
>> +#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3 0x15b3
>> +#endif
>> +
>> #ifndef PCI_DEVICE_ID_AMD_17H_DF_F3
>> #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
>> #endif
>> @@ -319,6 +323,7 @@ static const struct pci_device_id k10temp_id_table[] = {
>> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
>> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
>> { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M60H_NB_F3) },
>> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M70H_NB_F3) },
>> { 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) },
>> --
>> 2.7.4
>>
>
> Is working fine for me on an A6-9220 APU.
>
> Tested-by: Gabriel Craciunescu <nix.or.die@gmail.com>
>
Thanks again!
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-29 16:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-29 16:16 [PATCH] hwmon: (k10temp) Add support for Stoney Ridge and Bristol Ridge CPUs Guenter Roeck
2018-04-29 16:28 ` Gabriel C
2018-04-29 16:30 ` Guenter Roeck
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).