Re: [PATCH v2 2/6] x86/amd_nb: Add Family 19h model 70h-7Fh IDs

[Guenter Roeck]

On 6/2/22 13:11, Mario Limonciello wrote:
> Add support for SMN communication on Family 19h Model 70h.
>
> Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>

I can not apply this series without the context patches (which I wasn't
copied on), so I assume the idea is to push this through the x86 tree.
This is ok with me.

I can not apply this patch without the context patch (which I wasn't
copied on), so I assume the idea is to push this through the x86
tree. This is ok with me.

Acked-by: Guenter Roeck <linux@xxxxxxxxxxxx>

> ---
>   arch/x86/kernel/amd_nb.c | 4 ++++
>   include/linux/pci_ids.h  | 1 +
>   2 files changed, 5 insertions(+)
>
> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
> index 60c7bd525237..15295f5d9aca 100644
> --- a/arch/x86/kernel/amd_nb.c
> +++ b/arch/x86/kernel/amd_nb.c
> @@ -32,6 +32,8 @@
>   #define PCI_DEVICE_ID_AMD_19H_M40H_ROOT	0x14b5
>   #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F4 0x167d
>   #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
> +#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT	0x14e8
> +#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4
>   
>   /* Protect the PCI config register pairs used for SMN. */
>   static DEFINE_MUTEX(smn_mutex);
> @@ -46,6 +48,7 @@ static const struct pci_device_id amd_root_ids[] = {
>   	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_ROOT) },
>   	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_ROOT) },
>   	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) },
>   	{}
>   };
>   
> @@ -71,6 +74,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
>   	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) },
>   	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) },
>   	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
> +	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
>   	{}
>   };
>   
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index ec1c226d13e6..32a1f85ff0de 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -561,6 +561,7 @@
>   #define PCI_DEVICE_ID_AMD_19H_M10H_DF_F3 0x14b0
>   #define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c
>   #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
> +#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3
>   #define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703
>   #define PCI_DEVICE_ID_AMD_LANCE		0x2000
>   #define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001