lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 312/376] EDAC/amd64: Add AMD family 17h model 60h PCI IDs
    Date
    From: Alexander Monakov <amonakov@ispras.ru>

    commit b6bea24d41519e8c31e4798f1c1a3f67e540c5d0 upstream.

    Add support for AMD Renoir (4000-series Ryzen CPUs).

    Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Acked-by: Yazen Ghannam <yazen.ghannam@amd.com>
    Link: https://lkml.kernel.org/r/20200510204842.2603-4-amonakov@ispras.ru
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/edac/amd64_edac.c | 14 ++++++++++++++
    drivers/edac/amd64_edac.h | 3 +++
    2 files changed, 17 insertions(+)

    --- a/drivers/edac/amd64_edac.c
    +++ b/drivers/edac/amd64_edac.c
    @@ -2319,6 +2319,16 @@ static struct amd64_family_type family_t
    .dbam_to_cs = f17_addr_mask_to_cs_size,
    }
    },
    + [F17_M60H_CPUS] = {
    + .ctl_name = "F17h_M60h",
    + .f0_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F0,
    + .f6_id = PCI_DEVICE_ID_AMD_17H_M60H_DF_F6,
    + .max_mcs = 2,
    + .ops = {
    + .early_channel_count = f17_early_channel_count,
    + .dbam_to_cs = f17_addr_mask_to_cs_size,
    + }
    + },
    [F17_M70H_CPUS] = {
    .ctl_name = "F17h_M70h",
    .f0_id = PCI_DEVICE_ID_AMD_17H_M70H_DF_F0,
    @@ -3357,6 +3367,10 @@ static struct amd64_family_type *per_fam
    fam_type = &family_types[F17_M30H_CPUS];
    pvt->ops = &family_types[F17_M30H_CPUS].ops;
    break;
    + } else if (pvt->model >= 0x60 && pvt->model <= 0x6f) {
    + fam_type = &family_types[F17_M60H_CPUS];
    + pvt->ops = &family_types[F17_M60H_CPUS].ops;
    + break;
    } else if (pvt->model >= 0x70 && pvt->model <= 0x7f) {
    fam_type = &family_types[F17_M70H_CPUS];
    pvt->ops = &family_types[F17_M70H_CPUS].ops;
    --- a/drivers/edac/amd64_edac.h
    +++ b/drivers/edac/amd64_edac.h
    @@ -120,6 +120,8 @@
    #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee
    #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F0 0x1490
    #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F6 0x1496
    +#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F0 0x1448
    +#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F6 0x144e
    #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F0 0x1440
    #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F6 0x1446
    #define PCI_DEVICE_ID_AMD_19H_DF_F0 0x1650
    @@ -293,6 +295,7 @@ enum amd_families {
    F17_CPUS,
    F17_M10H_CPUS,
    F17_M30H_CPUS,
    + F17_M60H_CPUS,
    F17_M70H_CPUS,
    F19_CPUS,
    NUM_FAMILIES,

    \
     
     \ /
      Last update: 2020-06-19 17:55    [W:4.190 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site