diff options
author | Yazen Ghannam <Yazen.Ghannam@amd.com> | 2016-11-17 17:57:35 -0500 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2016-11-24 21:24:09 +0100 |
commit | f1cbbec9fce958d3d71ed815a01c815b35533f1f (patch) | |
tree | b275c3b7e4d95099d6f77dbea2a01b7072769b6f /drivers/edac/amd64_edac.h | |
parent | 196b79fcc8ed4e3c565a746b06125596bee06b62 (diff) | |
download | lwn-f1cbbec9fce958d3d71ed815a01c815b35533f1f.tar.gz lwn-f1cbbec9fce958d3d71ed815a01c815b35533f1f.zip |
EDAC, amd64: Add AMD Fam17h family type and ops
Add a family type and associated ops for Fam17h. Define a struct to hold
all the UMC registers that we need. Make this a part of struct amd64_pvt
in order to maximize code reuse in the rest of the driver.
Signed-off-by: Yazen Ghannam <Yazen.Ghannam@amd.com>
Cc: Aravind Gopalakrishnan <aravindksg.lkml@gmail.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Cc: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/1479423463-8536-10-git-send-email-Yazen.Ghannam@amd.com
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac/amd64_edac.h')
-rw-r--r-- | drivers/edac/amd64_edac.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index 96c1f5d6d130..ada39f165a9b 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h @@ -118,6 +118,8 @@ #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 +#define PCI_DEVICE_ID_AMD_17H_DF_F0 0x1460 +#define PCI_DEVICE_ID_AMD_17H_DF_F6 0x1466 /* * Function 1 - Address Map @@ -266,6 +268,7 @@ enum amd_families { F15_M60H_CPUS, F16_CPUS, F16_M30H_CPUS, + F17_CPUS, NUM_FAMILIES, }; @@ -298,6 +301,10 @@ struct chip_select { u8 m_cnt; }; +struct amd64_umc { + u32 sdp_ctrl; /* SDP Control reg */ +}; + struct amd64_pvt { struct low_ops *ops; @@ -345,6 +352,8 @@ struct amd64_pvt { /* cache the dram_type */ enum mem_type dram_type; + + struct amd64_umc *umc; /* UMC registers */ }; enum err_codes { @@ -438,7 +447,7 @@ struct low_ops { struct amd64_family_type { const char *ctl_name; - u16 f1_id, f2_id; + u16 f0_id, f1_id, f2_id, f6_id; struct low_ops ops; }; |