* EDAC: Drop duplicated array of strings for memory type names
@ 2017-12-05 18:54 Luck, Tony
0 siblings, 0 replies; 3+ messages in thread
From: Luck, Tony @ 2017-12-05 18:54 UTC (permalink / raw)
To: Borislav Petkov
Cc: linux-edac, Mauro Carvalho Chehab, Qiuxu Zhuo, Aristeu Rozanski
On Tue, Dec 05, 2017 at 11:45:51AM +0100, Borislav Petkov wrote:
> On Mon, Dec 04, 2017 at 04:53:14PM -0800, Tony Luck wrote:
> > drivers/edac/edac_mc.c | 40 ++++++++++++++++++++--------------------
> > drivers/edac/edac_mc_sysfs.c | 26 ++------------------------
> > 2 files changed, 22 insertions(+), 44 deletions(-)
>
> Looks good, thanks for doing that!
>
> Acked-by: Borislav Petkov <bp@suse.de>
>
> I'm assuming you'll add it to your nvdimm patchset and the whole thing
> should go together so that we don't create any needless cross-tree
> dependencies..?
Yes. I will put this as part 1/N of that series.
-Tony
---
To unsubscribe from this list: send the line "unsubscribe linux-edac" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* EDAC: Drop duplicated array of strings for memory type names
@ 2017-12-05 10:45 Borislav Petkov
0 siblings, 0 replies; 3+ messages in thread
From: Borislav Petkov @ 2017-12-05 10:45 UTC (permalink / raw)
To: Tony Luck; +Cc: linux-edac, Mauro Carvalho Chehab, Qiuxu Zhuo, Aristeu Rozanski
On Mon, Dec 04, 2017 at 04:53:14PM -0800, Tony Luck wrote:
> Somehow we ended up with two separate arrays of strings to describe
> the "enum mem_type" values.
>
> In edac_mc.c we have an exported list edac_mem_types[] that is used
> by a couple of drivers in debug messaged.
>
> In edac_mc_sysfs.c we have a private list that is used to display
> values in:
> /sys/devices/system/edac/mc/mc*/dimm*/dimm_mem_type
> /sys/devices/system/edac/mc/mc*/csrow*/mem_type
> this list was missing a value for MEM_LRDDR3
>
> The string values in the two lists were different :-(
>
> Combining the lists, I kept the values so that the sysfs output
> will be unchanged as some scripts may depend on that.
>
> Reported-by: Borislav Petkov <bp@suse.de>
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> ---
> drivers/edac/edac_mc.c | 40 ++++++++++++++++++++--------------------
> drivers/edac/edac_mc_sysfs.c | 26 ++------------------------
> 2 files changed, 22 insertions(+), 44 deletions(-)
Looks good, thanks for doing that!
Acked-by: Borislav Petkov <bp@suse.de>
I'm assuming you'll add it to your nvdimm patchset and the whole thing
should go together so that we don't create any needless cross-tree
dependencies..?
^ permalink raw reply [flat|nested] 3+ messages in thread
* EDAC: Drop duplicated array of strings for memory type names
@ 2017-12-05 0:53 Luck, Tony
0 siblings, 0 replies; 3+ messages in thread
From: Luck, Tony @ 2017-12-05 0:53 UTC (permalink / raw)
To: linux-edac
Cc: Tony Luck, Borislav Petkov, Mauro Carvalho Chehab, Qiuxu Zhuo,
Aristeu Rozanski
Somehow we ended up with two separate arrays of strings to describe
the "enum mem_type" values.
In edac_mc.c we have an exported list edac_mem_types[] that is used
by a couple of drivers in debug messaged.
In edac_mc_sysfs.c we have a private list that is used to display
values in:
/sys/devices/system/edac/mc/mc*/dimm*/dimm_mem_type
/sys/devices/system/edac/mc/mc*/csrow*/mem_type
this list was missing a value for MEM_LRDDR3
The string values in the two lists were different :-(
Combining the lists, I kept the values so that the sysfs output
will be unchanged as some scripts may depend on that.
Reported-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---
drivers/edac/edac_mc.c | 40 ++++++++++++++++++++--------------------
drivers/edac/edac_mc_sysfs.c | 26 ++------------------------
2 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 48193f5f3b56..1f61b736e075 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -195,26 +195,26 @@ static void edac_mc_dump_mci(struct mem_ctl_info *mci)
#endif /* CONFIG_EDAC_DEBUG */
const char * const edac_mem_types[] = {
- [MEM_EMPTY] = "Empty csrow",
- [MEM_RESERVED] = "Reserved csrow type",
- [MEM_UNKNOWN] = "Unknown csrow type",
- [MEM_FPM] = "Fast page mode RAM",
- [MEM_EDO] = "Extended data out RAM",
- [MEM_BEDO] = "Burst Extended data out RAM",
- [MEM_SDR] = "Single data rate SDRAM",
- [MEM_RDR] = "Registered single data rate SDRAM",
- [MEM_DDR] = "Double data rate SDRAM",
- [MEM_RDDR] = "Registered Double data rate SDRAM",
- [MEM_RMBS] = "Rambus DRAM",
- [MEM_DDR2] = "Unbuffered DDR2 RAM",
- [MEM_FB_DDR2] = "Fully buffered DDR2",
- [MEM_RDDR2] = "Registered DDR2 RAM",
- [MEM_XDR] = "Rambus XDR",
- [MEM_DDR3] = "Unbuffered DDR3 RAM",
- [MEM_RDDR3] = "Registered DDR3 RAM",
- [MEM_LRDDR3] = "Load-Reduced DDR3 RAM",
- [MEM_DDR4] = "Unbuffered DDR4 RAM",
- [MEM_RDDR4] = "Registered DDR4 RAM",
+ [MEM_EMPTY] = "Empty",
+ [MEM_RESERVED] = "Reserved",
+ [MEM_UNKNOWN] = "Unknown",
+ [MEM_FPM] = "FPM",
+ [MEM_EDO] = "EDO",
+ [MEM_BEDO] = "BEDO",
+ [MEM_SDR] = "Unbuffered-SDR",
+ [MEM_RDR] = "Registered-SDR",
+ [MEM_DDR] = "Unbuffered-DDR",
+ [MEM_RDDR] = "Registered-DDR",
+ [MEM_RMBS] = "RMBS",
+ [MEM_DDR2] = "Unbuffered-DDR2",
+ [MEM_FB_DDR2] = "FullyBuffered-DDR2",
+ [MEM_RDDR2] = "Registered-DDR2",
+ [MEM_XDR] = "XDR",
+ [MEM_DDR3] = "Unbuffered-DDR3",
+ [MEM_RDDR3] = "Registered-DDR3",
+ [MEM_LRDDR3] = "Load-Reduced-DDR3-RAM",
+ [MEM_DDR4] = "Unbuffered-DDR4",
+ [MEM_RDDR4] = "Registered-DDR4"
};
EXPORT_SYMBOL_GPL(edac_mem_types);
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index c70ea82c815c..7481955160a4 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -91,28 +91,6 @@ static struct device *mci_pdev;
/*
* various constants for Memory Controllers
*/
-static const char * const mem_types[] = {
- [MEM_EMPTY] = "Empty",
- [MEM_RESERVED] = "Reserved",
- [MEM_UNKNOWN] = "Unknown",
- [MEM_FPM] = "FPM",
- [MEM_EDO] = "EDO",
- [MEM_BEDO] = "BEDO",
- [MEM_SDR] = "Unbuffered-SDR",
- [MEM_RDR] = "Registered-SDR",
- [MEM_DDR] = "Unbuffered-DDR",
- [MEM_RDDR] = "Registered-DDR",
- [MEM_RMBS] = "RMBS",
- [MEM_DDR2] = "Unbuffered-DDR2",
- [MEM_FB_DDR2] = "FullyBuffered-DDR2",
- [MEM_RDDR2] = "Registered-DDR2",
- [MEM_XDR] = "XDR",
- [MEM_DDR3] = "Unbuffered-DDR3",
- [MEM_RDDR3] = "Registered-DDR3",
- [MEM_DDR4] = "Unbuffered-DDR4",
- [MEM_RDDR4] = "Registered-DDR4"
-};
-
static const char * const dev_types[] = {
[DEV_UNKNOWN] = "Unknown",
[DEV_X1] = "x1",
@@ -196,7 +174,7 @@ static ssize_t csrow_mem_type_show(struct device *dev,
{
struct csrow_info *csrow = to_csrow(dev);
- return sprintf(data, "%s\n", mem_types[csrow->channels[0]->dimm->mtype]);
+ return sprintf(data, "%s\n", edac_mem_types[csrow->channels[0]->dimm->mtype]);
}
static ssize_t csrow_dev_type_show(struct device *dev,
@@ -549,7 +527,7 @@ static ssize_t dimmdev_mem_type_show(struct device *dev,
{
struct dimm_info *dimm = to_dimm(dev);
- return sprintf(data, "%s\n", mem_types[dimm->mtype]);
+ return sprintf(data, "%s\n", edac_mem_types[dimm->mtype]);
}
static ssize_t dimmdev_dev_type_show(struct device *dev,
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-05 18:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-05 18:54 EDAC: Drop duplicated array of strings for memory type names Luck, Tony
-- strict thread matches above, loose matches on Subject: below --
2017-12-05 10:45 Borislav Petkov
2017-12-05 0:53 Luck, Tony
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.