lkml.org 
[lkml]   [2020]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] x86/amd_nb: Add Family 17h, Model 60h PCI IDs
    Date
    Add the new Family 17h, Model 60h PCI IDs for AMD Zen2 APU systems.

    Signed-off-by: Jacky Hu <hengqing.hu@gmail.com>
    ---
    arch/x86/kernel/amd_nb.c | 5 +++++
    drivers/hwmon/k10temp.c | 2 ++
    include/linux/pci_ids.h | 1 +
    3 files changed, 8 insertions(+)

    diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
    index b6b3297851f3..b57e7bd68885 100644
    --- a/arch/x86/kernel/amd_nb.c
    +++ b/arch/x86/kernel/amd_nb.c
    @@ -18,9 +18,11 @@
    #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450
    #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0
    #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480
    +#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630
    #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464
    #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
    #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494
    +#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

    @@ -33,6 +35,7 @@ static const struct pci_device_id amd_root_ids[] = {
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) },
    + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) },
    {}
    };

    @@ -51,6 +54,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
    + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_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) },
    {}
    @@ -65,6 +69,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },
    + { 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_CNB17H_F4) },
    diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
    index 9915578533bb..287e9cf2aab9 100644
    --- a/drivers/hwmon/k10temp.c
    +++ b/drivers/hwmon/k10temp.c
    @@ -583,6 +583,7 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    k10temp_get_ccd_support(pdev, data, 4);
    break;
    case 0x31: /* Zen2 Threadripper */
    + case 0x60: /* Zen2 APU */
    case 0x71: /* Zen2 */
    data->show_current = !is_threadripper() && !is_epyc();
    data->cfactor[0] = CFACTOR_ICORE;
    @@ -632,6 +633,7 @@ static const struct pci_device_id k10temp_id_table[] = {
    { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
    { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
    { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
    + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
    { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
    { PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
    {}
    diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
    index 9a57e6717e5c..0ad57693f392 100644
    --- a/include/linux/pci_ids.h
    +++ b/include/linux/pci_ids.h
    @@ -550,6 +550,7 @@
    #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
    #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
    #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
    +#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_CNB17H_F3 0x1703
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-06-07 06:37    [W:7.505 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site