Skip to content

L
linux
Commit 26d3a77d authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'edac_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 

Pull EDAC updates from Borislav Petkov:
 "Nothing earth-shattering - just the normal development flow of
  cleanups, improvements, fixes and such.

  Summary:

   - i31200_edac: Add Kabylake support (Jason Baron)

   - sb_edac: resolve memory controller detection issues on asymmetric
     setups with not all DIMM slots being populated (Tony Luck and Qiuxu
     Zhuo)

   - misc cleanups and fixlets all over"

* tag 'edac_for_4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: (22 commits)
  EDAC, pnd2: Fix Apollo Lake DIMM detection
  EDAC, i5000, i5400: Fix definition of NRECMEMB register
  EDAC, pnd2: Make function sbi_send() static
  EDAC, pnd2: Return proper error value from apl_rd_reg()
  EDAC, altera: Simplify calculation of total memory
  EDAC, sb_edac: Avoid creating SOCK memory controller
  EDAC, mce_amd: Fix typo in SMCA error description
  EDAC, mv64x60: Sanity check edac_op_state before registering
  EDAC, thunderx: Fix a warning during l2c debugfs node creation
  EDAC, mv64x60: Check driver registration success
  EDAC, ie31200: Add Intel Kaby Lake CPU support
  EDAC, mv64x60: Replace in_le32()/out_le32() with readl()/writel()
  EDAC, mv64x60: Fix pdata->name
  EDAC, sb_edac: Bump driver version and do some cleanups
  EDAC, sb_edac: Check if ECC enabled when at least one DIMM is present
  EDAC, sb_edac: Drop NUM_CHANNELS from 8 back to 4
  EDAC, sb_edac: Carve out dimm-populating loop
  EDAC, sb_edac: Fix mod_name
  EDAC, sb_edac: Assign EDAC memory controller per h/w controller
  EDAC, sb_edac: Don't use "Socket#" in the memory controller name
  ...
