lkml.org 
[lkml]   [2015]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 027/111] amd64_edac: Add support for newer F16h models
    Date
    From: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 85a8885bd0e00569108aa7b5e26b89c752e3cd51 upstream.

    Extend ECC decoding support for F16h M30h. Tested on F16h M30h with ECC
    turned on using mce_amd_inj module and the patch works fine.

    Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
    Link: http://lkml.kernel.org/r/1392913726-16961-1-git-send-email-Aravind.Gopalakrishnan@amd.com
    Tested-by: Arindam Nath <Arindam.Nath@amd.com>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/x86/kernel/amd_nb.c | 2 ++
    drivers/edac/amd64_edac.c | 24 ++++++++++++++++++++++++
    drivers/edac/amd64_edac.h | 3 +++
    include/linux/pci_ids.h | 2 ++
    4 files changed, 31 insertions(+)

    diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
    index 59554dca96ec..6523534671b6 100644
    --- a/arch/x86/kernel/amd_nb.c
    +++ b/arch/x86/kernel/amd_nb.c
    @@ -22,6 +22,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
    + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },
    {}
    };
    EXPORT_SYMBOL(amd_nb_misc_ids);
    @@ -30,6 +31,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F4) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
    + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) },
    {}
    };

    diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
    index 10162af430c5..7a7d5d5d7d6d 100644
    --- a/drivers/edac/amd64_edac.c
    +++ b/drivers/edac/amd64_edac.c
    @@ -1806,6 +1806,17 @@ static struct amd64_family_type amd64_family_types[] = {
    .read_dct_pci_cfg = f10_read_dct_pci_cfg,
    }
    },
    + [F16_M30H_CPUS] = {
    + .ctl_name = "F16h_M30h",
    + .f1_id = PCI_DEVICE_ID_AMD_16H_M30H_NB_F1,
    + .f3_id = PCI_DEVICE_ID_AMD_16H_M30H_NB_F3,
    + .ops = {
    + .early_channel_count = f1x_early_channel_count,
    + .map_sysaddr_to_csrow = f1x_map_sysaddr_to_csrow,
    + .dbam_to_cs = f16_dbam_to_chip_select,
    + .read_dct_pci_cfg = f10_read_dct_pci_cfg,
    + }
    + },
    };

    /*
    @@ -2596,6 +2607,11 @@ static struct amd64_family_type *amd64_per_family_init(struct amd64_pvt *pvt)
    break;

    case 0x16:
    + if (pvt->model == 0x30) {
    + fam_type = &amd64_family_types[F16_M30H_CPUS];
    + pvt->ops = &amd64_family_types[F16_M30H_CPUS].ops;
    + break;
    + }
    fam_type = &amd64_family_types[F16_CPUS];
    pvt->ops = &amd64_family_types[F16_CPUS].ops;
    break;
    @@ -2848,6 +2864,14 @@ static DEFINE_PCI_DEVICE_TABLE(amd64_pci_table) = {
    .class = 0,
    .class_mask = 0,
    },
    + {
    + .vendor = PCI_VENDOR_ID_AMD,
    + .device = PCI_DEVICE_ID_AMD_16H_M30H_NB_F2,
    + .subvendor = PCI_ANY_ID,
    + .subdevice = PCI_ANY_ID,
    + .class = 0,
    + .class_mask = 0,
    + },

    {0, }
    };
    diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
    index d2443cfa0698..eff9eed80353 100644
    --- a/drivers/edac/amd64_edac.h
    +++ b/drivers/edac/amd64_edac.h
    @@ -176,6 +176,8 @@
    #define PCI_DEVICE_ID_AMD_15H_NB_F2 0x1602
    #define PCI_DEVICE_ID_AMD_16H_NB_F1 0x1531
    #define PCI_DEVICE_ID_AMD_16H_NB_F2 0x1532
    +#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F1 0x1581
    +#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F2 0x1582

    /*
    * Function 1 - Address Map
    @@ -308,6 +310,7 @@ enum amd_families {
    F15_CPUS,
    F15_M30H_CPUS,
    F16_CPUS,
    + F16_M30H_CPUS,
    NUM_FAMILIES,
    };

    diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
    index 057c1d8c77e5..5695d8a0aedb 100644
    --- a/include/linux/pci_ids.h
    +++ b/include/linux/pci_ids.h
    @@ -528,6 +528,8 @@
    #define PCI_DEVICE_ID_AMD_15H_NB_F5 0x1605
    #define PCI_DEVICE_ID_AMD_16H_NB_F3 0x1533
    #define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534
    +#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583
    +#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584
    #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
    #define PCI_DEVICE_ID_AMD_LANCE 0x2000
    #define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
    --
    2.4.2


    \
     
     \ /
      Last update: 2015-06-10 18:21    [W:4.013 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site