summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi Kani <toshi.kani@hpe.com>2018-05-09 16:20:30 -0600
committerBorislav Petkov <bp@suse.de>2018-05-12 14:16:49 +0200
commitad0d73b324dbc9e5b987fbda08ceb523fbeb0a9f (patch)
tree4e5eb9bad28349886b7daad0e784c7c36cbb6e02
parente9918d7fafae2ec5365b193654960f6158751f8c (diff)
downloadlinux-ad0d73b324dbc9e5b987fbda08ceb523fbeb0a9f.tar.gz
linux-ad0d73b324dbc9e5b987fbda08ceb523fbeb0a9f.tar.bz2
linux-ad0d73b324dbc9e5b987fbda08ceb523fbeb0a9f.zip
EDAC, ghes: Add DDR4 and NVDIMM memory types
The ghes_edac driver obtains memory type from SMBIOS type 17, but it does not recognize DDR4 and NVDIMM types. Add support of DDR4 and NVDIMM types. NVDIMM type is denoted by memory type DDR3/4 and non-volatile. Reported-by: Robert Elliott <elliott@hpe.com> Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/20180509222030.9299-1-toshi.kani@hpe.com Signed-off-by: Borislav Petkov <bp@suse.de>
-rw-r--r--drivers/edac/ghes_edac.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
index b9bea77b3de8..cb8f2704ffb0 100644
--- a/drivers/edac/ghes_edac.c
+++ b/drivers/edac/ghes_edac.c
@@ -123,11 +123,21 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg)
dimm->mtype = MEM_FB_DDR2;
break;
case 0x18:
- if (entry->type_detail & 1 << 13)
+ if (entry->type_detail & 1 << 12)
+ dimm->mtype = MEM_NVDIMM;
+ else if (entry->type_detail & 1 << 13)
dimm->mtype = MEM_RDDR3;
else
dimm->mtype = MEM_DDR3;
break;
+ case 0x1a:
+ if (entry->type_detail & 1 << 12)
+ dimm->mtype = MEM_NVDIMM;
+ else if (entry->type_detail & 1 << 13)
+ dimm->mtype = MEM_RDDR4;
+ else
+ dimm->mtype = MEM_DDR4;
+ break;
default:
if (entry->type_detail & 1 << 6)
dimm->mtype = MEM_RMBS;