* [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
@ 2021-05-20 17:41 David Bartley
2021-05-20 21:36 ` Wei Huang
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: David Bartley @ 2021-05-20 17:41 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-x86_64, David Bartley
This is required to support Zen3 APUs in k10temp.
Signed-off-by: David Bartley <andareed@gmail.com>
---
arch/x86/kernel/amd_nb.c | 3 +++
include/linux/pci_ids.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 09083094eb57..23dda362dc0f 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -25,6 +25,7 @@
#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
#define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654
+#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
/* Protect the PCI config register pairs used for SMN and DF indirect access. */
static DEFINE_MUTEX(smn_mutex);
@@ -57,6 +58,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
{}
};
@@ -72,6 +74,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
{}
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 4c3fa5293d76..5356ccf1c275 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -555,6 +555,7 @@
#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
#define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
+#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
2021-05-20 17:41 [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids David Bartley
@ 2021-05-20 21:36 ` Wei Huang
2021-05-20 22:45 ` Borislav Petkov
2021-05-21 10:10 ` Borislav Petkov
2021-05-25 12:52 ` [tip: x86/cpu] x86/amd_nb: Add " tip-bot2 for David Bartley
2 siblings, 1 reply; 9+ messages in thread
From: Wei Huang @ 2021-05-20 21:36 UTC (permalink / raw)
To: David Bartley, linux-kernel; +Cc: linux-x86_64
According to the specification, these IDs look correct to me. I also
found them on two real machines.
Thanks,
-Wei
On 5/20/21 12:41 PM, David Bartley wrote:
> This is required to support Zen3 APUs in k10temp.
>
> Signed-off-by: David Bartley <andareed@gmail.com>
> ---
> arch/x86/kernel/amd_nb.c | 3 +++
> include/linux/pci_ids.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
> index 09083094eb57..23dda362dc0f 100644
> --- a/arch/x86/kernel/amd_nb.c
> +++ b/arch/x86/kernel/amd_nb.c
> @@ -25,6 +25,7 @@
> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
> #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654
> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
>
> /* Protect the PCI config register pairs used for SMN and DF indirect access. */
> static DEFINE_MUTEX(smn_mutex);
> @@ -57,6 +58,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
> {}
> };
>
> @@ -72,6 +74,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
> {}
> };
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 4c3fa5293d76..5356ccf1c275 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -555,6 +555,7 @@
> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
> #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
> #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
> #define PCI_DEVICE_ID_AMD_LANCE 0x2000
> #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
2021-05-20 21:36 ` Wei Huang
@ 2021-05-20 22:45 ` Borislav Petkov
2021-05-20 22:47 ` Wei Huang
0 siblings, 1 reply; 9+ messages in thread
From: Borislav Petkov @ 2021-05-20 22:45 UTC (permalink / raw)
To: Wei Huang; +Cc: David Bartley, linux-kernel, linux-x86_64
On Thu, May 20, 2021 at 04:36:09PM -0500, Wei Huang wrote:
> According to the specification, these IDs look correct to me. I also found
> them on two real machines.
Wei, I'm assuming that's an ACK?
> On 5/20/21 12:41 PM, David Bartley wrote:
> > This is required to support Zen3 APUs in k10temp.
> >
> > Signed-off-by: David Bartley <andareed@gmail.com>
Btw, David, for the future, pls run your patches through
./scripts/get_maintainer.pl
so that you get a list of people and mailing lists to CC - otherwise it
likely will get missed.
This one I managed to fish out from the lkml firehose, by chance. :-)
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
2021-05-20 22:45 ` Borislav Petkov
@ 2021-05-20 22:47 ` Wei Huang
0 siblings, 0 replies; 9+ messages in thread
From: Wei Huang @ 2021-05-20 22:47 UTC (permalink / raw)
To: Borislav Petkov; +Cc: David Bartley, linux-kernel, linux-x86_64
On 5/20/21 5:45 PM, Borislav Petkov wrote:
> On Thu, May 20, 2021 at 04:36:09PM -0500, Wei Huang wrote:
>> According to the specification, these IDs look correct to me. I also found
>> them on two real machines.
>
> Wei, I'm assuming that's an ACK?
Yes, it is an ACK. They match with the values specified in PPR.
>
>> On 5/20/21 12:41 PM, David Bartley wrote:
>>> This is required to support Zen3 APUs in k10temp.
>>>
>>> Signed-off-by: David Bartley <andareed@gmail.com>
>
> Btw, David, for the future, pls run your patches through
>
> ./scripts/get_maintainer.pl
>
> so that you get a list of people and mailing lists to CC - otherwise it
> likely will get missed.
>
> This one I managed to fish out from the lkml firehose, by chance. :-)
>
> Thx.
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
2021-05-20 17:41 [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids David Bartley
2021-05-20 21:36 ` Wei Huang
@ 2021-05-21 10:10 ` Borislav Petkov
2021-05-21 16:05 ` Wei Huang
2021-05-25 12:52 ` [tip: x86/cpu] x86/amd_nb: Add " tip-bot2 for David Bartley
2 siblings, 1 reply; 9+ messages in thread
From: Borislav Petkov @ 2021-05-21 10:10 UTC (permalink / raw)
To: David Bartley; +Cc: linux-kernel, linux-x86_64, Wei Huang
On Thu, May 20, 2021 at 10:41:30AM -0700, David Bartley wrote:
> This is required to support Zen3 APUs in k10temp.
>
> Signed-off-by: David Bartley <andareed@gmail.com>
> ---
> arch/x86/kernel/amd_nb.c | 3 +++
> include/linux/pci_ids.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
> index 09083094eb57..23dda362dc0f 100644
> --- a/arch/x86/kernel/amd_nb.c
> +++ b/arch/x86/kernel/amd_nb.c
> @@ -25,6 +25,7 @@
> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
> #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654
> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
>
> /* Protect the PCI config register pairs used for SMN and DF indirect access. */
> static DEFINE_MUTEX(smn_mutex);
> @@ -57,6 +58,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
> {}
> };
>
> @@ -72,6 +74,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
> {}
> };
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 4c3fa5293d76..5356ccf1c275 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -555,6 +555,7 @@
> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
> #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
I don't see this define used anywhere else besides amd_nb.c. If there's
no use for it outside of that file, I'm moving it there...?
Or does it need to get added to that k10temp_id_table in k10temp.c too?
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
2021-05-21 10:10 ` Borislav Petkov
@ 2021-05-21 16:05 ` Wei Huang
2021-05-21 17:45 ` Guenter Roeck
0 siblings, 1 reply; 9+ messages in thread
From: Wei Huang @ 2021-05-21 16:05 UTC (permalink / raw)
To: Borislav Petkov, David Bartley; +Cc: linux-kernel, linux-x86_64, Guenter Roeck
On 5/21/21 5:10 AM, Borislav Petkov wrote:
> On Thu, May 20, 2021 at 10:41:30AM -0700, David Bartley wrote:
>> This is required to support Zen3 APUs in k10temp.
>>
>> Signed-off-by: David Bartley <andareed@gmail.com>
>> ---
>> arch/x86/kernel/amd_nb.c | 3 +++
>> include/linux/pci_ids.h | 1 +
>> 2 files changed, 4 insertions(+)
>>
>> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
>> index 09083094eb57..23dda362dc0f 100644
>> --- a/arch/x86/kernel/amd_nb.c
>> +++ b/arch/x86/kernel/amd_nb.c
>> @@ -25,6 +25,7 @@
>> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
>> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
>> #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654
>> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
>>
>> /* Protect the PCI config register pairs used for SMN and DF indirect access. */
>> static DEFINE_MUTEX(smn_mutex);
>> @@ -57,6 +58,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
>> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
>> {}
>> };
>>
>> @@ -72,6 +74,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
>> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },
>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
>> {}
>> };
>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index 4c3fa5293d76..5356ccf1c275 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -555,6 +555,7 @@
>> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
>> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
>> #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
>> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
>
> I don't see this define used anywhere else besides amd_nb.c. If there's
> no use for it outside of that file, I'm moving it there...?
>
> Or does it need to get added to that k10temp_id_table in k10temp.c too?
[+Guenter]
I think it needs to be added to k10temp.c as well. In the meanwhile,
k10temp_probe() shall be extended with support for family 19h, model 0x5x.
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
2021-05-21 16:05 ` Wei Huang
@ 2021-05-21 17:45 ` Guenter Roeck
2021-05-21 18:43 ` Borislav Petkov
0 siblings, 1 reply; 9+ messages in thread
From: Guenter Roeck @ 2021-05-21 17:45 UTC (permalink / raw)
To: Wei Huang, Borislav Petkov, David Bartley; +Cc: linux-kernel, linux-x86_64
On 5/21/21 9:05 AM, Wei Huang wrote:
>
>
> On 5/21/21 5:10 AM, Borislav Petkov wrote:
>> On Thu, May 20, 2021 at 10:41:30AM -0700, David Bartley wrote:
>>> This is required to support Zen3 APUs in k10temp.
>>>
>>> Signed-off-by: David Bartley <andareed@gmail.com>
>>> ---
>>> arch/x86/kernel/amd_nb.c | 3 +++
>>> include/linux/pci_ids.h | 1 +
>>> 2 files changed, 4 insertions(+)
>>>
>>> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
>>> index 09083094eb57..23dda362dc0f 100644
>>> --- a/arch/x86/kernel/amd_nb.c
>>> +++ b/arch/x86/kernel/amd_nb.c
>>> @@ -25,6 +25,7 @@
>>> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
>>> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
>>> #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654
>>> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
>>> /* Protect the PCI config register pairs used for SMN and DF indirect access. */
>>> static DEFINE_MUTEX(smn_mutex);
>>> @@ -57,6 +58,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
>>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
>>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
>>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
>>> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
>>> {}
>>> };
>>> @@ -72,6 +74,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
>>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
>>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
>>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
>>> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },
>>> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
>>> {}
>>> };
>>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>>> index 4c3fa5293d76..5356ccf1c275 100644
>>> --- a/include/linux/pci_ids.h
>>> +++ b/include/linux/pci_ids.h
>>> @@ -555,6 +555,7 @@
>>> #define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
>>> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
>>> #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
>>> +#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
>>
>> I don't see this define used anywhere else besides amd_nb.c. If there's
>> no use for it outside of that file, I'm moving it there...?
>>
>> Or does it need to get added to that k10temp_id_table in k10temp.c too?
>
> [+Guenter]
>
> I think it needs to be added to k10temp.c as well. In the meanwhile, k10temp_probe() shall be extended with support for family 19h, model 0x5x.
>
Yes, it does [1]. Fine with me though to define it locally there.
I personally find that easier since it would avoid the recurring
"I don't see this define used anywhere else besides xxx".
Someone else can clean that up later if so desired.
Thanks,
Guenter
---
[1] https://patchwork.kernel.org/project/linux-hwmon/patch/20210517064131.4369-1-andareed@gmail.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids
2021-05-21 17:45 ` Guenter Roeck
@ 2021-05-21 18:43 ` Borislav Petkov
0 siblings, 0 replies; 9+ messages in thread
From: Borislav Petkov @ 2021-05-21 18:43 UTC (permalink / raw)
To: Guenter Roeck; +Cc: Wei Huang, David Bartley, linux-kernel, linux-x86_64
On Fri, May 21, 2021 at 10:45:53AM -0700, Guenter Roeck wrote:
> Yes, it does [1]. Fine with me though to define it locally there.
> I personally find that easier since it would avoid the recurring
> "I don't see this define used anywhere else besides xxx".
> Someone else can clean that up later if so desired.
Or someone can ask first or maybe even get CCed on both patches so that
someone can see the full picture. :-)
Anyway, I'll commit it as-is.
Thx.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 9+ messages in thread
* [tip: x86/cpu] x86/amd_nb: Add AMD family 19h model 50h PCI ids
2021-05-20 17:41 [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids David Bartley
2021-05-20 21:36 ` Wei Huang
2021-05-21 10:10 ` Borislav Petkov
@ 2021-05-25 12:52 ` tip-bot2 for David Bartley
2 siblings, 0 replies; 9+ messages in thread
From: tip-bot2 for David Bartley @ 2021-05-25 12:52 UTC (permalink / raw)
To: linux-tip-commits
Cc: David Bartley, Borislav Petkov, Wei Huang, x86, linux-kernel
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 2ade8fc65076095460e3ea1ca65a8f619d7d9a3a
Gitweb: https://git.kernel.org/tip/2ade8fc65076095460e3ea1ca65a8f619d7d9a3a
Author: David Bartley <andareed@gmail.com>
AuthorDate: Thu, 20 May 2021 10:41:30 -07:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 21 May 2021 12:01:38 +02:00
x86/amd_nb: Add AMD family 19h model 50h PCI ids
This is required to support Zen3 APUs in k10temp.
Signed-off-by: David Bartley <andareed@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Wei Huang <wei.huang2@amd.com>
Link: https://lkml.kernel.org/r/20210520174130.94954-1-andareed@gmail.com
---
arch/x86/kernel/amd_nb.c | 3 +++
include/linux/pci_ids.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 0908309..23dda36 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -25,6 +25,7 @@
#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
#define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654
+#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
/* Protect the PCI config register pairs used for SMN and DF indirect access. */
static DEFINE_MUTEX(smn_mutex);
@@ -57,6 +58,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
{}
};
@@ -72,6 +74,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
{}
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 4c3fa52..5356ccf 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -555,6 +555,7 @@
#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
#define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
+#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-05-25 12:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-20 17:41 [PATCH] x86/amd_nb: add AMD family 19h model 50h PCI ids David Bartley
2021-05-20 21:36 ` Wei Huang
2021-05-20 22:45 ` Borislav Petkov
2021-05-20 22:47 ` Wei Huang
2021-05-21 10:10 ` Borislav Petkov
2021-05-21 16:05 ` Wei Huang
2021-05-21 17:45 ` Guenter Roeck
2021-05-21 18:43 ` Borislav Petkov
2021-05-25 12:52 ` [tip: x86/cpu] x86/amd_nb: Add " tip-bot2 for David Bartley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.