From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932629AbcLSUnF (ORCPT ); Mon, 19 Dec 2016 15:43:05 -0500 Received: from mail-by2nam03on0065.outbound.protection.outlook.com ([104.47.42.65]:35571 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932188AbcLSUm7 (ORCPT ); Mon, 19 Dec 2016 15:42:59 -0500 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; From: Madalin Bucur To: CC: , , , , Subject: [PATCH net v4 3/4] fsl/fman: A007273 only applies to PPC SoCs Date: Mon, 19 Dec 2016 22:42:45 +0200 Message-ID: <1482180166-10677-4-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1482180166-10677-1-git-send-email-madalin.bucur@nxp.com> References: <1482180166-10677-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131266537761727002;(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)(39380400002)(39400400002)(39450400003)(39850400002)(39860400002)(39410400002)(39840400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(68736007)(305945005)(626004)(85426001)(6666003)(356003)(6916009)(5660300001)(2950100002)(36756003)(8676002)(77096006)(8666005)(33646002)(43066003)(8936002)(48376002)(50466002)(81166006)(110136003)(189998001)(81156014)(5003940100001)(97736004)(50226002)(3450700001)(50986999)(2906002)(2351001)(106466001)(104016004)(4326007)(38730400001)(69596002)(47776003)(76176999)(105606002)(86362001)(53806999)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR0301MB0749;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD027;1:U1yzBTOVwDhGP2bs6VLaQ+fDL9VOdiWmhbNUKNQZ95JDxV14gW976kuA5vmfcF8nN8y2s7m6UZXsS41UbKOi6jscLCUQ8n479g132mh2vVzheQb4ZZxe2YfxJqgeNeTMQA1JmWkfhkQNF3gRUB2ADYzwbnH8p5Yp7USZs3YrlVJmq0AT7rYrjrIJAp3BWO4CsTtKwoaJOAl76WZclWeuy+blZeCx5tkOgzXlc3rLnYbUDlRfSOJYBb0PahF/746md2soU7eae5xRGYgMd7dWQaE3a60glLMM2e1xK0gVgm0mpxlWPRTpgnUQrrwqa1DNavSlHeUQ1dbQsDjWlxzcGv7Pmoy2DPHX8lteGny7TeABBfQ5+HEm5Q04Tal+5pGd9dJBbHC33tBoCgm7+fj+KKLE1l9lz0MjSK+J7V2XWRORzqZfYBfvZT2XyaTq81U3A7h8mlOYn9nC1BMaDsrS5myBMEO4W3wyTpM6blIW/G1zV7RieS4WnHhO2RuC6ixQlO94JToC2dkvqUdQhGExJIulBMiU/V5N978xsYdrneU3Eoolk4c7XsET5bXu/OqcXb/FBBhUSxxfNnv7We7a2gZ3U7cjvCToFN/+6kNpDJYhV968WaEMtaBYHIzl+vkz MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 481a5ac7-b7d2-49dd-e21a-08d4284f9ca5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0749;3:3OmOlvo6ftjWWiLcbs8ViLaz3U1YLaVzdLGKvM+a/RNtP88xuxgMCnxVwCkfPuP5+rT2RnE5ZoBuK/eCQNn8yi4zpmPhRBadS3MdhgzQKiV6JpduY4tq5yy7CGkVT+MT0OocFtqkK1/zzvb1MUSF5sOOc1KpZOngU2smby4Jt+xZWeoaUsarxvBW+FCRzisYHXxxtA9c1B4PrVzzXNLlwB6+2EJXnKhQMorVpTeAKgtMvElu+ks+Gz/fm4lj7tm9gVcQRDQNDkSkZpBiCbtQn+jFoM3qpTnB5pKNJM8UTnXp/jL1I2T+K1F6SOx8sz5h7a9RS59G3ldXVHG6UDyhCv11LaUyl3z4FJYdWyl5pV0dM8Q3nMo78uzho99GBdGF X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0749;25:2QEFdviO7UTgw0CSIKNb2oKyVO1xHM6i1miMZnSOeWrmnZgJnsTrCylk1GyUuL8BIe6FSkHrMws4s7sB1c3hATj8Yr1jvPF2dnfV3OYx1uJnTRbkgzMTHQ0MPIV5NaQppEW52MBsL7fDHmloHHjLVsvshy5ERIpswfhgpK3VtNt0wzcgxR5xr9FSsgecjjhT5poCveXLUbXC61QyonBSemf1TFvxJCqRNCp0JycqEHisMR4lrz06o6bHvBN2zKlRXFw1W6GgGFiwPm2umP8QhHz9x1d+5vKKkjLREXMpxyLHUtiN6RBBsuvfcZfVrLY2RN8xBWw/pO7iHznFt0QGkYJgsVcfVsRUMjWlvWOrA7uF1edzf5QGXJfqoU7jkGNCz7xuspn6+zfP/mbYHph9BVKAI7waQ9FO4j+u+9S19L2axjYaQADetaLqMhGfK5NXFQblpzzFbg4JsUC5aWct/DENCiFyHpPgVJpEqwO0Q0bow2qje7t7KeEaHh4qImXBQJ+/XPMeTj6P2TRWKnO7vK5kompJKfd7ZXngIcAXpdc5qjVOMyezXf51cjSyYa8R8MexuldDxlymYwjsbf68/u0LDEBi8EH0OUEbNlUCDgNDT/9Zj8fkWiX23+AFopELNWWTb7lkxtqmC7B/SZ5shI+9OKe/e14HYguxPPcYi6Bb4v4JqdZfXB8nWON249x8o3mPXw2WVw0kH/B3I/GW74m9+LITkEzNYLB/JJIxDdNXHc3S1xqBS0GBYvziJ0vl5cu5VCwtO+ratCyELVJxvQ== X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0749;31:+yDI+8Knpie5mgecWSWcbHyrjymsJerUoOEyIFZ64KP8eB6w4fosUmv+EkJEbnLr9zBE0Vh4sfciQYbrhxBpcn/nHBDazEq0+WngCQ78o4N7vPwvHl8suqlb1L7ziPvrLEwPHxHdiF4jbeIdBeZxyD/QOsp2fIxljDlzeDbdIHq9u94aneLKVkLOQE1gzzrWZu4HbFjb5dqvktw8OS8Xsu2/dneRx7fKhAnHeYWyjaZuyEfr7jbk3WkT3cMnM+tpCQ1tjuAoEjlUBkXGRrCHvQ== 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)(8121501046)(13018025)(5005006)(13015025)(13024025)(13023025)(13017025)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123565025)(20161123563025)(20161123559025)(20161123556025);SRVR:DM2PR0301MB0749;BCL:0;PCL:0;RULEID:(400006);SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0749;4:vTewP+sQMTxMZW0lQxqlX8K+FwGHRoN31xsNc7BhPxlACZlQHkvvjxhLhWcDgcgQzYv9aokRAyVYT3jC0UKtE0eqOxfY0lY4sDNxZCUh9ZGlj0BJCNVXiOiAieU/mZnbKrJzRMMx3nJmRWF4fuYV4gBfYVoTfu4x4Z9v8LCXSgqDwLZU02GvYDVawTQ+tqtvszbeLiojau3BAUpy+1bV9ZHe7+yLF43+AuIJyxi/8RqfmAsc0E8iMMjk9lEvf0xKULQFeFcNez9hmr2RJEjcPUERV6xDyvupYZs01lYaNzeAxZWMB1dp1Pdo//AQJQosHvoPXQpJZagRd4v8uOY/NB8w+8iUsKDN//xSfkchRg9xg3UBzARS1r5MpNUSxsIfB33EaTbzu7MioD+VqehGBiJkAUF8SC0cnLRW8grYsW+eF2MyOduMvYJvE9/UxeJ/oUqtS3JZ+3zY66AVCa64lXPRUMdiFgqLyTQ785TD7NiRUDyelsflQ4QoLCh1+faVF2NpEKqPQUlKCzE6VuQ592f0S8SiUtFEgIYnJLYrQl8TOH3CSfLxsiyolIc7M8iVKBRtaYqGhB5SXwmx0ZVK080LKTmdO8rjjO6IsXXLMQNedUv3Q9vog1D4+fuc9EqC8WkcYhUYtWb2m3Pin8Cj65gP/9sfA3xIi6lWjg3HfB/Y2Wmua3jMg1Av8vMMSvId5a24lglJsmclGhdDV69CJ0qoSFrq28Ln/BI0iXaJpz0a5xpizh6fVfBNdGf9uLwy X-Forefront-PRVS: 01613DFDC8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB0749;23:hQ+Y7v2dhU89PY1bvE95OLYaNmuqrpc/19NArxC?= =?us-ascii?Q?MVQkslWkc9IoZAEMpGOef+dy8yIhTRbMrrRJ0hVCLE4StQJhlolSTshQQ2/L?= =?us-ascii?Q?GIoqfwrwEqY+Ed9TE3pWKk429xFLxmiWYpQPXG/Gq7Hmogx/pTKcbJnMeXrq?= =?us-ascii?Q?G7l7ZecCmQr6o+oOd1xGdV5Qfd2C4k/wlKdwMc+P4snZMUE/lXGDPdba1DNz?= =?us-ascii?Q?aDD95BkjhaRgW0kpyYUvyaiSslZgU+HcIHCasduJANEZbHuHUhf9+ZjJJY4L?= =?us-ascii?Q?kd5ITWf0C1sFlXmZDbAgb/98vxs1Fdrc4qrjtxKeXGgfBy9rigkP8z/liLmO?= =?us-ascii?Q?X5sepyoPmPKxdqI8O+X03NXB+TtP++l37CCjS+0WCXPd+OEFcHzd6yzb94j0?= =?us-ascii?Q?IWvYEuMgG0x4rjBZLuGjYFq+0mwrV14LF4vXCNDak86+DRN80WW2ivFj+yYC?= =?us-ascii?Q?eOEm3qaFDyaOMl4zcj1LzA7LOY+JjWXA02Ve+oE8Z6ABq4nkYtbYe8YiiyU8?= =?us-ascii?Q?aNvAXfZO26cHPZQtQ2sfTUbtIc5bkfBCmBboXmRoiWr4a1VBAezqd29c51+F?= =?us-ascii?Q?ZWNAXKorDVO+VlnjsEVtUme0hHoWn6P4M8fSsvsIqczlBUL3AOo5pYG+TAqw?= =?us-ascii?Q?yvd8xsuh52oggekO5lH4RzB6g6v85OZke9kyCa5b7bt+g/kLBJedtrWHDtwR?= =?us-ascii?Q?An5i2qwgkalT16acM06zNyF36G2ROo3WzPtfI/YreRWKHgcAg07ltj3WgKOt?= =?us-ascii?Q?gKBmOsamiCf6b27mswkZtDH9XrMS+KKVdOqABgP4Jqhxm66D8GwS3+ZhY4lu?= =?us-ascii?Q?Lbx5ocPuvaOxrjA32dAUZQLPPH6PI+kDTSlDaTYhb6BEf4wu9cUJK83OEKLn?= =?us-ascii?Q?TcCg6oi4B/3oimcnPMzoSGLfVMU50SrmGJ6iCaPIIr2/QT75Y1xbtNgOY5aV?= =?us-ascii?Q?1hLfpqRMH8YPdo+81jKo2oHjXmngp4EWL6bVRcmmXFmjJXVnS8/wJCXhNUpl?= =?us-ascii?Q?UBr1nwciGp4AUR295/ChNUS3QXAoM0YaV1JHKmTXJHhmWVew1s/weWH7ugft?= =?us-ascii?Q?Gso9XL0JM8yovL9pmesdHapkniWwYZt7GLyEQSyDZVYMQpmaCVmUsoPiIDYx?= =?us-ascii?Q?2t1DmkHZevzH+TqYn/+N1620XTDlMvRHhaYNAfq2plbHi5P8IU4XILWndNGV?= =?us-ascii?Q?0qhndGeiadL/KUTgjr8mwMXkY6VTByKcfNT2IHCjbR2PaDbgvuVYxTXYK+kZ?= =?us-ascii?Q?iwtN5piwSFPd+LovM6ZnZmkHURbaVrOK+0e9VRxX22UhkBaFYwkUdRjjQDJJ?= =?us-ascii?Q?UzSD/kka7J543ZlA3PS+UIPgZSfuJltcN1H+CFaJCabzjFWBxhGTJ4nFeYLb?= =?us-ascii?Q?uJAbwN7/nkveKF5bYcJN0/eXHwaI=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0749;6:6wKKRw+2vU1TW3vXSvMYMnwD448iDWoJMC9W3p8kAtbH93w4DXauhWluHCWpkN3BDr0Hzd/7cHd6KiQ2zvyfMmH8XvDXS0vzJDAziPA5DRZBUM8J9POVFRUar0nrq1Oh23spGh9gbqpOxOLbA4H8cosLkTga2aIy0WG61+HKTuaZgvIcvyaQVylmy7XvjpIrXQB5sP6/endFZLNFHVk/GI57vwmlgEEwow5tgI/krUjYt7/G2rtM+CvW6dOY5lB4oF2WEQITiJlqsYm4MnEiP/TLu1dSOH7mRaz+UtpQlgxgQFBST767mm+UrK8nSyvoOE9xr6xN474LImaSs+UfnMSdgjiHDZvJpNSIlWSBJG+rhqT+lwiy2x8cvIEWildibPe/u1f9qA2U4p2Uu5ycxqA/NheIU/OGwAmSlpica79+9QYq0LWVOvEgyniJ6oWR;5:YvO2JyTWvYo5C0yaeSenqco2rAktpeW6PoAy1qPwfQ4uTf+G3HFFfW8BQ2o4rdX87kjPCkesL0Xjvm7wp6b8fI+jQAZOCYKghljSTZz7F5ljTB3tjKuS09qSHSquv4dyPslzowwR7qLoouXdhKdRCsxJrEE6yP4NpbLTLMS8pV95Tj1OV4F34KvLc8XE7da9;24:DtG1ZIXHxpICNncwMD9VXEIyRy5HgcoFvR9j7gZwUletRVE3GH/B43z6sqOYiqKeRAik9cOQRkh/9otOOMgDfdDwLe0GyFF13h1MFJfuzik= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0749;7:tShdb8AA/DDuiPdCKS6c5p2JecnlPCdTqhQE4GCeO2rGXXXENUvzgJH3MRfs9m7kE8LjFx4rKGZpJ/OrcjYSqTao9Z+c7hK4tbZJO9LMDJpfXOA1KcCOh8748SdISt1FiFUb4EAXk1hYqCtXEVeLV7nOUfnMuLQAGHtLLgKtxOUL0Lat9gPA1oruVW/KOK1WM81uzCcqeD0z4Tjp1yFyl1JNn+1ldNFc0cWqmfPTp4b0ovwAOQajESYYhhoW8sLCtL2hgdMqCLD/G8aL+Ng66ldVbTa/EXgIZF91IABP8G/N5r8mjyVPWln+Jqy5A5bY7CJoHf/uAACIzUFqykvOr0jWv9YkICVRiP8rzj6XkYKY7/WiYwgpClKClXw0YHd+qJEsU79w3xk8vDcg/JJy/8a3HdwnNutZY9jGOl963c3gMy9ZaUV08YYhu3N/pgJuXziRgm4Gc/0jILMejcrSvA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2016 20:42:55.6890 (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: DM2PR0301MB0749 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 4b83263..f60845f 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