Commit b4846251 authored by Ira W. Snyder's avatar Ira W. Snyder Committed by Linus Torvalds

edac: mpc85xx add mpc83xx support

Add support for the Freescale MPC83xx memory controller to the existing
driver for the Freescale MPC85xx memory controller.  The only difference
between the two processors are in the CS_BNDS register parsing code, which
has been changed so it will work on both processors.

The L2 cache controller does not exist on the MPC83xx, but the OF
subsystem will not use the driver if the device is not present in the OF
device tree.

I had to change the nr_pages calculation to make the math work out.  I
checked it on my board and did the math by hand for a 64GB 85xx using 64K
pages.  In both cases, nr_pages * PAGE_SIZE comes out to the correct
value.
Signed-off-by: default avatarIra W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: default avatarDoug Thompson <dougthompson@xmission.com>
Cc: Kumar Gala <galak@gate.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a014554e
...@@ -176,11 +176,11 @@ config EDAC_I5100 ...@@ -176,11 +176,11 @@ config EDAC_I5100
San Clemente MCH. San Clemente MCH.
config EDAC_MPC85XX config EDAC_MPC85XX
tristate "Freescale MPC85xx" tristate "Freescale MPC83xx / MPC85xx"
depends on EDAC_MM_EDAC && FSL_SOC && MPC85xx depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || MPC85xx)
help help
Support for error detection and correction on the Freescale Support for error detection and correction on the Freescale
MPC8560, MPC8540, MPC8548 MPC8349, MPC8560, MPC8540, MPC8548
config EDAC_MV64X60 config EDAC_MV64X60
tristate "Marvell MV64x60" tristate "Marvell MV64x60"
......
...@@ -41,7 +41,9 @@ static u32 orig_pci_err_en; ...@@ -41,7 +41,9 @@ static u32 orig_pci_err_en;
#endif #endif
static u32 orig_l2_err_disable; static u32 orig_l2_err_disable;
#ifdef CONFIG_MPC85xx
static u32 orig_hid1[2]; static u32 orig_hid1[2];
#endif
/************************ MC SYSFS parts ***********************************/ /************************ MC SYSFS parts ***********************************/
...@@ -789,19 +791,20 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci) ...@@ -789,19 +791,20 @@ static void __devinit mpc85xx_init_csrows(struct mem_ctl_info *mci)
csrow = &mci->csrows[index]; csrow = &mci->csrows[index];
cs_bnds = in_be32(pdata->mc_vbase + MPC85XX_MC_CS_BNDS_0 + cs_bnds = in_be32(pdata->mc_vbase + MPC85XX_MC_CS_BNDS_0 +
(index * MPC85XX_MC_CS_BNDS_OFS)); (index * MPC85XX_MC_CS_BNDS_OFS));
start = (cs_bnds & 0xfff0000) << 4;
end = ((cs_bnds & 0xfff) << 20); start = (cs_bnds & 0xffff0000) >> 16;
if (start) end = (cs_bnds & 0x0000ffff);
start |= 0xfffff;
if (end)
end |= 0xfffff;
if (start == end) if (start == end)
continue; /* not populated */ continue; /* not populated */
start <<= (24 - PAGE_SHIFT);
end <<= (24 - PAGE_SHIFT);
end |= (1 << (24 - PAGE_SHIFT)) - 1;
csrow->first_page = start >> PAGE_SHIFT; csrow->first_page = start >> PAGE_SHIFT;
csrow->last_page = end >> PAGE_SHIFT; csrow->last_page = end >> PAGE_SHIFT;
csrow->nr_pages = csrow->last_page + 1 - csrow->first_page; csrow->nr_pages = end + 1 - start;
csrow->grain = 8; csrow->grain = 8;
csrow->mtype = mtype; csrow->mtype = mtype;
csrow->dtype = DEV_UNKNOWN; csrow->dtype = DEV_UNKNOWN;
...@@ -985,6 +988,7 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = { ...@@ -985,6 +988,7 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
{ .compatible = "fsl,mpc8560-memory-controller", }, { .compatible = "fsl,mpc8560-memory-controller", },
{ .compatible = "fsl,mpc8568-memory-controller", }, { .compatible = "fsl,mpc8568-memory-controller", },
{ .compatible = "fsl,mpc8572-memory-controller", }, { .compatible = "fsl,mpc8572-memory-controller", },
{ .compatible = "fsl,mpc8349-memory-controller", },
{ .compatible = "fsl,p2020-memory-controller", }, { .compatible = "fsl,p2020-memory-controller", },
{}, {},
}; };
...@@ -1001,13 +1005,13 @@ static struct of_platform_driver mpc85xx_mc_err_driver = { ...@@ -1001,13 +1005,13 @@ static struct of_platform_driver mpc85xx_mc_err_driver = {
}, },
}; };
#ifdef CONFIG_MPC85xx
static void __init mpc85xx_mc_clear_rfxe(void *data) static void __init mpc85xx_mc_clear_rfxe(void *data)
{ {
orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1); orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1);
mtspr(SPRN_HID1, (orig_hid1[smp_processor_id()] & ~0x20000)); mtspr(SPRN_HID1, (orig_hid1[smp_processor_id()] & ~0x20000));
} }
#endif
static int __init mpc85xx_mc_init(void) static int __init mpc85xx_mc_init(void)
{ {
...@@ -1040,26 +1044,32 @@ static int __init mpc85xx_mc_init(void) ...@@ -1040,26 +1044,32 @@ static int __init mpc85xx_mc_init(void)
printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n"); printk(KERN_WARNING EDAC_MOD_STR "PCI fails to register\n");
#endif #endif
#ifdef CONFIG_MPC85xx
/* /*
* need to clear HID1[RFXE] to disable machine check int * need to clear HID1[RFXE] to disable machine check int
* so we can catch it * so we can catch it
*/ */
if (edac_op_state == EDAC_OPSTATE_INT) if (edac_op_state == EDAC_OPSTATE_INT)
on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0); on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0);
#endif
return 0; return 0;
} }
module_init(mpc85xx_mc_init); module_init(mpc85xx_mc_init);
#ifdef CONFIG_MPC85xx
static void __exit mpc85xx_mc_restore_hid1(void *data) static void __exit mpc85xx_mc_restore_hid1(void *data)
{ {
mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]); mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]);
} }
#endif
static void __exit mpc85xx_mc_exit(void) static void __exit mpc85xx_mc_exit(void)
{ {
#ifdef CONFIG_MPC85xx
on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0); on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0);
#endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
of_unregister_platform_driver(&mpc85xx_pci_err_driver); of_unregister_platform_driver(&mpc85xx_pci_err_driver);
#endif #endif
......
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