From patchwork Mon Dec 19 16:13:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 707146 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tj5lX5DmYz9t1b for ; Tue, 20 Dec 2016 03:21:44 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tj5lX3JcHzDt3c for ; Tue, 20 Dec 2016 03:21:44 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0079.outbound.protection.outlook.com [104.47.33.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tj5ZQ230czDwNJ for ; Tue, 20 Dec 2016 03:13:50 +1100 (AEDT) Received: from DM2PR03CA0039.namprd03.prod.outlook.com (10.141.96.38) by DM2PR0301MB0752.namprd03.prod.outlook.com (10.160.97.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.771.8; Mon, 19 Dec 2016 16:13:44 +0000 Received: from BN1AFFO11FD026.protection.gbl (2a01:111:f400:7c10::153) by DM2PR03CA0039.outlook.office365.com (2a01:111:e400:2428::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14 via Frontend Transport; Mon, 19 Dec 2016 16:13:44 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; ellerman.id.au; dkim=none (message not signed) header.d=none; ellerman.id.au; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD026.mail.protection.outlook.com (10.58.52.86) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Mon, 19 Dec 2016 16:13:43 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBJGDY7o024120; Mon, 19 Dec 2016 09:13:41 -0700 From: Madalin Bucur To: Subject: [PATCH net v3 3/4] fsl/fman: A007273 only applies to PPC SoCs Date: Mon, 19 Dec 2016 18:13:32 +0200 Message-ID: <1482164013-6111-4-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1482164013-6111-1-git-send-email-madalin.bucur@nxp.com> References: <1482164013-6111-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131266376239068050; (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)(6029001)(336005)(7916002)(39400400002)(39410400002)(39840400002)(39850400002)(39380400002)(39860400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(626004)(81156014)(43066003)(8676002)(53806999)(8936002)(50226002)(3450700001)(77096006)(105606002)(305945005)(69596002)(86362001)(81166006)(38730400001)(4326007)(85426001)(50466002)(36756003)(47776003)(48376002)(2906002)(97736004)(68736007)(76176999)(2351001)(50986999)(106466001)(2950100002)(6666003)(6916009)(5003940100001)(104016004)(8666005)(5660300001)(189998001)(110136003)(356003)(33646002)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0752; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD026; 1:2AZOK/brvLznwdygUqrKKere7DicPd/yuwVrsJDG97QtMa+Lxjtooi4HxIK/OrITrXYxHYRkAcII55ci01NN6ocnjcC8YOvrKVzVrYHhOnLK4s7O+GHcu1sfR9saxzN1U5qcoiK2B2203AJJYhcdkGBoqTk0sg4Iok4I4mAn67rpJbGpM4+8CK+w4MYRF2GWKu29/u3z+AsJehAZ/l8feeF60+EKXo8/DRxX746WUEyuA1QvHsJmoRVQknEDHn4Vc1XdP2yY0rhC23z2CFLYhMYLOXOsshKQSc+Ym+1lq1PVSaM4z+o9N1HmeFVWV1DYMHqHQ0qm1511ItaZH58pnTyYz1a93U3Ck13omQQZNYUtzgC6lec6vGTpWrQyEuENz+gm8lesru69SUE7gRg2GPRYSUNiVQtszDmh7LkLk1hBeSQXaRCZjYQJI+OZ0RWHAjgVUT6eAXo5hC44WIJ7Jgqk9cSyfGNVWzSG3R7kwHh0rTdN2yqkt461BP7R9iiLjce7iqrctutm5skwcfN9HvOybIKaOfnl+zn0/nhU1Gs1mignlKDglFizuojseIc0TFrOj9DvZ6tfIg4s1c5bcUb25zsV6siqZcYl6dDAWZoAB7JAk1wJNP+wMpeeXQUe MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: a5d8e35a-667a-45a6-5231-08d4282a0123 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 3:rLSlsbtpUtqcF6JrGzWoA+js8E7eb//JHXbXBE2GIIJaLaR4sWV2gBp0K67QOUKjmfo54V8M7b6BDVL7vGEQl/nwhiRnqljLXrqjCZOy8wX29tKJjUTOloit5P0Ow+6VVXPy7yb5f9ZBMUVJhcGQS7IJ80y6xSJAAl5CuKwsd7KJqwUzxCn84oslLxwpZUU6QpmKAry3qHLlM4ortylkGiF43jyOnBNZwD/w1OBeJTunoEdhRybsjwJcA1HBlzZzX/hA+tHIf8MVG+wRH2xhIqdv445H50Kx/iZyruojylGNhIjXYgCWtx8DTrcscgAYOoQ5+AVjw0Vy8LTRS1vIi/uHIARtBMuf8gpG6UwqcDZ7gjt/XpFDEbhyEAYR8A1w X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 25:wo9d2MKPYImWl9tZK2rkpCGJFu3jbMaV8wtIEPIihEH0Mv9szkAVaufITKJiyqzxQvpsmNABlU6YCxoWKHt8OsN/o/C/NaLFZ8AfpVa1MUad10642p0ygolMnWsbc1OO2t8hoZqbLNKhcaWwhyfkQDEMov/SJP/OXkQYHPkwFfiB+dzA0X+Dv/bHfg5Q1BpdpNC0dbKJ6DeUmg2Kbw61d6faV0gUNi97j0jszjHloGX/7lRoUKvGYXBZdu58QAn5GSxz4KSPd1tgUEPwXnDPW13IGwe5tXtjXWdU7LX2nD5ePIFTaYgSWfyBZ6mUv1/ZhIv3vzry9pyo6ZDqpHGGTm/r80lTP0E0UeqA0LKaLd1ORtFlBE6UjEuua1MoLUJJSRFFtjs2EXPiMHph+VC+2T+ygqMNKU5lY1MDH+K1Nk8roV1vywMh3pnmykNLIFyimvbZDaNVuYTt67vUAiSQIMnIcbXH4OxoqRzaZVEup3MBQbdbte3f4k1trg/L2Ef7OMWym6ge05lYOAOVinvJjVEWuAV2xtiviVsEsROIzyN9S8rMGmWVU3yMEFM4smjVoOSIQbRSWt5Nprf2SqAr9493Fh5/eMsTmgEtEmGOgiwAFcB+KAVhTP9rCTLLb3UEyR9u9rTBWeH1OH74GJvZJ0+pjIzp9HRheDOIeKQDU0FknC09oqaNxYH6tIyAfDrO6N90/mTwgVCMjIhFs32k8qlowAWyrCkPW7U68h5b3397eE4PFudRORVshoSvaYyuaPLu9LwDeJWbmWh4J56DxA== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 31:xupY+pWeVtW8UAKcNJSzvnKNGBqJ3Nm4wUJIAvkXvyHk7gsrovYHn0QO6THzGA5Vt0PFfZkj146V2Pucl+Ww3Rm+fvIhL+AYIBCSjwiWtadwGly3z6tvR7GQhWeO5B0U+6dZTI4A5sYsjWOcpdkggc1Wtt+d5Ae9PxmRgxa4BKXxgW43du3SEk8OGpgXnN7otuwOw+UK+IaLc+AU2Hb19dMYuU/pCpqDPeqkMwC6E7Lk8adgUyDTGRvKTTMY6T/9OxrtvEtbHjf+1BmUt+xgyA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(5005006)(8121501046)(13024025)(13017025)(13015025)(13023025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123563025)(20161123565025)(20161123559025)(20161123561025); SRVR:DM2PR0301MB0752; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0752; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 4:/NGY8Kf2vszTOw3JEFGudEdUhMeEFN3fQmURm2P7+k6XrOcXN9LyLIdcUb1v66s/SWa1B4hKQko6G5ZAT68dSywy9RvGPFCxEsrCDgg7JzdQ82r6zsfkfcAYqi2S+lv41IzEofpEQ7GcSpHoKox+5bqhXakN1MdXzh5ElLmT9L6M3HXkVNYIjOCbh/anp1/r5dAGNPvSDVDx2l2wTbBc/MnE8Prtx734gdl4e3nKTILAtVYEthi6qedEaHO8Q1moG5rZKLbJaaUkWWM4BzNZhkkzaSHSnj6j/KXefE7mWJQE5eotrDRO6/xnUQWfzdi0Em+lYQZgLSSQMTOIzFx9B//b049x3eEV3qes98QYqMVnhsCQA822lNlQT6fHq3VxeJeBP7uy8/Er0iyGkyDAIRfFtg68XCbQUBkJi4LFvulxU3ds7RC/1tO3PRr2yH8NVOE/Tm/4KdIUCBE0swChnsE5J3HHPH+4LraEFM/N/cN9uBrwkCcwMLlbj1HCUCvpAWd4B8kTfR20YePwUkJcNA5njZORTeKsxjFlSiY3XCBqqwJExFR/wsBGrYwj6RCBMalNI/8O7Ze4VcFzEpnOVuKrPePiotJEdj5/Y8ZrzdXw2196EHfOXWanxS24oW2MDiTktZFsZTVBno/X/exMVIL86UoUz7yISUw4dADhSCZ2Oq2EcI9TD5HBEY7/9f50PY57ZJUY+y/nkZJeGL4dd6mPkMi2O7vrRJSDtfARnoj3WM1ghPrCZHlLbkOxLst3 X-Forefront-PRVS: 01613DFDC8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0752; 23:BiBz22Z1nkAhuBwQOPlA4RMRhuEWXEtD/at0fgP?= =?us-ascii?Q?2IeCQNl+nMb7bzw1qRZTGQpUlM7zPtZbcK8Skfv7PtKIaDDI0Kj9aOndT0+3?= =?us-ascii?Q?gCFMRCyOIIEeMlUH6ihRCZMVfDN4RxmAGp3C7xMGk9Wy0JXoJnX87+gdqe/b?= =?us-ascii?Q?NF25MCo4D6kMwsUclTyQdx+NRQHS/mZ3Sj/QD6uLNaDcgNbJa/gntRY9/OO0?= =?us-ascii?Q?ZmK/W2B/RQs8DTacN2cLxShJG52aQm4AnNlF2qj8LArV1xjaIYsRFXhwfluK?= =?us-ascii?Q?Gr1ABZ13q4/1D8JcFlTLoy5BHsJxHoH2jNL2BAxb/TpVM34Tx0cyMFNV0rw4?= =?us-ascii?Q?s7McxJMTy7TSoLSv13Mzz676f9KTVi8fqkE3yT3Gp71TzsGlVzEa5dceeGz+?= =?us-ascii?Q?R5389t+GCpKuvnN9s2m3cpkNLcOGoGLlOczK6+fQ0MaZUAk7fsIcCqU43GWP?= =?us-ascii?Q?e15v6BSMr6hlUuHDKcYInLS1AxWrPTOFtsklOMtxt2X2j1xC121rcrpmKbKG?= =?us-ascii?Q?HWQ6etu7nofyUJx+KsaMZ6j6QlniKb8e5w+HfSYwRZEbJ9x3SM0rM56qp6Dw?= =?us-ascii?Q?X6NomPChxd6vWhDTyllem2y37xZ02iC/2Qf3sFpkHZIZUe6otd7xZMel7yWn?= =?us-ascii?Q?VHPmQoOAaQ58TeOXSZh+yUdeFWUPYSNAMawr4rtiDq2oFBFeHUyDXdeGQBVe?= =?us-ascii?Q?AsMVubQ8O5RlRoE4nssGYZDcZUr1TQlH3KjK1eALzJHWtCSwLWCzzyBDY7GI?= =?us-ascii?Q?XSqGP6aH30ZyHabU/+WTB4oJZig4OkQZ4BBXcnDkFtHhaw9pBDrfZ7d7rfnJ?= =?us-ascii?Q?NTcJx20YR7tUl9v1SXPyc98KuzHjq6znXdsRSgGB9z73GpIaV1G72uNno57J?= =?us-ascii?Q?5ZHeUd/tM/rRy8hPjbB6vhEJ+azSGfKx8mmuPQytmLlM0XSiY3nS7ri8i7Ud?= =?us-ascii?Q?+abh+1i8DCSba9b8UhVRCUrRt5OCKoSYT2jkBLZUFx3PqA9sezpzpdbUpPkN?= =?us-ascii?Q?WPcRhbUevm+yOLV75eslD+2FXl5Ib7K+xO3uSLBI1E0tV/OvCv6uHAv+uSun?= =?us-ascii?Q?MW0VDzqpoGGh+TWJT/XcvBA261XjHU/R+P3INH1ZhnFUYbzCM+b9+vboU4UK?= =?us-ascii?Q?1eW6Rp+srR8tmV6TSsJG0SS2v1+zDS8r1/cPlcgpnmLRAo/LYYhdzufDcuhp?= =?us-ascii?Q?K3SGERU6XH10a7MWn0oZGao7bcVffE3ROL3UV4Bg1TpP6vfr2RNo/wAo1mzP?= =?us-ascii?Q?8XiYcyRXI8RioLFRJBozkfhaBsVAr8ipnGZ1TYYAvSh9WSmr4UnS/2NcGJD5?= =?us-ascii?Q?Uz/ZgRGzNm1SykoV6W/k59rkbTQQ890k1qbrK1dzAigrGqxg4x2vEf7Rj6ZC?= =?us-ascii?Q?EpiBvfZuXOYGWVDdP35oSh4MUe+o=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 6:mta48mI9YAwWbRWN+7NN2EpacWZ0xNZ2Qu3Da1lxXgSg9H30gFKTHrFbvZz8Ya8UuGCay4DXgQrXYGFl0jlfhCiT4Jx4YSvcuOvQSI8yW+cRg8IJhW5OCBMgr9EluG8Ej6IWBjAE4yefSead6trmk+DaFb8lA2UzRUS/trzjS0H3VQVyMfUQwMDqUldHeGUaQkp5yMd/LnDPQbE2sy5XX4O9uHoIT4F5Op+bWv0noqfXsIKi89tlfBhCPWPigd2WEIYWgCD17Hv+T0sg21fZy9GBB9GmqGVGs7inMzRzxq02jKBTobxdK1BBr1+/L+LsVCXesu1T+PjvWpbGDz1GRsXziV7oP/nsk4NG7uAiHKO9w+B32F15SzKj8H/5eR7JsxsD1TZdTPRG7lMCncrvEk4YPSPfxcI02EsmedFXFczTogOXdARYf+rYfVirF7Vd; 5:e0SSBmQq0C9kS3a51QNju5pRXpOPjbLQTMpiE2EAl3i/wvqCpbka1dyijSabf0rTOyaQNxXwoUFFd/X/GNT0iTEw+5RhN/CLAOdvexga51eulh73FAdrB0f91Id+BRM+ys+kOyTTHKNNjQBmc6OktDx96Cay5uU8u8LuE022p28MH4KCwBYh+uV1arpBb+gR; 24:xTpEBWog4KspABOp9oEUBnH6i5b265vOImRGr+IdSJs+jqHvePUSt/NKkWkh4RiYKuv1Cp1bCj4zrgGbivyvNr03n6GJ9KqpCLq5nxMzz+o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0752; 7:zT3TC4UlTaCK/QqD6WVvUpvtUyXRYXiq7yWF+l95Zb62+UHfvfDq7GbqWjpZtMydGKYzetlesYxf/IcBm27faYCiQ07Krr1r7dVxJJV7hY45kflhBK3sE4QH355G6KZyzPBZa6eyGFPfbSDC8LSQx+P/1PuqVE+uvpOgpEBGoaNVIhxNF63e4NjYFG371crAubai0dEOCy3U3A8gl1gftZ50HrIVibWYrqcZnT2n36wbwrYcpjh2L/aq2kfLG/IckcBqiGfS+AxbQPZ3vnit6+A32kz4xim339Znt1HpMTGYrgN0EiZL2x3pXBTjOve/GtjTxtK5l/iGULz7c/FHTz5AnPKafS8//FpS5h15o5Yp/SzBIzbBBEW2hPzgSvpwJX4t1D4BhJv5mypb145waU9SjDcVALNR3fXucHMNiRk/FXCfnxQ11QZlf0H7SE3Q82LWtTZEAuu6LNMu2lzr6Q== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2016 16:13:43.6104 (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: DM2PR0301MB0752 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: scott.wood@nxp.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, davem@davemloft.net Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Madalin Bucur Reviewed-by: Camelia Groza --- drivers/net/ethernet/freescale/fman/fman.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index 0b7f711..003b86d 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -1890,6 +1890,7 @@ static int fman_reset(struct fman *fman) goto _return; } else { +#ifdef CONFIG_PPC struct device_node *guts_node; struct ccsr_guts __iomem *guts_regs; u32 devdisr2, reg; @@ -1921,6 +1922,7 @@ static int fman_reset(struct fman *fman) /* Enable all MACs */ iowrite32be(reg, &guts_regs->devdisr2); +#endif /* Perform FMan reset */ iowrite32be(FPM_RSTC_FM_RESET, &fman->fpm_regs->fm_rstc); @@ -1932,25 +1934,31 @@ static int fman_reset(struct fman *fman) } while (((ioread32be(&fman->fpm_regs->fm_rstc)) & FPM_RSTC_FM_RESET) && --count); if (count == 0) { +#ifdef CONFIG_PPC iounmap(guts_regs); of_node_put(guts_node); +#endif err = -EBUSY; goto _return; } +#ifdef CONFIG_PPC /* Restore devdisr2 value */ iowrite32be(devdisr2, &guts_regs->devdisr2); iounmap(guts_regs); of_node_put(guts_node); +#endif goto _return; +#ifdef CONFIG_PPC guts_regs: of_node_put(guts_node); guts_node: dev_dbg(fman->dev, "%s: Didn't perform FManV3 reset due to Errata A007273!\n", __func__); +#endif } _return: return err;