lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 228/350] EDAC, amd64: Add Family 17h, models 10h-2fh support
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Michael Jin <mikhail.jin@gmail.com>

    commit 8960de4a5ca7980ed1e19e7ca5a774d3b7a55c38 upstream.

    Add new device IDs for family 17h, models 10h-2fh.

    This is required by amd64_edac_mod in order to properly detect PCI
    device functions 0 and 6.

    Signed-off-by: Michael Jin <mikhail.jin@gmail.com>
    Reviewed-by: Yazen Ghannam <Yazen.Ghannam@amd.com>
    Cc: <stable@vger.kernel.org>
    Link: http://lkml.kernel.org/r/20180816192840.31166-1-mikhail.jin@gmail.com
    Signed-off-by: Borislav Petkov <bp@suse.de>
    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
    @@ -2200,6 +2200,15 @@ static struct amd64_family_type family_t
    .dbam_to_cs = f17_base_addr_to_cs_size,
    }
    },
    + [F17_M10H_CPUS] = {
    + .ctl_name = "F17h_M10h",
    + .f0_id = PCI_DEVICE_ID_AMD_17H_M10H_DF_F0,
    + .f6_id = PCI_DEVICE_ID_AMD_17H_M10H_DF_F6,
    + .ops = {
    + .early_channel_count = f17_early_channel_count,
    + .dbam_to_cs = f17_base_addr_to_cs_size,
    + }
    + },
    };

    /*
    @@ -3188,6 +3197,11 @@ static struct amd64_family_type *per_fam
    break;

    case 0x17:
    + if (pvt->model >= 0x10 && pvt->model <= 0x2f) {
    + fam_type = &family_types[F17_M10H_CPUS];
    + pvt->ops = &family_types[F17_M10H_CPUS].ops;
    + break;
    + }
    fam_type = &family_types[F17_CPUS];
    pvt->ops = &family_types[F17_CPUS].ops;
    break;
    --- a/drivers/edac/amd64_edac.h
    +++ b/drivers/edac/amd64_edac.h
    @@ -115,6 +115,8 @@
    #define PCI_DEVICE_ID_AMD_16H_M30H_NB_F2 0x1582
    #define PCI_DEVICE_ID_AMD_17H_DF_F0 0x1460
    #define PCI_DEVICE_ID_AMD_17H_DF_F6 0x1466
    +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F0 0x15e8
    +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F6 0x15ee

    /*
    * Function 1 - Address Map
    @@ -281,6 +283,7 @@ enum amd_families {
    F16_CPUS,
    F16_M30H_CPUS,
    F17_CPUS,
    + F17_M10H_CPUS,
    NUM_FAMILIES,
    };


    \
     
     \ /
      Last update: 2018-11-12 00:25    [W:4.382 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site