From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752105AbdHGGVO (ORCPT ); Mon, 7 Aug 2017 02:21:14 -0400 Received: from mail-dm3nam03on0070.outbound.protection.outlook.com ([104.47.41.70]:27167 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751564AbdHGGVL (ORCPT ); Mon, 7 Aug 2017 02:21:11 -0400 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; alien8.de; dkim=none (message not signed) header.d=none;alien8.de; dmarc=bestguesspass action=none header.from=xilinx.com; Subject: Re: [PATCH 2/5] edac: synopsys: Add EDAC ECC support for ZynqMP DDRC To: Borislav Petkov , Michal Simek CC: , , Naga Sureshkumar Relli , Mauro Carvalho Chehab , =?UTF-8?Q?S=c3=b6ren_Brinkmann?= , , References: <60ff19f90adfd252cf296fe8988c614c4c3e43fd.1501848023.git.michal.simek@xilinx.com> <00da9d8dcdbc95c170a9b52abcc2580c271bdd9d.1501848023.git.michal.simek@xilinx.com> <20170807040300.GC7516@nazgul.tnic> From: Michal Simek Message-ID: <14045ee2-6da2-c0f2-55a2-b2dfd742c811@xilinx.com> Date: Mon, 7 Aug 2017 08:20:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170807040300.GC7516@nazgul.tnic> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23240.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(39850400002)(39840400002)(39400400002)(39410400002)(39450400003)(2980300002)(438002)(199003)(24454002)(189002)(31696002)(65826007)(189998001)(4001350100001)(230700001)(36386004)(8936002)(47776003)(63266004)(33646002)(23676002)(36756003)(2906002)(5660300001)(53546010)(64126003)(356003)(305945005)(50986999)(81156014)(50466002)(81166006)(54356999)(76176999)(31686004)(8676002)(966005)(86362001)(106466001)(626005)(6246003)(77096006)(9786002)(478600001)(65806001)(65956001)(6666003)(4326008)(54906002)(83506001)(38730400002)(6306002)(229853002)(2950100002)(107986001)(217873001);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR02MB2736;H:xsj-pvapsmtpgw01;FPR:;SPF:Pass;PTR:unknown-60-83.xilinx.com;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;CY1NAM02FT062;1:oj8RPDgLZ2hVedvTw5H7eJwBgDHqZh93xbNf2frUXiMn/Vg0GCrKrhi2rXDbfYfm4HYq7oJAqes8O0BGD8Zt9jXs7XMcAY06RI0222zT2Gy3Q3Mv/Hrij23ANFRTQ5WQ1LZq2qY0s1SUISjdCzkmA1EASdctLsX2p+Usfub3gquMY9IFyFXDQmNK79y+lHdF+tBuIOenezwjpSoC6/TFtLJw78TwKbyCjKqpV8/E04FfCIHPnwv7A3Zky5Kp2zaM9ov6bDcSPrU1USZxALbxklOUZrN1EUwDlTEFkcSYmpUXIxNFP4hHvGFvfxPorQotLpW4Lv4/S6agCBDkDt8FxyYnawoFf0Jue0LkfeQDIMz/HMo38M3cTC/p6iNkm/aZD7xBiVHktHZVH45Hbyq6RxFNbFhHfreZ6O6nuogrPuvIqTJlnhSimKFk7uD6KD3u4f/KSiuu9EeDskVTtVbYEz2nSJ+SWNL0MU3fESdC9BXgvJfuOI+Z4JfmHk64t7c+lEMnxNmJk4a8MhUANoUBX/ad8Jjw4Je7VSCYJaNMutdzj6JL2dVvQepT6MlWp4H2swHv4Nz9VjYauEW2UICD6eQ9c6wZZFyiNkJffSBY22255PTwLyvLvtl6bYSmXY/lTqrWg/tQfi0HfN2QQHiUpKUSXZsXXmobPfKHrp658V2Mk8FAadhJ4MvSxyVL0ynu3m1QB63bLxEnBdt2mzDHu35RcQnXou8Au7nV8SdPcXqjHfFcak2vUjd0OsMFbwgpHs4M+/LlEkCguPHROUMzz5GGKm62jHuZC9srnvayGUexnoo3uJBWleir7rVFS/Gf/X9XRWtFp78erreFqSxbRA== X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4370e868-e4f3-48aa-f738-08d4dd5c7d90 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603031)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:MWHPR02MB2736; X-Microsoft-Exchange-Diagnostics: 1;MWHPR02MB2736;3:SQTXub78b3MTBR1L1vOsbSJrHm4nXe657JFjwI8rRXFt1EQm+4Lu02QGThjKIZkWMdKmpDgAZ75i+NXpoM+B1F4pfUUcorOI6sKgRyhd4JLZV6ES1TkbdcWVrj36i0SAK3Fk89iu+kALXEZH2508xYdqHncDicuqzhVAIqdAtHGTb5KmC+oRgiB/RDxJ7JOT7JpB39jpWWCFaoc7eMeGUM3X81yx7u77Ugnm7YGV24s7yXv+B5u6m8YfxkpgpXUDiEfgyY25pnwfqK+PdL5Is6zqfLMlFENas9GXxEwTr22ADnL9mHhXIh1YCXHjm/wU7LKqP+3GetAF5CnNmAOHNDx/WooVnYvKD7Shf/GEPWM=;25:MU1YUFmnozLJdRnJCwuYfSKD3h4gbsztSCfn2jFmFpMmjenyEZrwH8tlUqmN3ca9ua2o/0s+dXHVc1n0d3oTEQfq0d70MANyyreeFkQStBHZvxePtgkuP1GO6AqHBaxFhhpRoO0YGZTa/SRixNF02Vl/5rb6VH3J1kSieWWjDwduahwAc252Y6bD5uyPFu68o8k4gvfW/dWY99stwMvOtIiu/w7McUntLGIS1JAuBCJRg6OxSfH35Ce1EkfonBQRA7BAbMI2WllJxlskTstKDp++mwsEfvgYDF5OOmeLIda1vpHCwySunyCz7OywrcnYgv6bBZxxBnG8MTD0GRfRSQ== X-MS-TrafficTypeDiagnostic: MWHPR02MB2736: X-LD-Processed: 657af505-d5df-48d0-8300-c31994686c5c,ExtAddr X-Microsoft-Exchange-Diagnostics: 1;MWHPR02MB2736;31:NRfv+pPvSowv2uCem8ClzV7fQrZ/rUKfbs6tBJ/o4N+hOxanhCNGgAGTSQxtiPNKCuGUWYBbwWmh/JbbvnCGr3rCh3HBfrMbnujAhnT3aIBz3OzBL9oEl4NLj1a1mdg9lqyDwgqeLbJSGEmYvmgNXrjmyp/K4ZJatTtsO+O+1akcy8KMu0N/BIUTnfq8wnURA4fCm5AUoqUrwduSLbD0JzqxRdvIj/xxqNPDIH6TN2M=;20:r5fQuf1I5T7X5iC8jvEJLiY4MxFb8D+GyZsEFmZJ491o7v3vLECf06HArb8qqJE7eEjAn5nao7blnKTzf+1a753eaHoAISnQlnZiPngc+ztmPD43GimWoYC2FFpMmK5ckUas5ikK0jJhVGVCat2GMjuZ5FnufJOFgB0HgNzEBv2onxKN7MZyZLKRKgQVQzYAuvJdpTDoBZR3GrL0ATaAtLzWcn/7VDWQ9jyhuHRT0Gz3/Cg0sK9D8Cp/NA83ybRKbQPwYx2TMD0tJnktyBQzL/Cu5c0pDwnYDwsSwStVvzEAHdsR0z3vDuIXfwtsC7nwv9N1sqWFgA0yvqJzmNVHQNMdTOJrATpSmigVUy4vEaOg/8wxO0KTA7AJTql9LBvQ7knRaiEnIqAl2ccy1lTeTBGKThuK8E/cdb8VQs2K4ii/Zugr1PjwPsbNg53S+ID5tu9gF7lrVJYLk+uEVf/DXEhiRg//vy15tDa9VKdQYYgqV/NBp18B7DPXMMG4+Sib X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(84791874153150); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(13016025)(13018025)(5005006)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123560025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:MWHPR02MB2736;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:MWHPR02MB2736; X-Microsoft-Exchange-Diagnostics: 1;MWHPR02MB2736;4:uGLOOQmQNGTWek/9ZYUpqZmML7ADNVFOAJw4yuS8JDHBJbbkbtF6rbR/fzOQxqE2QrDRf8U+uas4FyUYtEPemJe+rHxmuwWsqzxdYDdsQ44HT2yPhInZLWYKylxKep5rLEQPZ4tgeohwEq/yT48AKF7HnpUJA7vSMmjuUw7eqybOsxmbqfyTDRxLJj5jFpefzmtufqBD9675GHzustaQjbTaEYaCptrDb//Lumo+zhiO8uATTK+NQSGP/JVMpEwdb7N+I98I3NXjl5xeN+ZUcCnyEYkg4F55gpQRE93KlMjvW8pvNtlDdmoG5789SToyL9qKlQhsOywqLmZQCdkiWA== X-Forefront-PRVS: 0392679D18 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjAyTUIyNzM2OzIzOnF6S0JxY25RS3dPbmlLVTVTSEd6T0ExbFM5?= =?utf-8?B?MVNoVy85K2MxOG1DYnBHei9aM0pFUC9TZUhyVUFGOUtOemp2RHczdTQyd1Rw?= =?utf-8?B?Sy9OOTN2dDVsQVJ6U3F3S3VlaUVTaW55TWF4WFFuSWgvbHRRNDlaTEttMkJD?= =?utf-8?B?N09JczFzcTcwQng0N0d6UndMZC9OMGprelRhTEdBTnVGTm5Nd21POFpaeVE0?= =?utf-8?B?SlcwYTlSMXZLQWQ3S2I3dVlWY0Y1RmdQL09YckF5SFpBNk1ZWUo4dnNqbmdz?= =?utf-8?B?bmVMVldDbkhXYnFyZ3ZMUE5sVGhvdFkxREIwcmNFSWQ5RzJoSWl4UW1QTVB3?= =?utf-8?B?UmtiZ1ZnSUNmbTAyYnIrRk8zWGxldGluUTV4aEVodDMxaUcxbzQzdkJYYjJG?= =?utf-8?B?RU43M1pLa0ZoVkk3N01OSzdHY3hIdi9QVGd5ZCsyeEE4dnNORHZRekFtczY0?= =?utf-8?B?aDJHUFl6UktkbzlUWWtBVEUwOEVLdG1XWXZxc0MxaWFOekNwSnQvb01yYUFn?= =?utf-8?B?am1HN045UGRtakIvRkF6K1FON2JWNXd0YjlhdkI3RHdpdG5TNkJaS1NXSEps?= =?utf-8?B?S3Voejc4b1FLMTRCZlBkZjRZTkhucmhPQzFieVJ4Z1pXV01QQnZQWXZYME12?= =?utf-8?B?b0ZJSkVnejkraVBRSi8xRGRQOURQdVBkeGsyaHZBSlNpOUtBNXNvQmZjWktU?= =?utf-8?B?MHY4UjcyZHh3RFIzUnFieVJYVmt2YzJxcHlxYVNKNjdhUjFkQ2E2MVUrRG5L?= =?utf-8?B?K3BINWxiaURmRWEzV1VlRUZYU0lTVnNGR2UxamEreWE3amg0NFpOZzdLdVBN?= =?utf-8?B?d0pleUF0a1gwdWFwY2lrWXhrYTJ0RVRCSTNGR2FpSFlzUzFYS1lTOUo2ZkFw?= =?utf-8?B?R3lZY3Jkd0xJOHM2R3pRaDJhWkcyNkRJZExRTzBuWkFzNndwNzRnaGFoRXFt?= =?utf-8?B?RjRUMVZybzdqbENBak9zYXZ2Qmlkc2J6TkNPYVE4VmVkZFZPL0E0cm44SHJY?= =?utf-8?B?YnFQNldESUVLV0JleTBvK2NIWjZyeWJjQzc4RVN1Vk1abTJqbUprSjRubVA5?= =?utf-8?B?NEdXWG9GNEpUd0RsS3ZCcU8wcjlwdXhFU0RNcWlqdkowMkdzd0NaWFlQclhP?= =?utf-8?B?YU5sOGlsS2NJMFJkTWFMTHREWG1nUVNRUyt3Q21zV0szbW92ZGNtV3ZDK0pp?= =?utf-8?B?L282VCs1M2Z3S25KUUtsU1hIYTRoRW9wcnUrdXVsODl3TEVYeXprclgzazgr?= =?utf-8?B?RGI1WnpkWS9PemxzZG5qUmRTS0lSZ3R1aUlBT05MTWExUk5ERGVxM2lxZEdC?= =?utf-8?B?L0JHWEVRemhlSy9ZSlNFRTJTVkJCR25zaTVnb2owMGNFV2ozUUNGNzFySlRW?= =?utf-8?B?YWRNUS9IUUJnb21CQzhGU0VnZlFFYlp5NTNVRmhsUXU0MTlQc3dJSm04elp1?= =?utf-8?B?UUNqc2t6WDJFeTZTUHZwam4xc3RYT3VabnV6bzk4N00wWktHT0t2eHYvY1VN?= =?utf-8?B?WW5PeGo3cGt4WUpKazFSWCs1a2hUcmQvdnBFeGpZNUZnWlRDWk9XaENnN0g3?= =?utf-8?B?ZHl4dkp4M1QyQzViTEhXOU9zVXUyUkZDS0VoRlg2VDgyMkhCaXA1Q1F5MktX?= =?utf-8?B?OTd6UzlCclZpZlpELzhTNXhQUjJQUjNQaWpKVXFya3RFSWVBcDZBSkM2OWpE?= =?utf-8?B?K0o2MWFlc2VPN0dDMnJIS3JjOUIyR0tVeU01Q3c2ZzZjN2hqM0tiYVZyeHVZ?= =?utf-8?B?N0daV2lnNjhsYm1wMVZVV1N3L0dBTGYrcFZ6SHFzV25UU2JmeGtnWjNQTk5U?= =?utf-8?B?TXhETEZpcGZiV2ZTTEJvTExicGtZZTNRbkJTUFQ1c3FFRXc9PQ==?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR02MB2736;6:vtqkx64ZWs/pa2nr8hdJJL+K+kDMrbK7j0UY4wGKbqzoXJ2CFnSGut4/XrGHjfCQkxHxXvspsGDCRkFmMaAwaA0gdbTW/jGTs4PHrzwCjSI4b24vnRdv3UpD8WmHorJWtIIBWYjz256MLcBnkxBlxSxP05Mg+YG0bzMveyKcSbmj1eILW3HolIZbNXUjGjqSSWQO0HtZI9lcAkOQPjg9nWcwMYt3pliqzMeBl8X3zRWxAp5qkgFIwJ8Br2VFZ/2DgLwAsKQUajnzWsKcbUUKm2Df+Bfjr3cjpSxNdT1qrJfrYO2G2f9ZBU6u0t8d719xJ6WpXe6V8KVAzc3/QbU1Pg==;5:mttlgoTuRkkAAqa+v+HhLyLRLFoPEZZCagMG9icc9+UR1DXmAbdVR5fbAB/5yMiynoXibjrzbxUqWXy04e+i7w+PU77oCgOs2hxAV75nyrrmtxcrohYZ2pbypfiPYEbptybunQCiA62hCuFT2b3vtQ==;24:t4fR+pAtkRqCALlpZX3yeICCYTPWXj6PWhodraMQZyT0vwn55cT7AVubPKFhSAPbk1XCxDFoceqbgCDHgx1zk2JidkyYBWnhGQ/dm5M1zyA=;7:47z+DbYwfwl8fWHRAVCanV/Cq14jnKAkdqs5r9kSH09Old5gG2daq7nqjnbN5ydfseviR9gpPPo3t1ZcvY7Rle9NDOXSm/x/EFg8/LFP+9LDU/oEfdEtvlErjNirq8GV6WzRGy15iv23OXimGQpvk8qwaSlqTvy5L/WQ2RP6RX7ZlVIw35+SSFWZ5Fn5ENQuksxorH0SYlMNR0CdPuahQF1AedkZSoFxLVKpgwBjjbU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2017 06:21:07.5558 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.60.83];Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB2736 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7.8.2017 06:03, Borislav Petkov wrote: > On Fri, Aug 04, 2017 at 02:00:24PM +0200, Michal Simek wrote: >> From: Naga Sureshkumar Relli >> >> This patch adds EDAC ECC support for ZynqMP DDRC IP >> >> Signed-off-by: Naga Sureshkumar Relli >> Signed-off-by: Michal Simek >> --- >> >> drivers/edac/Kconfig | 2 +- >> drivers/edac/synopsys_edac.c | 306 ++++++++++++++++++++++++++++++++++++++++++- >> 2 files changed, 302 insertions(+), 6 deletions(-) > > ... > >> @@ -440,9 +706,12 @@ static int synps_edac_mc_init(struct mem_ctl_info *mci, >> mci->dev_name = SYNPS_EDAC_MOD_STRING; >> mci->mod_name = SYNPS_EDAC_MOD_VER; >> mci->mod_ver = "1"; >> - >> - edac_op_state = EDAC_OPSTATE_POLL; >> - mci->edac_check = synps_edac_check; >> + if (priv->p_data->quirks & DDR_ECC_INTR_SUPPORT) { >> + edac_op_state = EDAC_OPSTATE_INT; >> + } else { >> + edac_op_state = EDAC_OPSTATE_POLL; >> + mci->edac_check = synps_edac_check; >> + } >> mci->ctl_page_to_phys = NULL; >> >> status = synps_edac_init_csrows(mci); > > This hunk doesn't apply cleanly: > > $ test-apply.sh -q /tmp/02-edac-synopsys-add_edac_ecc_support_for_zynqmp_ddrc.patch > checking file drivers/edac/Kconfig > checking file drivers/edac/synopsys_edac.c > Hunk #11 FAILED at 706. > Hunk #12 succeeded at 723 (offset -1 lines). > Hunk #13 succeeded at 754 (offset -1 lines). > Hunk #14 succeeded at 803 (offset -1 lines). > 1 out of 14 hunks FAILED > > Please redo your patches against this branch: > > https://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git/log/?h=for-next > The patch "EDAC: Get rid of mci->mod_ver" is causing that collision. Will fix. > Thx. > >> @@ -458,8 +727,18 @@ static int synps_edac_mc_init(struct mem_ctl_info *mci, >> .quirks = 0, >> }; >> >> +static const struct synps_platform_data zynqmp_enh_edac_def = { >> + .synps_edac_geterror_info = synps_enh_edac_geterror_info, >> + .synps_edac_get_mtype = synps_enh_edac_get_mtype, >> + .synps_edac_get_dtype = synps_enh_edac_get_dtype, >> + .synps_edac_get_eccstate = synps_enh_edac_get_eccstate, >> + .quirks = DDR_ECC_INTR_SUPPORT, >> +}; >> + >> static const struct of_device_id synps_edac_match[] = { >> { .compatible = "xlnx,zynq-ddrc-a05", .data = (void *)&zynq_edac_def }, >> + { .compatible = "xlnx,zynqmp-ddrc-2.40a", >> + .data = (void *)&zynqmp_enh_edac_def}, > > WARNING: DT compatible string "xlnx,zynqmp-ddrc-2.40a" appears un-documented -- check ./Documentation/devicetree/bindings/ > #414: FILE: drivers/edac/synopsys_edac.c:740: > + { .compatible = "xlnx,zynqmp-ddrc-2.40a", > > Please integrate checkpatch.pl into your patch creation workflow. > Thanks, Michal