parents c6b1e36c 164c2924
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 399 additions and 444 deletions
drivers/edac/altera_edac.c
View file @ 26d3a77d
...@@ -214,24 +214,16 @@ static void altr_sdr_mc_create_debugfs_nodes(struct mem_ctl_info *mci) ...@@ -214,24 +214,16 @@ static void altr_sdr_mc_create_debugfs_nodes(struct mem_ctl_info *mci)
static unsigned long get_total_mem(void) static unsigned long get_total_mem(void)
{ {
struct device_node *np = NULL; struct device_node *np = NULL;
const unsigned int *reg, *reg_end; struct resource res;
int len, sw, aw; int ret;
unsigned long start, size, total_mem = 0; unsigned long total_mem = 0;
for_each_node_by_type(np, "memory") { for_each_node_by_type(np, "memory") {
aw = of_n_addr_cells(np); ret = of_address_to_resource(np, 0, &res);
sw = of_n_size_cells(np); if (ret)
reg = (const unsigned int *)of_get_property(np, "reg", &len); continue;
reg_end = reg + (len / sizeof(u32));
total_mem += resource_size(&res);
total_mem = 0;
do {
start = of_read_number(reg, aw);
reg += aw;
size = of_read_number(reg, sw);
reg += sw;
total_mem += size;
} while (reg < reg_end);
} }
edac_dbg(0, "total_mem 0x%lx\n", total_mem); edac_dbg(0, "total_mem 0x%lx\n", total_mem);
return total_mem; return total_mem;
...@@ -1839,7 +1831,7 @@ static int a10_eccmgr_irqdomain_map(struct irq_domain *d, unsigned int irq, ...@@ -1839,7 +1831,7 @@ static int a10_eccmgr_irqdomain_map(struct irq_domain *d, unsigned int irq,
return 0; return 0;
} }
static struct irq_domain_ops a10_eccmgr_ic_ops = { static const struct irq_domain_ops a10_eccmgr_ic_ops = {
.map = a10_eccmgr_irqdomain_map, .map = a10_eccmgr_irqdomain_map,
.xlate = irq_domain_xlate_twocell, .xlate = irq_domain_xlate_twocell,
}; };
......
drivers/edac/i5000_edac.c
View file @ 26d3a77d
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
#define NREC_RDWR(x) (((x)>>11) & 1) #define NREC_RDWR(x) (((x)>>11) & 1)
#define NREC_RANK(x) (((x)>>8) & 0x7) #define NREC_RANK(x) (((x)>>8) & 0x7)
#define NRECMEMB 0xC0 #define NRECMEMB 0xC0
#define NREC_CAS(x) (((x)>>16) & 0xFFFFFF) #define NREC_CAS(x) (((x)>>16) & 0xFFF)
#define NREC_RAS(x) ((x) & 0x7FFF) #define NREC_RAS(x) ((x) & 0x7FFF)
#define NRECFGLOG 0xC4 #define NRECFGLOG 0xC4
#define NREEECFBDA 0xC8 #define NREEECFBDA 0xC8
...@@ -371,7 +371,7 @@ struct i5000_error_info { ...@@ -371,7 +371,7 @@ struct i5000_error_info {
/* These registers are input ONLY if there was a /* These registers are input ONLY if there was a
* Non-Recoverable Error */ * Non-Recoverable Error */
u16 nrecmema; /* Non-Recoverable Mem log A */ u16 nrecmema; /* Non-Recoverable Mem log A */
u16 nrecmemb; /* Non-Recoverable Mem log B */ u32 nrecmemb; /* Non-Recoverable Mem log B */
}; };
...@@ -407,7 +407,7 @@ static void i5000_get_error_info(struct mem_ctl_info *mci, ...@@ -407,7 +407,7 @@ static void i5000_get_error_info(struct mem_ctl_info *mci,
NERR_FAT_FBD, &info->nerr_fat_fbd); NERR_FAT_FBD, &info->nerr_fat_fbd);
pci_read_config_word(pvt->branchmap_werrors, pci_read_config_word(pvt->branchmap_werrors,
NRECMEMA, &info->nrecmema); NRECMEMA, &info->nrecmema);
pci_read_config_word(pvt->branchmap_werrors, pci_read_config_dword(pvt->branchmap_werrors,
NRECMEMB, &info->nrecmemb); NRECMEMB, &info->nrecmemb);
/* Clear the error bits, by writing them back */ /* Clear the error bits, by writing them back */
......
drivers/edac/i5400_edac.c
View file @ 26d3a77d
...@@ -368,7 +368,7 @@ struct i5400_error_info { ...@@ -368,7 +368,7 @@ struct i5400_error_info {
/* These registers are input ONLY if there was a Non-Rec Error */ /* These registers are input ONLY if there was a Non-Rec Error */
u16 nrecmema; /* Non-Recoverable Mem log A */ u16 nrecmema; /* Non-Recoverable Mem log A */
u16 nrecmemb; /* Non-Recoverable Mem log B */ u32 nrecmemb; /* Non-Recoverable Mem log B */
}; };
...@@ -458,7 +458,7 @@ static void i5400_get_error_info(struct mem_ctl_info *mci, ...@@ -458,7 +458,7 @@ static void i5400_get_error_info(struct mem_ctl_info *mci,
NERR_FAT_FBD, &info->nerr_fat_fbd); NERR_FAT_FBD, &info->nerr_fat_fbd);
pci_read_config_word(pvt->branchmap_werrors, pci_read_config_word(pvt->branchmap_werrors,
NRECMEMA, &info->nrecmema); NRECMEMA, &info->nrecmema);
pci_read_config_word(pvt->branchmap_werrors, pci_read_config_dword(pvt->branchmap_werrors,
NRECMEMB, &info->nrecmemb); NRECMEMB, &info->nrecmemb);
/* Clear the error bits, by writing them back */ /* Clear the error bits, by writing them back */
......
drivers/edac/ie31200_edac.c
View file @ 26d3a77d
...@@ -18,10 +18,12 @@ ...@@ -18,10 +18,12 @@
* 0c04: Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller * 0c04: Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller
* 0c08: Xeon E3-1200 v3 Processor DRAM Controller * 0c08: Xeon E3-1200 v3 Processor DRAM Controller
* 1918: Xeon E3-1200 v5 Skylake Host Bridge/DRAM Registers * 1918: Xeon E3-1200 v5 Skylake Host Bridge/DRAM Registers
* 5918: Xeon E3-1200 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers
* *
* Based on Intel specification: * Based on Intel specification:
* http://www.intel.com/content/dam/www/public/us/en/documents/datasheets/xeon-e3-1200v3-vol-2-datasheet.pdf * http://www.intel.com/content/dam/www/public/us/en/documents/datasheets/xeon-e3-1200v3-vol-2-datasheet.pdf
* http://www.intel.com/content/www/us/en/processors/xeon/xeon-e3-1200-family-vol-2-datasheet.html * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e3-1200-family-vol-2-datasheet.html
* http://www.intel.com/content/www/us/en/processors/core/7th-gen-core-family-mobile-h-processor-lines-datasheet-vol-2.html
* *
* According to the above datasheet (p.16): * According to the above datasheet (p.16):
* " * "
...@@ -57,6 +59,7 @@ ...@@ -57,6 +59,7 @@
#define PCI_DEVICE_ID_INTEL_IE31200_HB_6 0x0c04 #define PCI_DEVICE_ID_INTEL_IE31200_HB_6 0x0c04
#define PCI_DEVICE_ID_INTEL_IE31200_HB_7 0x0c08 #define PCI_DEVICE_ID_INTEL_IE31200_HB_7 0x0c08
#define PCI_DEVICE_ID_INTEL_IE31200_HB_8 0x1918 #define PCI_DEVICE_ID_INTEL_IE31200_HB_8 0x1918
#define PCI_DEVICE_ID_INTEL_IE31200_HB_9 0x5918
#define IE31200_DIMMS 4 #define IE31200_DIMMS 4
#define IE31200_RANKS 8 #define IE31200_RANKS 8
...@@ -376,7 +379,12 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx) ...@@ -376,7 +379,12 @@ static int ie31200_probe1(struct pci_dev *pdev, int dev_idx)
void __iomem *window; void __iomem *window;
struct ie31200_priv *priv; struct ie31200_priv *priv;
u32 addr_decode, mad_offset; u32 addr_decode, mad_offset;
bool skl = (pdev->device == PCI_DEVICE_ID_INTEL_IE31200_HB_8);
/*
* Kaby Lake seems to work like Skylake. Please re-visit this logic
* when adding new CPU support.
*/
bool skl = (pdev->device >= PCI_DEVICE_ID_INTEL_IE31200_HB_8);
edac_dbg(0, "MC:\n"); edac_dbg(0, "MC:\n");
...@@ -559,6 +567,9 @@ static const struct pci_device_id ie31200_pci_tbl[] = { ...@@ -559,6 +567,9 @@ static const struct pci_device_id ie31200_pci_tbl[] = {
{ {
PCI_VEND_DEV(INTEL, IE31200_HB_8), PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_VEND_DEV(INTEL, IE31200_HB_8), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
IE31200}, IE31200},
{
PCI_VEND_DEV(INTEL, IE31200_HB_9), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
IE31200},
{ {
0, 0,
} /* 0 terminated list. */ } /* 0 terminated list. */
......
drivers/edac/mce_amd.c
View file @ 26d3a77d
...@@ -161,7 +161,7 @@ static const char * const smca_ls_mce_desc[] = { ...@@ -161,7 +161,7 @@ static const char * const smca_ls_mce_desc[] = {
"Sys Read data error thread 0", "Sys Read data error thread 0",
"Sys read data error thread 1", "Sys read data error thread 1",
"DC tag error type 2", "DC tag error type 2",
"DC data error type 1 (poison comsumption)", "DC data error type 1 (poison consumption)",
"DC data error type 2", "DC data error type 2",
"DC data error type 3", "DC data error type 3",
"DC tag error type 4", "DC tag error type 4",
......
drivers/edac/mv64x60_edac.c
View file @ 26d3a77d
...@@ -32,21 +32,21 @@ static void mv64x60_pci_check(struct edac_pci_ctl_info *pci) ...@@ -32,21 +32,21 @@ static void mv64x60_pci_check(struct edac_pci_ctl_info *pci)
struct mv64x60_pci_pdata *pdata = pci->pvt_info; struct mv64x60_pci_pdata *pdata = pci->pvt_info;
u32 cause; u32 cause;
cause = in_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE); cause = readl(pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE);
if (!cause) if (!cause)
return; return;
printk(KERN_ERR "Error in PCI %d Interface\n", pdata->pci_hose); printk(KERN_ERR "Error in PCI %d Interface\n", pdata->pci_hose);
printk(KERN_ERR "Cause register: 0x%08x\n", cause); printk(KERN_ERR "Cause register: 0x%08x\n", cause);
printk(KERN_ERR "Address Low: 0x%08x\n", printk(KERN_ERR "Address Low: 0x%08x\n",
in_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_ADDR_LO)); readl(pdata->pci_vbase + MV64X60_PCI_ERROR_ADDR_LO));
printk(KERN_ERR "Address High: 0x%08x\n", printk(KERN_ERR "Address High: 0x%08x\n",
in_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_ADDR_HI)); readl(pdata->pci_vbase + MV64X60_PCI_ERROR_ADDR_HI));
printk(KERN_ERR "Attribute: 0x%08x\n", printk(KERN_ERR "Attribute: 0x%08x\n",
in_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_ATTR)); readl(pdata->pci_vbase + MV64X60_PCI_ERROR_ATTR));
printk(KERN_ERR "Command: 0x%08x\n", printk(KERN_ERR "Command: 0x%08x\n",
in_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_CMD)); readl(pdata->pci_vbase + MV64X60_PCI_ERROR_CMD));
out_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE, ~cause); writel(~cause, pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE);
if (cause & MV64X60_PCI_PE_MASK) if (cause & MV64X60_PCI_PE_MASK)
edac_pci_handle_pe(pci, pci->ctl_name); edac_pci_handle_pe(pci, pci->ctl_name);
...@@ -61,7 +61,7 @@ static irqreturn_t mv64x60_pci_isr(int irq, void *dev_id) ...@@ -61,7 +61,7 @@ static irqreturn_t mv64x60_pci_isr(int irq, void *dev_id)
struct mv64x60_pci_pdata *pdata = pci->pvt_info; struct mv64x60_pci_pdata *pdata = pci->pvt_info;
u32 val; u32 val;
val = in_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE); val = readl(pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE);
if (!val) if (!val)
return IRQ_NONE; return IRQ_NONE;
...@@ -93,7 +93,7 @@ static int __init mv64x60_pci_fixup(struct platform_device *pdev) ...@@ -93,7 +93,7 @@ static int __init mv64x60_pci_fixup(struct platform_device *pdev)
if (!pci_serr) if (!pci_serr)
return -ENOMEM; return -ENOMEM;
out_le32(pci_serr, in_le32(pci_serr) & ~0x1); writel(readl(pci_serr) & ~0x1, pci_serr);
iounmap(pci_serr); iounmap(pci_serr);
return 0; return 0;
...@@ -116,7 +116,7 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev) ...@@ -116,7 +116,7 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev)
pdata = pci->pvt_info; pdata = pci->pvt_info;
pdata->pci_hose = pdev->id; pdata->pci_hose = pdev->id;
pdata->name = "mpc85xx_pci_err"; pdata->name = "mv64x60_pci_err";
platform_set_drvdata(pdev, pci); platform_set_drvdata(pdev, pci);
pci->dev = &pdev->dev; pci->dev = &pdev->dev;
pci->dev_name = dev_name(&pdev->dev); pci->dev_name = dev_name(&pdev->dev);
...@@ -161,10 +161,10 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev) ...@@ -161,10 +161,10 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev)
goto err; goto err;
} }
out_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE, 0); writel(0, pdata->pci_vbase + MV64X60_PCI_ERROR_CAUSE);
out_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_MASK, 0); writel(0, pdata->pci_vbase + MV64X60_PCI_ERROR_MASK);
out_le32(pdata->pci_vbase + MV64X60_PCI_ERROR_MASK, writel(MV64X60_PCIx_ERR_MASK_VAL,
MV64X60_PCIx_ERR_MASK_VAL); pdata->pci_vbase + MV64X60_PCI_ERROR_MASK);
if (edac_pci_add_device(pci, pdata->edac_idx) > 0) { if (edac_pci_add_device(pci, pdata->edac_idx) > 0) {
edac_dbg(3, "failed edac_pci_add_device()\n"); edac_dbg(3, "failed edac_pci_add_device()\n");
...@@ -233,23 +233,23 @@ static void mv64x60_sram_check(struct edac_device_ctl_info *edac_dev) ...@@ -233,23 +233,23 @@ static void mv64x60_sram_check(struct edac_device_ctl_info *edac_dev)
struct mv64x60_sram_pdata *pdata = edac_dev->pvt_info; struct mv64x60_sram_pdata *pdata = edac_dev->pvt_info;
u32 cause; u32 cause;
cause = in_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE); cause = readl(pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE);
if (!cause) if (!cause)
return; return;
printk(KERN_ERR "Error in internal SRAM\n"); printk(KERN_ERR "Error in internal SRAM\n");
printk(KERN_ERR "Cause register: 0x%08x\n", cause); printk(KERN_ERR "Cause register: 0x%08x\n", cause);
printk(KERN_ERR "Address Low: 0x%08x\n", printk(KERN_ERR "Address Low: 0x%08x\n",
in_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_ADDR_LO)); readl(pdata->sram_vbase + MV64X60_SRAM_ERR_ADDR_LO));
printk(KERN_ERR "Address High: 0x%08x\n", printk(KERN_ERR "Address High: 0x%08x\n",
in_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_ADDR_HI)); readl(pdata->sram_vbase + MV64X60_SRAM_ERR_ADDR_HI));
printk(KERN_ERR "Data Low: 0x%08x\n", printk(KERN_ERR "Data Low: 0x%08x\n",
in_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_DATA_LO)); readl(pdata->sram_vbase + MV64X60_SRAM_ERR_DATA_LO));
printk(KERN_ERR "Data High: 0x%08x\n", printk(KERN_ERR "Data High: 0x%08x\n",
in_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_DATA_HI)); readl(pdata->sram_vbase + MV64X60_SRAM_ERR_DATA_HI));
printk(KERN_ERR "Parity: 0x%08x\n", printk(KERN_ERR "Parity: 0x%08x\n",
in_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_PARITY)); readl(pdata->sram_vbase + MV64X60_SRAM_ERR_PARITY));
out_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE, 0); writel(0, pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE);
edac_device_handle_ue(edac_dev, 0, 0, edac_dev->ctl_name); edac_device_handle_ue(edac_dev, 0, 0, edac_dev->ctl_name);
} }
...@@ -260,7 +260,7 @@ static irqreturn_t mv64x60_sram_isr(int irq, void *dev_id) ...@@ -260,7 +260,7 @@ static irqreturn_t mv64x60_sram_isr(int irq, void *dev_id)
struct mv64x60_sram_pdata *pdata = edac_dev->pvt_info; struct mv64x60_sram_pdata *pdata = edac_dev->pvt_info;
u32 cause; u32 cause;
cause = in_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE); cause = readl(pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE);
if (!cause) if (!cause)
return IRQ_NONE; return IRQ_NONE;
...@@ -322,7 +322,7 @@ static int mv64x60_sram_err_probe(struct platform_device *pdev) ...@@ -322,7 +322,7 @@ static int mv64x60_sram_err_probe(struct platform_device *pdev)
} }
/* setup SRAM err registers */ /* setup SRAM err registers */
out_le32(pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE, 0); writel(0, pdata->sram_vbase + MV64X60_SRAM_ERR_CAUSE);
edac_dev->mod_name = EDAC_MOD_STR; edac_dev->mod_name = EDAC_MOD_STR;
edac_dev->ctl_name = pdata->name; edac_dev->ctl_name = pdata->name;
...@@ -398,7 +398,7 @@ static void mv64x60_cpu_check(struct edac_device_ctl_info *edac_dev) ...@@ -398,7 +398,7 @@ static void mv64x60_cpu_check(struct edac_device_ctl_info *edac_dev)
struct mv64x60_cpu_pdata *pdata = edac_dev->pvt_info; struct mv64x60_cpu_pdata *pdata = edac_dev->pvt_info;
u32 cause; u32 cause;
cause = in_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE) & cause = readl(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE) &
MV64x60_CPU_CAUSE_MASK; MV64x60_CPU_CAUSE_MASK;
if (!cause) if (!cause)
return; return;
...@@ -406,16 +406,16 @@ static void mv64x60_cpu_check(struct edac_device_ctl_info *edac_dev) ...@@ -406,16 +406,16 @@ static void mv64x60_cpu_check(struct edac_device_ctl_info *edac_dev)
printk(KERN_ERR "Error on CPU interface\n"); printk(KERN_ERR "Error on CPU interface\n");
printk(KERN_ERR "Cause register: 0x%08x\n", cause); printk(KERN_ERR "Cause register: 0x%08x\n", cause);
printk(KERN_ERR "Address Low: 0x%08x\n", printk(KERN_ERR "Address Low: 0x%08x\n",
in_le32(pdata->cpu_vbase[0] + MV64x60_CPU_ERR_ADDR_LO)); readl(pdata->cpu_vbase[0] + MV64x60_CPU_ERR_ADDR_LO));
printk(KERN_ERR "Address High: 0x%08x\n", printk(KERN_ERR "Address High: 0x%08x\n",
in_le32(pdata->cpu_vbase[0] + MV64x60_CPU_ERR_ADDR_HI)); readl(pdata->cpu_vbase[0] + MV64x60_CPU_ERR_ADDR_HI));
printk(KERN_ERR "Data Low: 0x%08x\n", printk(KERN_ERR "Data Low: 0x%08x\n",
in_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_DATA_LO)); readl(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_DATA_LO));
printk(KERN_ERR "Data High: 0x%08x\n", printk(KERN_ERR "Data High: 0x%08x\n",
in_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_DATA_HI)); readl(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_DATA_HI));
printk(KERN_ERR "Parity: 0x%08x\n", printk(KERN_ERR "Parity: 0x%08x\n",
in_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_PARITY)); readl(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_PARITY));
out_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE, 0); writel(0, pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE);
edac_device_handle_ue(edac_dev, 0, 0, edac_dev->ctl_name); edac_device_handle_ue(edac_dev, 0, 0, edac_dev->ctl_name);
} }
...@@ -426,7 +426,7 @@ static irqreturn_t mv64x60_cpu_isr(int irq, void *dev_id) ...@@ -426,7 +426,7 @@ static irqreturn_t mv64x60_cpu_isr(int irq, void *dev_id)
struct mv64x60_cpu_pdata *pdata = edac_dev->pvt_info; struct mv64x60_cpu_pdata *pdata = edac_dev->pvt_info;
u32 cause; u32 cause;
cause = in_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE) & cause = readl(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE) &
MV64x60_CPU_CAUSE_MASK; MV64x60_CPU_CAUSE_MASK;
if (!cause) if (!cause)
return IRQ_NONE; return IRQ_NONE;
...@@ -515,9 +515,9 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev) ...@@ -515,9 +515,9 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev)
} }
/* setup CPU err registers */ /* setup CPU err registers */
out_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE, 0); writel(0, pdata->cpu_vbase[1] + MV64x60_CPU_ERR_CAUSE);
out_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_MASK, 0); writel(0, pdata->cpu_vbase[1] + MV64x60_CPU_ERR_MASK);
out_le32(pdata->cpu_vbase[1] + MV64x60_CPU_ERR_MASK, 0x000000ff); writel(0x000000ff, pdata->cpu_vbase[1] + MV64x60_CPU_ERR_MASK);
edac_dev->mod_name = EDAC_MOD_STR; edac_dev->mod_name = EDAC_MOD_STR;
edac_dev->ctl_name = pdata->name; edac_dev->ctl_name = pdata->name;
...@@ -596,13 +596,13 @@ static void mv64x60_mc_check(struct mem_ctl_info *mci) ...@@ -596,13 +596,13 @@ static void mv64x60_mc_check(struct mem_ctl_info *mci)
u32 comp_ecc; u32 comp_ecc;
u32 syndrome; u32 syndrome;
reg = in_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR); reg = readl(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR);
if (!reg) if (!reg)
return; return;
err_addr = reg & ~0x3; err_addr = reg & ~0x3;
sdram_ecc = in_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_RCVD); sdram_ecc = readl(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_RCVD);
comp_ecc = in_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CALC); comp_ecc = readl(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CALC);
syndrome = sdram_ecc ^ comp_ecc; syndrome = sdram_ecc ^ comp_ecc;
/* first bit clear in ECC Err Reg, 1 bit error, correctable by HW */ /* first bit clear in ECC Err Reg, 1 bit error, correctable by HW */
...@@ -620,7 +620,7 @@ static void mv64x60_mc_check(struct mem_ctl_info *mci) ...@@ -620,7 +620,7 @@ static void mv64x60_mc_check(struct mem_ctl_info *mci)
mci->ctl_name, ""); mci->ctl_name, "");
/* clear the error */ /* clear the error */
out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR, 0); writel(0, pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR);
} }
static irqreturn_t mv64x60_mc_isr(int irq, void *dev_id) static irqreturn_t mv64x60_mc_isr(int irq, void *dev_id)
...@@ -629,7 +629,7 @@ static irqreturn_t mv64x60_mc_isr(int irq, void *dev_id) ...@@ -629,7 +629,7 @@ static irqreturn_t mv64x60_mc_isr(int irq, void *dev_id)
struct mv64x60_mc_pdata *pdata = mci->pvt_info; struct mv64x60_mc_pdata *pdata = mci->pvt_info;
u32 reg; u32 reg;
reg = in_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR); reg = readl(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR);
if (!reg) if (!reg)
return IRQ_NONE; return IRQ_NONE;
...@@ -664,7 +664,7 @@ static void mv64x60_init_csrows(struct mem_ctl_info *mci, ...@@ -664,7 +664,7 @@ static void mv64x60_init_csrows(struct mem_ctl_info *mci,
get_total_mem(pdata); get_total_mem(pdata);
ctl = in_le32(pdata->mc_vbase + MV64X60_SDRAM_CONFIG); ctl = readl(pdata->mc_vbase + MV64X60_SDRAM_CONFIG);
csrow = mci->csrows[0]; csrow = mci->csrows[0];
dimm = csrow->channels[0]->dimm; dimm = csrow->channels[0]->dimm;
...@@ -753,7 +753,7 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev) ...@@ -753,7 +753,7 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev)
goto err; goto err;
} }
ctl = in_le32(pdata->mc_vbase + MV64X60_SDRAM_CONFIG); ctl = readl(pdata->mc_vbase + MV64X60_SDRAM_CONFIG);
if (!(ctl & MV64X60_SDRAM_ECC)) { if (!(ctl & MV64X60_SDRAM_ECC)) {
/* Non-ECC RAM? */ /* Non-ECC RAM? */
printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__); printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__);
...@@ -779,10 +779,10 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev) ...@@ -779,10 +779,10 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev)
mv64x60_init_csrows(mci, pdata); mv64x60_init_csrows(mci, pdata);
/* setup MC registers */ /* setup MC registers */
out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR, 0); writel(0, pdata->mc_vbase + MV64X60_SDRAM_ERR_ADDR);
ctl = in_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL); ctl = readl(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL);
ctl = (ctl & 0xff00ffff) | 0x10000; ctl = (ctl & 0xff00ffff) | 0x10000;
out_le32(pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL, ctl); writel(ctl, pdata->mc_vbase + MV64X60_SDRAM_ERR_ECC_CNTL);
res = edac_mc_add_mc(mci); res = edac_mc_add_mc(mci);
if (res) { if (res) {
...@@ -853,10 +853,10 @@ static struct platform_driver * const drivers[] = { ...@@ -853,10 +853,10 @@ static struct platform_driver * const drivers[] = {
static int __init mv64x60_edac_init(void) static int __init mv64x60_edac_init(void)
{ {
int ret = 0;
printk(KERN_INFO "Marvell MV64x60 EDAC driver " MV64x60_REVISION "\n"); printk(KERN_INFO "Marvell MV64x60 EDAC driver " MV64x60_REVISION "\n");
printk(KERN_INFO "\t(C) 2006-2007 MontaVista Software\n"); printk(KERN_INFO "\t(C) 2006-2007 MontaVista Software\n");
/* make sure error reporting method is sane */ /* make sure error reporting method is sane */
switch (edac_op_state) { switch (edac_op_state) {
case EDAC_OPSTATE_POLL: case EDAC_OPSTATE_POLL:
......
drivers/edac/pnd2_edac.c
View file @ 26d3a77d
...@@ -131,7 +131,7 @@ static struct mem_ctl_info *pnd2_mci; ...@@ -131,7 +131,7 @@ static struct mem_ctl_info *pnd2_mci;
#ifdef CONFIG_X86_INTEL_SBI_APL #ifdef CONFIG_X86_INTEL_SBI_APL
#include "linux/platform_data/sbi_apl.h" #include "linux/platform_data/sbi_apl.h"
int sbi_send(int port, int off, int op, u32 *data) static int sbi_send(int port, int off, int op, u32 *data)
{ {
struct sbi_apl_message sbi_arg; struct sbi_apl_message sbi_arg;
int ret, read = 0; int ret, read = 0;
...@@ -160,7 +160,7 @@ int sbi_send(int port, int off, int op, u32 *data) ...@@ -160,7 +160,7 @@ int sbi_send(int port, int off, int op, u32 *data)
return ret; return ret;
} }
#else #else
int sbi_send(int port, int off, int op, u32 *data) static int sbi_send(int port, int off, int op, u32 *data)
{ {
return -EUNATCH; return -EUNATCH;
} }
...@@ -168,14 +168,15 @@ int sbi_send(int port, int off, int op, u32 *data) ...@@ -168,14 +168,15 @@ int sbi_send(int port, int off, int op, u32 *data)
static int apl_rd_reg(int port, int off, int op, void *data, size_t sz, char *name) static int apl_rd_reg(int port, int off, int op, void *data, size_t sz, char *name)
{ {
int ret = 0; int ret = 0;
edac_dbg(2, "Read %s port=%x off=%x op=%x\n", name, port, off, op); edac_dbg(2, "Read %s port=%x off=%x op=%x\n", name, port, off, op);
switch (sz) { switch (sz) {
case 8: case 8:
ret = sbi_send(port, off + 4, op, (u32 *)(data + 4)); ret = sbi_send(port, off + 4, op, (u32 *)(data + 4));
/* fall through */
case 4: case 4:
ret = sbi_send(port, off, op, (u32 *)data); ret |= sbi_send(port, off, op, (u32 *)data);
pnd2_printk(KERN_DEBUG, "%s=%x%08x ret=%d\n", name, pnd2_printk(KERN_DEBUG, "%s=%x%08x ret=%d\n", name,
sz == 8 ? *((u32 *)(data + 4)) : 0, *((u32 *)data), ret); sz == 8 ? *((u32 *)(data + 4)) : 0, *((u32 *)data), ret);
break; break;
...@@ -423,16 +424,21 @@ static void dnv_mk_region(char *name, struct region *rp, void *asym) ...@@ -423,16 +424,21 @@ static void dnv_mk_region(char *name, struct region *rp, void *asym)
static int apl_get_registers(void) static int apl_get_registers(void)
{ {
int ret = -ENODEV;
int i; int i;
if (RD_REG(&asym_2way, b_cr_asym_2way_mem_region_mchbar)) if (RD_REG(&asym_2way, b_cr_asym_2way_mem_region_mchbar))
return -ENODEV; return -ENODEV;
/*
* RD_REGP() will fail for unpopulated or non-existent
* DIMM slots. Return success if we find at least one DIMM.
*/
for (i = 0; i < APL_NUM_CHANNELS; i++) for (i = 0; i < APL_NUM_CHANNELS; i++)
if (RD_REGP(&drp0[i], d_cr_drp0, apl_dports[i])) if (!RD_REGP(&drp0[i], d_cr_drp0, apl_dports[i]))
return -ENODEV; ret = 0;
return 0; return ret;
} }
static int dnv_get_registers(void) static int dnv_get_registers(void)
......
drivers/edac/sb_edac.c
View file @ 26d3a77d
This diff is collapsed.
drivers/edac/thunderx_edac.c
View file @ 26d3a77d
...@@ -2080,7 +2080,7 @@ static int thunderx_l2c_probe(struct pci_dev *pdev, ...@@ -2080,7 +2080,7 @@ static int thunderx_l2c_probe(struct pci_dev *pdev,
if (IS_ENABLED(CONFIG_EDAC_DEBUG)) { if (IS_ENABLED(CONFIG_EDAC_DEBUG)) {
l2c->debugfs = edac_debugfs_create_dir(pdev->dev.kobj.name); l2c->debugfs = edac_debugfs_create_dir(pdev->dev.kobj.name);
thunderx_create_debugfs_nodes(l2c->debugfs, l2c_devattr, ret = thunderx_create_debugfs_nodes(l2c->debugfs, l2c_devattr,
l2c, dfs_entries); l2c, dfs_entries);
if (ret != dfs_entries) { if (ret != dfs_entries) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7