From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932644AbcHIV5V (ORCPT ); Tue, 9 Aug 2016 17:57:21 -0400 Received: from mail-cys01nam02on0050.outbound.protection.outlook.com ([104.47.37.50]:65314 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932517AbcHIV5P (ORCPT ); Tue, 9 Aug 2016 17:57:15 -0400 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=fail action=none header.from=nxp.com; From: York Sun To: CC: , , , , York Sun , Doug Thompson , , Subject: [Patch v4 5/9] driver/edac/fsl_ddr: Add DDR types Date: Tue, 9 Aug 2016 14:55:42 -0700 Message-ID: <1470779760-16483-6-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1470779760-16483-1-git-send-email-york.sun@nxp.com> References: <1470779760-16483-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131152534281779329;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.158.2;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(54534003)(199003)(2950100001)(81166006)(81156014)(87936001)(8676002)(77096005)(76176999)(50986999)(92566002)(86362001)(104016004)(11100500001)(5003940100001)(586003)(105606002)(48376002)(229853001)(110136002)(2351001)(69596002)(36756003)(85426001)(97736004)(33646002)(68736007)(19580405001)(19580395003)(4326007)(50226002)(2906002)(50466002)(8936002)(7846002)(106466001)(8666005)(356003)(305945005)(189998001)(47776003)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:CY1PR0301MB0601;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11OLC009;1:5fSlfV530ApA2h94cPGjM7U0EoVJXNStCKJ3Mxojnl5DfArh2/KWbTzGxh3oE9WYw8D5CB5X7OFxnUKfrCXx6yqJhhNldmuOeueuBk3zUejBt3r8xG1ZZuT+3jmth3ixvqUMqfZUflV5L2JaWPUV5rjeVwtPdEfQjHF1v0IZ8MI/YF/w5GGCoQi3pFNLWAtWm+WqE7Sfb+Vh6o7nSvC8IIQ8X1TK1+60PeJUAFnTSP/5SM5Yq7JYO5mZJ3NoBLHkS+zv18VrrZ09DNtLJIw2mEb3oDurjpdrXZAw0eD3S+J6vpZUZ+0QB+qeQMCdtGN0D7Pz1DsmFrgVbBRURNqGW344fxnhk+3sKwbj3Irmehps37AxT2q+yzPPiYAW+9e18Bm4yd2vw1tCp7eQnwqM8lD51vBSjBpbBZtbI4HJ+nLFRjtTJQ6LTd81b/eeFf8bhoZowew5eofmEkhgbbcnZK0btVr5T7264KZ11Z2dkjGKUU3w760p+xSEue13lVOoZDPUbdjKAfbpkI074aTnS/JMlUF1h7QTGipI1q9RwjpgWYWFMK4HivrEcEhXiiWzHVl106FE53u4GIv2Fo2v1Q== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: d7f4e303-c11f-4d31-f881-08d3c0a01bb8 X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;2:LPTTRNLQ968rXJsm4j2xE70THSIo5Vb5ccc4lGvvakYQblexuEOZX+CXlQPcMiHuTRNyZfOg46rrYGT9GpV1QOYza/kEOVEGlxrJQiiEdDD2n5hncZNYCbi611zdBZopPpAayEKU+LkAprQEjlSHJ0vWpwnDXIdEM5kiHIohVNhKTKk9e2rvmdr9UtGBdJSo;3:K4jlEjqHElp/4Gl4f4PnsOTTfrTQE5yLM/s4mDRRTh3r/Ts+d1VuHkFwM2FzHsZNEcrOzzXZf5sDEEAoTeO+7uOdx4bv3W1ohpvhY+W41/wLNRWIszqghjz2G6lq9qHCkoCYQdyoJFxBOfBNP/9GMZH/dQMq1Fy8Q0h0hDUhnLgFJJPgp8V859B/TV78NGvzKjZ1OgHTO/zGjwiNaqbRs763qUQLzjvmoy+grVBPtgw=;25:+ujOB6jVO6+ABQYm+lxcLyigyw2AgufYfKuU2lqAHgBv+PQudO1+VenPn4HPdYQSWg7+THxLUbznDt+KGG+nWT5mwQiu7nbF5Rr0eij0WSF4XE4/GSJeWQe8j913wbmxz/eeTpk8dW/MUwtmutEwviJfD7JQK69guzN7h6PvTLJOpuTa4x2vcFAhEuaxnW/LxizYcYujadzdKaK2kSBhNNOztm0wUySjFGs+L9vgYEeiwx8dSHGUlSEg7YvhvITKjaS8h89fGi5zqSGmXNj3FJQF4WrIs4IHS/lm4UvG0HBkVGVQ7LUOCtt8SPgz8bULZhkigo94gKpjmgQxuXX1vDNiGQv2wrMab8cRU3iqcrRrFgo/F1wk5iqkwjB4YWf5vGLyPObN8vM5qJOdWY7kAS4JjPrnMMzQ8qpdGF68VDI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0601; X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;31:3bI6qr9jWzejDxzVGw/rbqxvcoMzYd4VK259X5IPCvPMkzY4Rz1wLxI/2o/sv88Rm5t4F4eb/jZ9p+xRwAQXgK+A9afU2sHrF1hPiOBE7wQn8xjUuHZUFFOesKdgGe0yskr1Nbauk7TFwZ/r4U7Xtuv+F7Lm/bV8d4Rce1fmH1bfsjn5P2xUvDqWBZ35j+hGKed1FP5M5DBK57uM4WapyH6DV03nrGbjvizOCqPEYc8=;4:GHhKNqm3cE31ynd66DevrppiaXcCJG71ArTps6RpJ5KLrQ5SWEnx6H47gflpLc7c5QbTdyl2nNMZvvMXUZPXwu+hiDfQAJh8nWT+hqQmjXMuDNXrLTVQbzkdbRUzdqcL1Bzb6K0i3BTaf3pcLeqHcEL33c3NiuYZXX6rmhKkiHnhaiDiC6Vxl2g0OzakrW8x0VZVAO4fT1g+NnrgjVgBwh3ucAlDCMA8348ksvk5UX5CL8D/ii//wDETI+teRcIKt6JDac4/BHyeond9lc3cIJCbe1BzTDv2mpl5gAi4XQRYhwiTfyCabXf+wyAzOMIPEWte8d9DyM68vn/4VfCnxo9gS4OUVYgOq8pgqaunzjPzlLXW9Fue41fb4PrpZ0XMhf034/jV+inLgR5Q5tWzWE3kZqhi8wBsFh2TE6iY2b85BNnyT+4Kw2hKE/0RRsnwzXWETpgazaUveXr7MTiRLEqlBiBUfZNHY5pZ/tlcP1ZrkxEAdXqcAb1znfeiIzu4NxoWtQSwYZmPyHGtDe+QHw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13018025)(8121501046)(13024025)(13023025)(13015025)(13017025)(5005006)(10201501046)(3002001)(6055026);SRVR:CY1PR0301MB0601;BCL:0;PCL:0;RULEID:(400006);SRVR:CY1PR0301MB0601; X-Forefront-PRVS: 0029F17A3F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY1PR0301MB0601;23:dzQEGatDoYYhre8YQPvMliCzo3v4jQezDKc0y6Z?= =?us-ascii?Q?3VJvlEbhLzPaO3e/BlPgjMDa0elekWJNOEoVTOpEgln2O5nQYZdS1j/dnAhq?= =?us-ascii?Q?NP4ndPHEpo4OwzF9TPjhkfzydQKZWLe4rZQ3+WoTzZzmLn2D8JvrDtDWjDR4?= =?us-ascii?Q?uJeo3NyhsADT66N92tkjqu3sEz1I3erQXDFvmGTb12VdYSMldJb0ETJO8nOy?= =?us-ascii?Q?Q3zui6R3pi0tVrFr0zzDr4VS+H/n77JJNF/RooAQetq3V5DwhA7+5wWuNac9?= =?us-ascii?Q?7GQe0k+yfdDbNzYQ8WXThDAVdsGeT3S6I+h/JLNe/igELMEq6vZeR60SO54t?= =?us-ascii?Q?yCEJ4MGsWFBz3M5W6GMwXkOMMuRD3QrR4shE+JwQuuenopLei80eHpVxLOJ/?= =?us-ascii?Q?ehoPbW00t8ef0GSoXZejSuvdAxeU2Cx+VVhKNDLaHlsc7p5EMGvH/Uc9F0mK?= =?us-ascii?Q?28XkcoQGv/CtY2tnusHL4OLrEhnn0lvcHVPvm/QO0K5kD3bUOYDMbURpBbEi?= =?us-ascii?Q?ADVp/LE62LIAi/ulLaJAkLE36F4i5ZZjZr+5fJlDQMaYtw8SgRffEw3FcJu/?= =?us-ascii?Q?E7IQNw5uZ/P9APIENu9mPryFwv/FKyPb2SN6Nq77x95CQsVvJPt1BZd8QKIy?= =?us-ascii?Q?PsVNXsDF7BYyjglr57GdRqP17QFOkDiY0J2fmtocrBWmzI1w2dvS1f6H/w4d?= =?us-ascii?Q?EhQ2edf13BtnYUvTLJZOqinu4118jFpSmSC98dWVlUQ2xS3cUqo7qFTZJFyr?= =?us-ascii?Q?zguyx5qOadGZmQLxhJMC8qjqtjsb+6GTpsbEQSY0yfQmyH9ibHFSgNvrAC64?= =?us-ascii?Q?j3shFzQkNB7jIfFaxx802X98hYWm7MVnVmx6WAmkEWb1Ub2ftQF7ITTGPvrC?= =?us-ascii?Q?PL9RQ8CnNTpwMiZKbL48YGhgRsUJHgQ9yRgDjQZCoCq27KsJ1M0ezAVkauXK?= =?us-ascii?Q?XSZUTgbeZrpHOz3EidwXyZrsJgU3emDng736fnOOwM3BZp5pe5WT04VPvIg4?= =?us-ascii?Q?dFhir2zEVEOj+Cw0OiKrIEcFnI9IsCx75Bs/3YRT0Z8u6gKe9zXZfxePNJap?= =?us-ascii?Q?8RY8pSYHF/9kcsDPmm5YgpVMzhh/WF8XkskQcyYeYx8oaU52NFi7FQ17XT6g?= =?us-ascii?Q?17yIRYQw50AwhSfAmMXHS2NvH18eRBpd6cWUj89jv6R4v/ZrSngjkwi9Td+U?= =?us-ascii?Q?Pe5FHdo/Sx/bZDgs=3D?= X-Microsoft-Exchange-Diagnostics: 1;CY1PR0301MB0601;6:ND8LoIoUEPMVwQVV6UZKAwZjMYs+qbIch5ymFrRW2YVPi9A1rbkNdbkL16Tt5G3hYcjYXqLVanOTYtQjVRDI3hvYFPyhwSjundM3pD46pRBK/bPdom6Txfz12+ZHH36tvNliUo2OBtiFNQX3H8X47630KQiKuaslpwOoax4pp2QwI1LSpfGrbdcDY+eQHSWwp+aaODkndbQ6VuCbCFP3COj9yKwM6YmpyhHPmEts65Gkq5jazITbqJihX3YWV8jw3y+xQ8e9/TQ/DNLnTW7BasqHQix8xk2H5SNeDHi7Qdg=;5:medkS19lO52WrM76Se09l7Wla2JWnAgA4awl/N+IY2hLTtuwNEdjS7sJNjdxf912BUBAsY0a9lbTg50yi4VYozppb8idj3sTVjz60TDKKRF+rylViahJ1sEEnh8Pychp0fcQArACv4noe/d8TKb0YQTnGlJRkX8ZhR7itrtOxGc=;24:G+vFr5MTvcPHPAg/6r0jhqLebTMSbNRYUD1/J8m+EhKwbK8hilm+MaGamllhmaxOupAvwzrnzbzDydNHC8uYm+ocwqrzFjhlvVJMG55SFbs=;7:HypF1sFQBI0IhWPX4BoO3g5oY+yW6lBwrWDn1YW/s0Q/oik+AEW1D8K+O2+B9R6184KoQ5d7AnyVX3r65xq9xj9kZACEWk3uf09PAaX4WzLvvDD2phR+ZGTUbWQ+l1OKtJipQQ3SwHk0y3SnN9w8XNpt0LhQkiF/3uG3iSqn23hNaTnxn/L6kWhBznTL71sgdg4+wVjlocHojfk4zczWWGOiQWzlEGIkOpwYvxRRohU3WjaJ904Ai/J4R84Jy7II SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 21:57:08.0687 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.158.2];Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0601 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The compatible DDR controllers may support DDR, DDR2, DDR3, DDR4. An individual controller doesn't support all of them. EDAC driver reads the controller to determine which mode is running. Signed-off-by: York Sun --- Change log v4: Drop DSC_SDTYPE_DDR* macros, use naked numbers as suggested Update commit message. v3: no change v2: no change drivers/edac/fsl_ddr_edac.c | 24 ++++++++++++++++-------- drivers/edac/fsl_ddr_edac.h | 4 ---- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/drivers/edac/fsl_ddr_edac.c b/drivers/edac/fsl_ddr_edac.c index 2675833..46b00e1 100644 --- a/drivers/edac/fsl_ddr_edac.c +++ b/drivers/edac/fsl_ddr_edac.c @@ -371,30 +371,36 @@ static void fsl_ddr_init_csrows(struct mem_ctl_info *mci) sdtype = sdram_ctl & DSC_SDTYPE_MASK; if (sdram_ctl & DSC_RD_EN) { switch (sdtype) { - case DSC_SDTYPE_DDR: + case 0x02000000: mtype = MEM_RDDR; break; - case DSC_SDTYPE_DDR2: + case 0x03000000: mtype = MEM_RDDR2; break; - case DSC_SDTYPE_DDR3: + case 0x07000000: mtype = MEM_RDDR3; break; + case 0x05000000: + mtype = MEM_RDDR4; + break; default: mtype = MEM_UNKNOWN; break; } } else { switch (sdtype) { - case DSC_SDTYPE_DDR: + case 0x02000000: mtype = MEM_DDR; break; - case DSC_SDTYPE_DDR2: + case 0x03000000: mtype = MEM_DDR2; break; - case DSC_SDTYPE_DDR3: + case 0x07000000: mtype = MEM_DDR3; break; + case 0x05000000: + mtype = MEM_DDR4; + break; default: mtype = MEM_UNKNOWN; break; @@ -499,8 +505,10 @@ int fsl_mc_err_probe(struct platform_device *op) } edac_dbg(3, "init mci\n"); - mci->mtype_cap = MEM_FLAG_RDDR | MEM_FLAG_RDDR2 | - MEM_FLAG_DDR | MEM_FLAG_DDR2; + mci->mtype_cap = MEM_FLAG_DDR | MEM_FLAG_RDDR | + MEM_FLAG_DDR2 | MEM_FLAG_RDDR2 | + MEM_FLAG_DDR3 | MEM_FLAG_RDDR3 | + MEM_FLAG_DDR4 | MEM_FLAG_RDDR4; mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_SECDED; mci->edac_cap = EDAC_FLAG_SECDED; mci->mod_name = EDAC_MOD_STR; diff --git a/drivers/edac/fsl_ddr_edac.h b/drivers/edac/fsl_ddr_edac.h index 1eccc62..4ccee29 100644 --- a/drivers/edac/fsl_ddr_edac.h +++ b/drivers/edac/fsl_ddr_edac.h @@ -50,10 +50,6 @@ #define DSC_DBW_64 0x00000000 #define DSC_SDTYPE_MASK 0x07000000 - -#define DSC_SDTYPE_DDR 0x02000000 -#define DSC_SDTYPE_DDR2 0x03000000 -#define DSC_SDTYPE_DDR3 0x07000000 #define DSC_X32_EN 0x00000020 /* Err_Int_En */ -- 2.7.4