Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755910AbZGORss (ORCPT ); Wed, 15 Jul 2009 13:48:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755828AbZGORsr (ORCPT ); Wed, 15 Jul 2009 13:48:47 -0400 Received: from norsk5.dsl.xmission.com ([166.70.24.44]:53745 "EHLO master.douglaskthompson" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755823AbZGORsn (ORCPT ); Wed, 15 Jul 2009 13:48:43 -0400 Date: Wed, 15 Jul 2009 11:38:49 -0600 From: dougthompson@xmission.com To: bluesmoke-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: [PATCH 2/4] edac: mpc85xx add mpc83xx support Message-ID: <4a5e1429.oPkJ51dGVScq0izk%dougthompson@xmission.com> User-Agent: Heirloom mailx 12.2 01/07/07 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4861 Lines: 150 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. Kumar, 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. Thanks for the help. v1 -> v2: * Use PAGE_SHIFT to parse cs_bnds regardless of board type * Remove special-casing for the 83xx processor Signed-off-by: Ira W. Snyder Signed-off-by: Doug Thompson --- drivers/edac/Kconfig | 6 +++--- drivers/edac/mpc85xx_edac.c | 28 +++++++++++++++++++--------- 2 files changed, 22 insertions(+), 12 deletions(-) Index: linux-2.6.31-rc3/drivers/edac/Kconfig =================================================================== --- linux-2.6.31-rc3.orig/drivers/edac/Kconfig 2009-07-14 00:17:57.000000000 -0600 +++ linux-2.6.31-rc3/drivers/edac/Kconfig 2009-07-14 00:18:29.000000000 -0600 @@ -176,11 +176,11 @@ config EDAC_I5100 San Clemente MCH. config EDAC_MPC85XX - tristate "Freescale MPC85xx" - depends on EDAC_MM_EDAC && FSL_SOC && MPC85xx + tristate "Freescale MPC83xx / MPC85xx" + depends on EDAC_MM_EDAC && FSL_SOC && (PPC_83xx || MPC85xx) help Support for error detection and correction on the Freescale - MPC8560, MPC8540, MPC8548 + MPC8349, MPC8560, MPC8540, MPC8548 config EDAC_MV64X60 tristate "Marvell MV64x60" Index: linux-2.6.31-rc3/drivers/edac/mpc85xx_edac.c =================================================================== --- linux-2.6.31-rc3.orig/drivers/edac/mpc85xx_edac.c 2009-07-14 00:18:03.000000000 -0600 +++ linux-2.6.31-rc3/drivers/edac/mpc85xx_edac.c 2009-07-14 00:19:22.000000000 -0600 @@ -41,7 +41,9 @@ static u32 orig_pci_err_en; #endif static u32 orig_l2_err_disable; +#ifdef CONFIG_MPC85xx static u32 orig_hid1[2]; +#endif /************************ MC SYSFS parts ***********************************/ @@ -789,19 +791,20 @@ static void __devinit mpc85xx_init_csrow csrow = &mci->csrows[index]; cs_bnds = in_be32(pdata->mc_vbase + MPC85XX_MC_CS_BNDS_0 + (index * MPC85XX_MC_CS_BNDS_OFS)); - start = (cs_bnds & 0xfff0000) << 4; - end = ((cs_bnds & 0xfff) << 20); - if (start) - start |= 0xfffff; - if (end) - end |= 0xfffff; + + start = (cs_bnds & 0xffff0000) >> 16; + end = (cs_bnds & 0x0000ffff); if (start == end) continue; /* not populated */ + start <<= (24 - PAGE_SHIFT); + end <<= (24 - PAGE_SHIFT); + end |= (1 << (24 - PAGE_SHIFT)) - 1; + csrow->first_page = start >> 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->mtype = mtype; csrow->dtype = DEV_UNKNOWN; @@ -985,6 +988,7 @@ static struct of_device_id mpc85xx_mc_er { .compatible = "fsl,mpc8560-memory-controller", }, { .compatible = "fsl,mpc8568-memory-controller", }, { .compatible = "fsl,mpc8572-memory-controller", }, + { .compatible = "fsl,mpc8349-memory-controller", }, { .compatible = "fsl,p2020-memory-controller", }, {}, }; @@ -1001,13 +1005,13 @@ static struct of_platform_driver mpc85xx }, }; - +#ifdef CONFIG_MPC85xx static void __init mpc85xx_mc_clear_rfxe(void *data) { orig_hid1[smp_processor_id()] = mfspr(SPRN_HID1); mtspr(SPRN_HID1, (orig_hid1[smp_processor_id()] & ~0x20000)); } - +#endif 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"); #endif +#ifdef CONFIG_MPC85xx /* * need to clear HID1[RFXE] to disable machine check int * so we can catch it */ if (edac_op_state == EDAC_OPSTATE_INT) on_each_cpu(mpc85xx_mc_clear_rfxe, NULL, 0); +#endif return 0; } module_init(mpc85xx_mc_init); +#ifdef CONFIG_MPC85xx static void __exit mpc85xx_mc_restore_hid1(void *data) { mtspr(SPRN_HID1, orig_hid1[smp_processor_id()]); } +#endif static void __exit mpc85xx_mc_exit(void) { +#ifdef CONFIG_MPC85xx on_each_cpu(mpc85xx_mc_restore_hid1, NULL, 0); +#endif #ifdef CONFIG_PCI of_unregister_platform_driver(&mpc85xx_pci_err_driver); #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/