From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758332AbcLOOrB (ORCPT ); Thu, 15 Dec 2016 09:47:01 -0500 Received: from mail-bn3nam01on0065.outbound.protection.outlook.com ([104.47.33.65]:37365 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755988AbcLOOq7 (ORCPT ); Thu, 15 Dec 2016 09:46:59 -0500 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; davemloft.net; dkim=none (message not signed) header.d=none;davemloft.net; dmarc=fail action=none header.from=nxp.com; X-IncomingTopHeaderMarker: OriginalChecksum:;UpperCasedChecksum:;SizeAsReceived:763;Count:11 From: Madalin Bucur To: CC: , , Subject: [PATCH net 3/4] fsl/fman: A007273 only applies to PPC SoCs Date: Thu, 15 Dec 2016 15:11:36 +0200 Message-ID: <1481807497-4724-4-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1481807497-4724-1-git-send-email-madalin.bucur@nxp.com> References: <1481807497-4724-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-IncomingHeaderCount: 11 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131262811069402101;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.158.2;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6029001)(6009001)(7916002)(336005)(39450400003)(39400400002)(39860400002)(39380400002)(39850400002)(39840400002)(39410400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(50226002)(2351001)(5660300001)(104016004)(189998001)(106466001)(105606002)(50986999)(43066003)(626004)(76176999)(53806999)(110136003)(5003940100001)(97736004)(47776003)(305945005)(4326007)(85426001)(77096006)(48376002)(8676002)(33646002)(81166006)(38730400001)(68736007)(81156014)(3450700001)(2950100002)(69596002)(8936002)(2906002)(6666003)(36756003)(86362001)(50466002)(6916009)(356003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR03MB2470;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD013;1:jUhKv+nJkwkBzEV3Fb8oKTE5/hEKhs2cZa0cl+85eavvzMPfYr9DnVKHBGlJgVSVeKBll5PSGUKhJFKZApSgyRPiKatYW8YzpzU/AEWnCQJy/FdZ3reYRLvWPuzrkkE/LLToNopadmiCsJY0RJbog6cov5R04i4Nzg79BTt+Xxd66WH2nwMeWscMN0ekXgmtYkENEYqastNcsVdYk07gjURaat5hdxHv4yyrAmS9hN8YX0sDrn9wViNnFZfYtup144ONf2rsosNasKbc68ZwYWFnW1OD+7pmJr2yunAqYk4MaAaBnuxabUoQTiehC/yKdpTYTdx3MnIA8lnvGqrZKtrMi3EFsINp/BuEeinYNCJmhsqbF5M8mqlV61qsQ5VSpFfbtXxGbv/7P9Lxmm4a1ZzzlNlpep2K73SjX8sTkRt/PzpAAQYFS8vXy5m7Bvj3zsewS9vgntlvQC3x3YWby7xLo7LMPvWecG2vVcfPmBN4HAdaQjoDl4hQZoz48l+6kP/BDYJVfTpchF1V03RC3beZjuiRaI2+4So6YSGtJ/GL0bisZTuco5aBjTXJ/63NqZVPr7NEd7VwC6vsM1w4UHOTKz9cQORkLnkYF37ZR+4= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 2edaf4ab-4f8f-44ed-c0ed-08d424ebec66 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2470;3:xgM3dBjKmkEL5zRCCfy03h4o6tvjW4m8376d/SYXC6uuekhsCovILf0XA1c4sWkKTwB61uKjShlt/saaT7JQPYH22UxiRgGszNKjBkSRRIgiQcKAQJx1Xu6XV4KAf6fRE07oTMisNq8IK5oE2spnJtUxS6lHsxU8IrQAjGRqtSzBnIVkTNloDiRYVKWxmo1FGVF0lA++fP/D5B0dQ2rbS71SxUBQmeaD7Rm3x3bezcNzLebiIAW3hJ/YQFtvDsFqMfOTZR7GbwxSCXBy987TxdLZoXM6Qram7LWtq4+iwBTORvJ5SMw6TWhcr+rQbfypPFxmDtMct84X6Rly9hKX2JtviL1mC8Vxz7smGSgsdx4=;25:YBobp6ytIZ6KByhDHxcKTUIm9L3R1vzo8XuwxrpMqJEcuF/uGNE9kWF0RKOFt5DJ2A+DuNNyARd9VE/xp07O4XSMqd9hMoXwW6Y9X7075o+KdzpptZRjxTPkb80pLRGz/JCDpGcIzRaGlQXTK5ubV3EAbsRk0s/kuT2UEFloCyw38wneaYGiISjW2XufeY7reseo2XUtB72aWbY4IdZnD5Z2ctZvrb93mmUV5VtWWKZZ/M/fIs5m+xEnZ1FMS7Spn5i+ZSCvlWm7fHqtAEvE7Qk4zclXWJle7ApXY/JQTN1H6NZ0bPZkSiu1C4t/sdLHn38Y2R5wkkhwjvZxHvcbso3SBO0TsaZSgGPJeMu1odjljqdGS0QQnN8ny/NfQvzYomQGCNVd2+DGM0X41zejUTGYR8WdIwLYMbaH7kslDNwZgxJ0JKcyq1LvpeIs9qnATsxgFA3jVImaMI0sziJEhA== X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2470;31:1KxyU+gZ1ciM2jH38a3oq0V2Kr58VxSvkD4uCe7mhGP6LniYFGS7RA+E4xB864bNVVzKJYaInTox/1vlQtVXwQPpvrjBkXBH1XxoaFeG+jXRsy6CRDhmGPtw0BtM0OOTGnq3fLBPJTI+1+S8o4B17+G3J4OIJAo9e7AQjSVcwfkjC6L0WlhGLTQ3Y9/zKZOR7KtzldmnUdajJ664l84YKXYI0j8hWEmcUHr9FruRkD0uheNq0bMY54RV4Mhc9UFmvkuPVE3X8m6UOqbGkbeIQg== 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)(13023025)(13024025)(13015025)(13018025)(13017025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123565025)(20161123559025)(20161123563025)(20161123556025)(20161123561025);SRVR:CY4PR03MB2470;BCL:0;PCL:0;RULEID:(400006);SRVR:CY4PR03MB2470; X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2470;4:5Y+45R+2/EZ5VhN4HIGgoO/jbgiy6FZwNwf3uX6bgLCbdSMqD13lIgxFVWohKS9XhltTP6xwdH+2uu4eJGUvMAtG2yJNzmxoiofMFWRv9l6kwKyCSnpe5YixVkTPXXoTIcrMcyO9h0Ub1xrc837igabVOKaW5VLKdsDmd6aCCvYMhMoka9HN5LvNHUVHfMVg3bSSEuCWEefEQAe81eaNhlktMtMtCpUk0bceCg57Pu0D90kv6ARm2kmO77BVFbm/vUqs9JDZmzRxgJIzhiPcD2SuyrLztyedETLI18c9fxoV8TmTHiKe6ZzGntzNJBjdCJYyyQeAv4Q0ljUqbGtfmE4a7FkRAUp+ODYi3Ryn3g7irD98UMAMSavqBCroiOdtCbpKBJJEhuVhExs1ePWRLpdYLHggJMTPuJevEbkfdjkyK6ZC0cea/ImJJJsf42JTHTxl410rz1evIx0TkkN23EAd4Sa8FQVSI+11KKbytWiI4W76PM8MBwIGsw2wvZvfS7C997zGD3wGg8po2OV1YI7EwYiap2AheK6e4VD3PoxVuqR13t2gNfLEUa8L+Bj36GfuHvN8d7y3/FTK/JWRPV1r4jw6/sy5X9j17UhBTUn0je7iJhX7IUiJCqNHkxEzrKx+a/CHXScNrSWKGiSw7SPA43k75QD/Ci8Y0KuB740g7IzXRHDkfHvLtq8kLcGO2DM/LqxaeRiAywlmVjZ1zQdPhTl7fXkCkRr5bc+S5S5wPhSaJX2nxaUFNXiOvhaK X-Forefront-PRVS: 0157DEB61B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR03MB2470;23:NL1KeYqvWfG/OTgCwdX3oA1jWkY9NWPqe/yZVfZbN?= =?us-ascii?Q?tuK63z5ZKlfQzRrRZUZqT3xlVbcKllghHCx8QDwCWhixZhll9cwP4RHehsnN?= =?us-ascii?Q?PjdNAfsvv137b30QU/g8KxLWFqwD+zaK4YUjNRsNuJJPDgwm0l+q6mvPf4kc?= =?us-ascii?Q?V98rdfvktFAJs2kTW8kAzlXB3gGAlBKLm+vVko5Tt/giDM2aiM35gF47yiaK?= =?us-ascii?Q?/5bwQAJC3txL4rYu3K97qBqjoPM5mPwMYIVNWJa9tk67I43lpuTp38Todiva?= =?us-ascii?Q?Uz9ttCkseKKzBpFHiyVMO6UEsr0+OnyeUV3+XVKJlJoWl9vhHZ1ipPx2rmpP?= =?us-ascii?Q?OTBcmu4xT1DMamQq4tA6z0l2dKAHI/aA5Gpg59M1o9TGLgcUt4oQfy8Q7yfr?= =?us-ascii?Q?LaaBHysLUVY72Hp1Hzjexm+QHZvM73YQSOPV1M7Gd1UMgzgp3kPWeJjsZfBO?= =?us-ascii?Q?vX7QbHRo+9y5GqNzPCao88vLgJVJDBP6XOXsWLtBMsHYOKx8U7hg4U+V8fGp?= =?us-ascii?Q?oTfpySBhfzI2+7uUfd3ue8woLrexysC//fb4GD7GlTsTdBJ43/SLKP29Y5EO?= =?us-ascii?Q?vVRo0cEtZ/1+VD6MQt16GfUsdxu9ZnQ9Xmxytjes3dZFVdiZ9QNGE9Fb/fLi?= =?us-ascii?Q?bUrN+TibZ6qGwfNnLZw6VWVhPH0QLfIKkz3sdnGXU7qv+uH9JUd+MyZhQSzL?= =?us-ascii?Q?ymeR6ZtBiZpXx9TCAe0L5s6F/jLP3vHa/oSgXTVPwPc4BwA+uZPYbiOBNEYp?= =?us-ascii?Q?Ud9KZn4iMwUVBGLPLN20HWIt18LHt/MPGXPGEHf5P7e+Zd5urwBp72a+5QN7?= =?us-ascii?Q?Hczht+3t+Z9t8Yi3gb70nWutRLLou84Pqj8CWrF0tRYeDiwyxD9e3/WLo6gM?= =?us-ascii?Q?Fi+O6CHOybnbOnjVKjqltWBg/v1Xl+uvocWn+u4Jbz00LCmH11ZvLVwo1Ih1?= =?us-ascii?Q?Bb7aoXtOXHmUd7pmg3Q/qZdcP+NZZHsu10wCv5jImTh9eCCelQWl1gqwVz0Y?= =?us-ascii?Q?R6/SrzSNeDcHhOKaErBbmbCmqML5P4CAK0R1JEoQTtJ+OisRIoXC++ZUJTFw?= =?us-ascii?Q?h2NcTfkf6luvkAhlm1DNrEtavaTT9ymqojSB69tKmT4LJiAEXpwLhuEuVZyY?= =?us-ascii?Q?fHAc5STEbQV6NryskYShxSnrhW6lTlSVePDIAkvv+jzRJfkscJDb7wWmMHLj?= =?us-ascii?Q?MzRPqjRTVWWjRbYYUyKN0ZkisfYywQGWmFwvDVWrp3CEGsKw957hKHwqSz27?= =?us-ascii?Q?Rt1cpCwK1hhA3uwiDEFRz7i+6tdnG4julXFWSPG1AZOG9At7ttOEWAMtL0lW?= =?us-ascii?Q?4wl0QiyPW0wFMjdPb7ksjKydENQIx/+JXJ5nVnvNyD+?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2470;6:pUx+Y/+3+FWnX7GGHT3kUf/t4hYEo7/1bWIRkjV1BpOGBjIcoMnRIZIrWD0XE5SgMyUBqt193Z28QIpmpY8IyaC6B6tE9TWVMbeUCd7qJFkw7lpuHR5tXIZiLGXrmnonLygZz7niTdrmXOJMN6Eg9NSl+OSboueqFuNDZ4FePMNwxfnHiWiriANascgmmA1+tSQEnGhMF2k2bErolBaM+7D2YUVmhq6BEqmE6FD6whTksB7V9NIWidhDlquvLX9JJM17skjmWRyfOrdCmBK/KlymyKlK6GdJA/w9X4i0J+lgaI82e2zi+EZEsmzo7kPpVn7MuwrZTz/gFpZ+mBSOfZd2YKenxrQ7dpHBZ16FsHyh1kRvffXdvcvTPgRCmOEUHWqGKJ9dD/Dntot6T4sZnnVgUdsubdGN+TzHlNhE5JQE7Hms832wwFZv/xok30VT;5:O81SLLSFpyV2OrZtlsvCQ6EhcEiZ0sBAyqHTxxz4U7/xfNnYLJwOouVWsW5a2FnmAQF0QTfjpMF6wgBZ+fCaCQ74qX+o7w96wr2ueUK4c3WXPlo/KiAQ8/yVX3XhQixA1qwseg3uUlU88EvO8MyqPgiyGw/XxwPSF+t1YyEWee/golEeelqiQ3y9x4kDzOzz;24:KKhsCoEn6Ee7rN/JSncud0qkrA8jXniuOiVpC9ObWHmOu/wcE8Kd+e9pbEBN7M44E5AXi62BpOeLSiOIiJg60ULdJNRz3FFCWHqpytgXCEk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2470;7:fdVjoD+ZZV3WBxZiljqgUsnIWerwURR/HUxsF5xqaxMpqaYv0aT1puliW8FxW7iLTftSPpXFPbvL0Nab7jMm7mNc8r7laCh7iUdFWSIsXcZGEM3hXq3GdRZjFFKQQco5/nHvXJ4m3uVVbZ8myRh15cAZckcePB4WiG/bG38tmHllFgyE2/sRI+xYIRNjUsKOCbWpD5BslmMXvmXztRF7skryxIsAGgFBSt25iU3mcqKa5CPCFZaCa1eM1Pf4t6pWshXaK2i3H4Hotrmp0VvyQAm5r8LDwquxZqAl9vCI7T8m7l7jXTzwtMJOT5aHx5jFqbFaoHW+vK372jyKaNjZlRSYlKPGPmnejus0TRjwXaN2uEbOdxwsN8ttmtv+u3fNsibOgiwTFwCLISM6Tc9ZHblD/z0jOipAXPJ2W9rW64aHMhN9LNo0ciWwwYaNCfgpf3h8PihFhX3IYJIHRyJFFQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2016 13:11:45.3177 (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: CY4PR03MB2470 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 f36b4eb..93d6a36 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; -- 2.1.0