Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965574AbbEMWE4 (ORCPT ); Wed, 13 May 2015 18:04:56 -0400 Received: from mail-bn1on0075.outbound.protection.outlook.com ([157.56.110.75]:16233 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965355AbbEMWEt (ORCPT ); Wed, 13 May 2015 18:04:49 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; vger.kernel.org; dkim=none (message not signed) header.d=none; Authentication-Results: alien8.de; dkim=none (message not signed) header.d=none; From: To: , , , , , , , , , , CC: , , , , , , Subject: [PATCH 1/4] edac, altera: Generalize driver to use DT Memory size Date: Wed, 13 May 2015 16:49:44 -0500 Message-ID: <1431553787-27741-2-git-send-email-tthayer@opensource.altera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1431553787-27741-1-git-send-email-tthayer@opensource.altera.com> References: <1431553787-27741-1-git-send-email-tthayer@opensource.altera.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: SN1PR12CA0028.namprd12.prod.outlook.com (25.162.96.166) To DM2PR03MB430.namprd03.prod.outlook.com (10.141.85.14) X-Microsoft-Exchange-Diagnostics-untrusted: 1;DM2PR03MB430;2:BIhDdbm1cTOCey7JLe1BoS26Bp4OfGtefIjXjbVATzbNLNkYStRRdY9qYV+u/0s6;2:BjuH3hY4ApAjFvH2VSW8+BJl1jhdhSXPUk/byMpzu+7vcina24FLosibfKI7JXHYj0NkbS8Rw+XIc5oFtMpEwxJ16hI4jsIBKSA4qsrjbns9u4oYEWSakfmV/hPe2oXKQ5r9agBnRW23FQPqni4bEA==;6:ImDsMoXlLtbCZmcuXXuxf+dPsjucQOmcWFa8utHll1XEgTY567iS3LABRQVOQDuOFCRwABDRCvgUy6LuQz+STs8PRC6QkTfsMo3tZdZaWcw+lPrqtXj31ixugs8Rs3CnDPAFPs6KyZss6J9w88lm5A==;3:LOZpPor9E2sZVnysAz6QlIlgLQQ/wXIhFZUAjao/sEBCcIVXFPmTJZRG+oY+SIAfm4wQ4rFse943MvUC1oLS9c4l2UbXUHkeI9S2cDxKu4PARxZrAKps6JVvov6nZZPGhu/DiwMtyzrI1GavVMu7Bzx3WWkZ8x7jJOiDzba1jEc7121kmWv4sV60AbMlhopJqdtSHIHZqEcCYI2LSy4Dzth+PQmEUvvpiA4DmSfTPRzphAK9bT+S8Q5/baby9SwGrMinqT4a5w9cKwwKI06m1IhqAorBxHghJFjvtUTi8vc= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB430;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB365;UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1497; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:;UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:DM2PR03MB430;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB430;BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:BY1PR03MB1497;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1497; X-Forefront-PRVS: 0575F81B58 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(76176999)(47776003)(189998001)(33646002)(50226001)(50466002)(46102003)(87976001)(86152002)(2201001)(92566002)(86362001)(62966003)(2950100001)(77156002)(107886002)(5001960100002)(50986999)(122386002)(19580405001)(40100003)(19580395003)(5001770100001)(48376002)(66066001)(229853001)(77096005)(42186005)(53416004)(921003)(1121003)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR03MB430;H:tthayer-HP-Z620-Ubuntu.altera.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: 1;DM2PR03MB430;9:kn3TLHrNSh4ji7FyTazertijO3HnMD0XmNbrs5wypAjiwKCL7MiHBHOurd5s60F/8teXWvyq5Ht9ODWXvv6JCKE1zg+NW808VimVkS+xu0YL6xInn2vjymciQ2tGjFMNc32bHH/6TlDHh7zP0lVsMuvqegSANgIFhz5A6yeTa2BhnqAIrILlEH4jmToIbSH2oWcBDMVCzuIVRg5FRpzLUdvbl48XCWtgNtGMtturWp9Xd0waBfn//6jUvfR4FhWOYCXutk4+zDaGmJjyKs3OySxYR1gwN6avo/1d6kV1zKmACf2va7wL4qZtbXRu7iLkLQLTVnQYOCDx12KcoS8FAAXoMD66kJ/Y9pQanJwFNkhxV3NTU9abPgF+SmIbytDA2jTWprg1GBSQN1MDTYRBJumgoYnQyIztZy4ty/yYYa8RXIVQ8oKZ5vbaKqfcfegLCmrLw7lav3d+PRZ6sjyBih3IhXmDZ7amFMhDPXMziOVohjBVzddI2NRJgW0/JnTjgbAugYn6Zvx8lOX/LyPMSwkIRbf7Gz9hYaVyxpReW9RYivBa3zD0znzz1ZrlroSSMtncUt8IB/RIRmJFQjZfLPJUsyUWHmaNqIdqVComBnmg0UNliWirba3WipAKEqtmDwCAvQVc4ThtCHo1yn9KT/2/XIjfSUWHEl1bU3F7HiJYryCUaMTOaB4sYsESms4dHoAldb6Hav++ZP6PhZ3sUS96z2XbtD/50P8ztwB/3s/BJrKqfTZBEXE37cOp7UHvDiWs2Ng14tZ0Yk/BnjU+JerASA+Utm5sttS8KMJa4JebJXEc16IAURFIjKd0yAJUCML6Bku0tjeFQVx2HUxWyPQ72t1wRREcVLvqjNXfnwj5m+7Zc+Cm+f+DyxvXf7uXvMDFh9f4g551eXLg/TM2+w== X-Microsoft-Exchange-Diagnostics-untrusted: 1;DM2PR03MB430;3:Hh+V5SfjxcMH3Q89z+IIbtt6asdvPddJLYCFuI8mRZklCz+pjxqJ2TTTQVTK1iaqE2MZKCyKPXborarkBwN835NJLEGGl/b5mR8glZQnhkXBqCW2lHEWdRusG3M9J8+nZvHDATL5sHXPzK7cI7KEzg==;10:0hog1OP1ex/HvKH511HFYuLeV94foSoOSRSf8lBVhOJOcYwlG3CvRIQEVF01bvNbayqQ7kQugzXY5biiet5fJjTRjR3MgiuU30Q0I/XqhUI=;6:94Vrt3kiPHDcie+b9tQ2fI/j9cfL2bGU9m8acXtjk5r0TBE0nbLu64QxRv53ZQV4fv+wKD2ipQgqVbVqyBAtwm7kBKdXkSyFk+pKTDAUfeNujamgOFcezomcnBOCvAfz4cdR5mT9MSu4zamgl9ZHDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR03MB430 X-Microsoft-Exchange-Diagnostics-untrusted: 1;DM2PR03MB365;2:PtDCzOw8F2g8vYcXbw2duws63zIU4ou1wKWWt3h6KpUpIwPo/FLAQxV5vw5wg4xB;2:V/+A5bNrR1SocKZbm/MiljjcvhomqbULwfE53oW/WOIEfgLFrWp3vun0iI6ygOgTNm32HOh8NJxdexpaGQeZ9W4cQPf8Xk+E+IdANtWssuAeQFofQqsmSKQHJVrGoe7th8Yds30OfZ0TikeCAMyfMg==;9:bT3jnZ5DvOB1FeZkeURRVHAjQIM3b18vRPRTlJd76EuhzZAVrdP0ZHIYcNg6vVwUaLZOQbfECkdClsIASyT3EatNUkUdN4ujFFekEUIFBgruNh3ln1QpkZ1cpmAPhpFMalYXgh2Ekah6Z6zTwI722w== X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BY2FFO11FD005.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD005;1:n9nM8sNEbUtGgALHcjg36UQ4SNo1EyBjn3v7tL+TFfTaML9taiAGeEkLSZvf9E2aW2U7CAwSWUes7gWl0+f0WZ0LNcJPRIDfxbECjTAxATlr1rRlHb3CSGI/qV/3uX6Pc2953AQUS/y7FDj9W95RMxF5/+3cJWyzkn/Xv24J77Zig22NgkAA8etYInmecw8c9bnt8JRMF42asbcAcbzp/LTiPnU8XD54WYx/f4zLoP+iTh/A3UKoYE4/sSUi4kdOiGMt1w6zT8MBqlcqDjbVygJUgOI20OzIxO5FzDzQDCKGKJ5F2T8TrO2ESyJnc9xB X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(339900001)(199003)(189002)(6806004)(76176999)(85426001)(47776003)(189998001)(33646002)(50226001)(50466002)(87936001)(46102003)(86152002)(2201001)(92566002)(86362001)(62966003)(2950100001)(77156002)(107886002)(5001960100002)(50986999)(122386002)(105606002)(19580405001)(40100003)(19580395003)(5001770100001)(48376002)(106466001)(66066001)(81156007)(229853001)(77096005)(53416004)(7099028)(921003)(1121003)(4001430100001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR03MB1497;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;MLV:ovrnspm;A:0;MX:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1497;2:mJxRiPv5wOqtnbch2fD1e0O8yutQEDvp7PO2Gay4uOpGPuZa6BZ82dN6cIVSd5cJ;2:NQiqUYZvm+tcJaPo6uV6n0mvFJ4H/xagqB+7HZ4lEwkWfjBxqHi5Ei7tCZjDFwFkA63WeIWGeM02IZFXQVZZANANiYjJcJx7gIOOqcU2vEV4yhehVNtd6j47b2HlepuwlDlfhvBlgXUDpl7EIuBs7jjZuMrKa1Gn2xOrD5wVf/4/OuHaly6Vm896nAdbBcPRqiWhcMcuqXd1JGZOgAYsw3BpuchCM8yjRrh3NTuhYBE=;6:63XUyUeiOFvpMhvbO8XPDBb8cWKuMpmq+UH8m9iEfaacqTGHtELTAdr6RUbVC7ULmXd5y1+uscOzMaK5gevP2Yyn9nMy3Z5iD2gxuEG7iHosNDAQFrY2UZBeVyqR4JKKSPCUvn/cwGh+3yF3MzVqaA==;3:LzKINbwYRB8E7cAX6h1QkS4wXu/sqw2mBD8L2Nh2BhsG3SQ8gwvrimc+UbAzo2gevuwRQXmTSJAO1MKd4Tt0sDZeCtWbFttah2ztzw2shD/Mqh3Bq0cDXQdltp2wjQqbMad7mqY8iJOtCQptpxz4O8IoXND8V+R0f9NNXp22MtcTyOQCBBP+ULK8hyR3JH9CzIwtu8AkWNel5aLb/qQ7UcQbFeXYleg9bMNR94QxvXyykXprd9Al10nTwwEvE5nFJ7XMInRE99zlqUifn1Lp25+Yn2BOGV28+g36rA0ibAA= X-Forefront-PRVS: 0575F81B58 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR03MB1497;9:pYFgIsm9MnEiRGEp9y5grUzjeA75sUY9TP1rLTKeip?= =?us-ascii?Q?d7TKm8rRAVblYkKDj6HvYzNglD9sb5+S1wVOgbsObp9nn70d7xF+rMRWP+iv?= =?us-ascii?Q?IDGjqSKPNp5f1PvIcqyO4oOv8R0jb11jZrtdw6Tw/nBVfj1Hy4ErdbA6ZWDJ?= =?us-ascii?Q?Lm9Dw2/rEc5Jrh/NCByDP4Wuqt4xxAkvicWDfA9L/M8n2tw68Lz0iB3TQBwI?= =?us-ascii?Q?Lm/2pAjzwWniAiup/tvBRwCIGoup/B9y9QUeJAMeHi+3r3XDmb4vq03jkgE9?= =?us-ascii?Q?hWB08Uk9zQwSjYcwem+vp1IeFrIB1u9z2Biimh4G0eD7CkEkZxgYFkfUxJIq?= =?us-ascii?Q?bKEQvhAC3E/iNqcJxc9GDU2y/aRy/R+5e6/oHYl4Suvc06fHRSEMfAoB4zUq?= =?us-ascii?Q?w7WBLtzjpBvQbNHD6GpRaFuKXwIAs2+DzhXd7+BlkDa5owCamyRFmpbTU960?= =?us-ascii?Q?Gt3dHRpYqywLhLDSAFO0hMj5gJO7BPva1qSseH2xDUiM9V6BMXs474iZ5qNw?= =?us-ascii?Q?dfoZBm+9d4fHQttKKTPPlur0nxFlyQFl5fZTLoQs9phYKjn8ektJU7PHeasO?= =?us-ascii?Q?pxmEsRnMu7Mgi0JM2rxB4iaAOHeN2LTzzR+90aRMBBDu6a2v7PDj038kDEV3?= =?us-ascii?Q?pBvesWsS+x2FOr+uwMncsT/Yl+KE/9zx7Tyt9GBlUFw7yPhXMG1aYY8rni+k?= =?us-ascii?Q?O0MaTohVKaTRw9Xj6ShvZhoh1Edd5IWVCXnhOeU2JwXvEVgSYfE7crBQ7990?= =?us-ascii?Q?MAB+LIMlHQW69hg9dBXndXNKiTJyihWl1rOlxt1Egro42K1VKW7dYx5IkiH3?= =?us-ascii?Q?cP1AfHl8h2CVpQi9vWAjdePisVix9mYEaO3vfC9xq34KuaYDlydY6lFq3XO2?= =?us-ascii?Q?8zvs9IBY3S0OkQYU22a6dKSdfEVz87W19mB08L/99xSRnYcjfK2bToxmpjGY?= =?us-ascii?Q?JM6LTR2MdGImuc2l9YrvBRsZ8YZJ20bEZmtjT5Gb2hBn1ldCPwn3xJYoDgJn?= =?us-ascii?Q?AptDqtZ0P5AWCpilLsUnXJfvSL/p1sRlB3T33N5Kbf8QytFHVd2MsZ+l+nh9?= =?us-ascii?Q?sh8fg=3D?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR03MB1497;3:P7BV31xHCefnsIhEhfrNQKM4nglrkmroI0Kji5sTAyP6QfTDl6wNhxAzVRYy9Babf4n5BYJc1A+FAmvvG5ftTqThbCApMznrt47tHcvi//nBCgs/jegwbG4AJmXynrt1Z8H+FB8xUdLtZLE5qutHcw==;10:5lklHmPtRb3PN2wsUE/uqAgeGgfO0M2YqBVx0kBJcraqo1Npo9v7ExZS2P6d5DmaXtQSBDrRI8t31HIOQ321ud6tcWH6vDqHT2ehsCr3WDo=;6:hAHf5iwmicK4QeK1mP9ingAG5y2QzibfnGcaXMosGho4uqA7GVY2PQoyUMRvUC2Z5p16WOTeWI6zcrMEeLD6QSiXhf4ly4YF0+IWOEdff3suYiK0tpmveenrE/iiLddIW6oJkQDeEaZXlgawS2lNzA== X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 May 2015 21:48:45.2808 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.236];Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1497 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3078 Lines: 96 From: Thor Thayer The Arria10 SOC uses a completely different SDRAM controller from the earlier CycloneV and ArriaV SoCs. The memory size is calculated in the bootloader and passed via the device tree. Using this device tree size is more generic than using the register fields to calculate the memory size for different SDRAM controllers. Signed-off-by: Thor Thayer --- drivers/edac/altera_edac.c | 53 ++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/drivers/edac/altera_edac.c b/drivers/edac/altera_edac.c index 3c4929f..e18a205 100644 --- a/drivers/edac/altera_edac.c +++ b/drivers/edac/altera_edac.c @@ -219,36 +219,35 @@ static void altr_sdr_mc_create_debugfs_nodes(struct mem_ctl_info *mci) {} #endif -/* Get total memory size in bytes */ -static u32 altr_sdram_get_total_mem_size(struct regmap *mc_vbase) +/* Get total memory size from Open Firmware DTB */ +static unsigned long get_total_mem(void) { - u32 size, read_reg, row, bank, col, cs, width; + struct device_node *np = NULL; + const unsigned int *reg, *reg_end; + int len, sw, aw; + unsigned long start, size, total_mem; - if (regmap_read(mc_vbase, DRAMADDRW_OFST, &read_reg) < 0) + np = of_find_node_by_type(NULL, "memory"); + if (!np) return 0; - if (regmap_read(mc_vbase, DRAMIFWIDTH_OFST, &width) < 0) - return 0; - - col = (read_reg & DRAMADDRW_COLBIT_MASK) >> - DRAMADDRW_COLBIT_SHIFT; - row = (read_reg & DRAMADDRW_ROWBIT_MASK) >> - DRAMADDRW_ROWBIT_SHIFT; - bank = (read_reg & DRAMADDRW_BANKBIT_MASK) >> - DRAMADDRW_BANKBIT_SHIFT; - cs = (read_reg & DRAMADDRW_CSBIT_MASK) >> - DRAMADDRW_CSBIT_SHIFT; - - /* Correct for ECC as its not addressible */ - if (width == DRAMIFWIDTH_32B_ECC) - width = 32; - if (width == DRAMIFWIDTH_16B_ECC) - width = 16; - - /* calculate the SDRAM size base on this info */ - size = 1 << (row + bank + col); - size = size * cs * (width / 8); - return size; + aw = of_n_addr_cells(np); + sw = of_n_size_cells(np); + reg = (const unsigned int *)of_get_property(np, "reg", &len); + reg_end = reg + (len / sizeof(u32)); + + 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); + + of_node_put(np); + edac_printk(KERN_ERR, EDAC_MC, "total_mem 0x%lx\n", total_mem); + return total_mem; } static int altr_sdram_probe(struct platform_device *pdev) @@ -280,7 +279,7 @@ static int altr_sdram_probe(struct platform_device *pdev) } /* Grab memory size from device tree. */ - mem_size = altr_sdram_get_total_mem_size(mc_vbase); + mem_size = get_total_mem(); if (!mem_size) { edac_printk(KERN_ERR, EDAC_MC, "Unable to calculate memory size\n"); -- 1.7.9.5 -- 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/