From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755929AbcLSJXe (ORCPT ); Mon, 19 Dec 2016 04:23:34 -0500 Received: from mail-by2nam01on0087.outbound.protection.outlook.com ([104.47.34.87]:64592 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754620AbcLSJWr (ORCPT ); Mon, 19 Dec 2016 04:22:47 -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 v2 4/5] fsl/fman: A007273 only applies to PPC SoCs Date: Mon, 19 Dec 2016 11:22:22 +0200 Message-ID: <1482139343-8975-5-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1482139343-8975-1-git-send-email-madalin.bucur@nxp.com> References: <1482139343-8975-1-git-send-email-madalin.bucur@nxp.com> Reply-To: X-EOPAttributedMessage: 0 X-Matching-Connectors: 131266129652787167;(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)(336005)(7916002)(39840400002)(39860400002)(39410400002)(39380400002)(39450400003)(39400400002)(39850400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(3450700001)(81156014)(81166006)(2906002)(97736004)(104016004)(8676002)(626004)(43066003)(8936002)(5660300001)(48376002)(50466002)(33646002)(69596002)(50986999)(68736007)(4326007)(76176999)(189998001)(86362001)(53806999)(50226002)(36756003)(6666003)(8666005)(2351001)(85426001)(305945005)(5003940100001)(105606002)(356003)(77096006)(38730400001)(2950100002)(47776003)(110136003)(106466001)(6916009)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR0301MB0750;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD037;1:4y6PXjEzeBngbL78qwD5b4cZ4INOqAmKN+4sXPhGKspFWHVscz+Q6ENuPS5t9nd6O2QYX4o3j/vgW7eeiAnao7ZqF9U2g2vTJtaU/nwzfg+ZazK3ATsw8HJ6LLz8S/5Ql9sJRveGvq+nXfii8OSq/3Wj/AZDXwH5D5k9luskoTK6UoEP974RxsTOWsI9aRIvH0HklPRs67rjwbN/wwh/bxKY/2Ab05+iS7zGDgp3GexFr3BKQoD14rWiBxDQ4uAcAB2Grt0j8PHOGfpdYLFdCDarAYNshSmpPoltKweFgv08wK6Omr8cvfFTPqRnqEEjeJU9nW3D0ByOycJW+hZ5RkwwlP+wAf3avf2WcDV11KuChA2VfYqWBz44a0qLe+SARhkijQj00/bMypXE+4LEMZrn9du8wo7Bkb12LlKWCf2k/+doBizgjEXBjgadlgeCPCPbH0Vxv72RXv26Qvw3MIRs6g0aZ98v/9NCxQwm3Vz0B+Ak/CI6anQYxJ5+6vaM/yJeLNWUGJC0TP9BfLqsbkDb8NlrqCNt5NbppQlw3K98ASeG4CMh60/XkhCIc4wVL/jhXrI/Fm3elNNKNzQo1ysSMgctNmU+/bq4jxx0ZdmvkTP+MOIdjIalEF5A08Wk MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 9c762106-5cca-48bb-e51d-08d427f09770 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DM2PR0301MB0750; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0750;3:iwUZnAl5toegJCkb5uio/Mcd4LArH/4zKPrMooJ0o5OYWxe0qBeyHrlu+KOa94HbNO7c8J6h5UFLf7N3SDP1Sfhp4YpC8RRkBX1iNW1dkW+/qE4ou6Ia4Xo7Hi1FPwoE/B7jq6ZeehcX/i6wXTFrxHOUfckS0kZSJH0ZRvROXneP36FOMdP4HRxzmtv906HExIopDyHYdxbX0D1Nc54hEmWwwyYvuMR2bblLyfytoW+K7OpywHoYJ+gKJDLXW6l1xqmJkGvCUt10FlnvdMZW3XpkfvQBoy8d6BEOs9ie3FuGnWQ3LSb3wRH45EO8XVa2nIphj5JmYMp4BOUqw3LHYNhF6NZKfRbtn7Ln7ZA9AtCZY9PG2iMgajH2SY21Ix/T;25:AZ0zl9fadHlaw+ub5j6+NnurHtAXAeQkYzc5W1jg88J+Hmca33KlmvYkK03qcG1ekq50EhfYQzqgUL/9BVqoKWLTV7vHv8oK/+gIpJr/e9M1JlSAGhoU2CBt0Ov82ybDyyZ1Yp5+sM2U0xbCu17ljL1P1I1OplbQPDfytowxb7BGR389o078DdQUgwYeNWU3TkNQwn8r1D6okaTZ+tDrAd1rxRgpJTCTq0KHxFGcLlkLBiZcr9O3sz9z4/whv03Yw4X4Zd/tBNfvcP2EDNIgv7HYLArGoPfzTrrMgO8fgRdtrsCnYZJi2hNpK+6RXNqIUhPTJo2ZBk0yLdr8sWyc6oVAKlKaCHDqtY5Q+Ywcfqjx+tHS7Prlv7rHFIR2mZJxIXOchyW2SeBwP7q0E4lB8VQxbHjGQERINRSVm6BEFjKRg4rCKCNFtKmENvgkrzCyPdY1hpMF28dmrFNehqswKg== X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0750;31:gq9oYtqQpRcv0jgu0/ZcYCCYGwGQaV5GPI4iEf8snsJXghA3SVQ7cta3d32iJpZ1/L3J5PXZl7K1GR5e8ZKfkT5No0e/cpOcTx5lXLx4uru2SEpHL7ut24RYXsHwIu02W+gxqTbR3qPfxJpH4WAuoZ4UCYUEArpCLBY5kbm9dGI6esRJcyg4K+O8Pzbv9BEMfxbfvqBSpmFwEgO884xxkccJ8kz/yfjj3MN/LqtIFRXMJp6D/aixHAo3LkxsEoRpfA1zwmNFdmOR/eVBr25486/JcS92P2RQwab/iQ9ysDg= 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)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123559025)(20161123563025)(20161123565025)(20161123561025);SRVR:DM2PR0301MB0750;BCL:0;PCL:0;RULEID:(400006);SRVR:DM2PR0301MB0750; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0750;4:MKO83OsJltwooFZR3aXwJAjYJZCpryvwkMUTiUrwoZWIkL6lLbJXB9Ktk1lVHVquSW6YURLpW1f+Ru1hOQ19KdtO/HYU7qNVBQF/86jGVH4Ic3drBWs0YqJJeZKqiv3I3teYy93Ye1DD2HfzFx75oZK4k73LnoezEjAmEKCNw8uFONQimvVdMCUHZha5DsDKrfxTzb/z7gKo0BitG7FIOpg84DbXlLdtwZ2+SnB87EUQT0vU5lu4rvS1dMf4Ecv+9aeLhAK0QP3rmlr9kAXVA8QEzMiovgp9xNnjlA38YfwJIMTQRxsgpP417AlyDMdZuyP7NK2eMxs1Z+n6JDTOz0E+qBSk6BjnDGhfiNT1W8BCTpXeI2PTn9MDHVNgJK5WDoweJloapFTvnTmDuBZJbMwBmt41jzjDBlnImovQdShZOJDbu1ghUVoBvXfqTYrdakX86SRKEOezLBVfXRhkR3gx3tZK7UXSzt1Oyl1scQuvkKc2+UobLPVEo9vdrRYcHrpWTlEtfiVskGZH7Xxcre/e8Lbd6Feb03COk1igP9sIbA8uI6L1HB0FaWwGyxqJEeypuZYwQZtBKfuegF20hw3zTJ9RGjH7eAynPR/HLtP0Lz2oV1cehymRLcn8Uzxh9Yj+utl1SSERrObYc4c76oPf9FE0pKSNqNbEP1tAlDd8Nu3C+IiOYzX7QWERuJ3SDB/VTsP21sVsFZ9c45s4jAJskITTqfLJlVY0go3Q1Rt5KqbU/KaF1rwPtQR3JyFD X-Forefront-PRVS: 01613DFDC8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB0750;23:pYH58OWTvb4VyAeL7JUmg+XvrRoHSxxMvAhj8n/?= =?us-ascii?Q?yvUB9yQBKetHzh1hctKRI6BlL6hD7xykba2NOjWaBryFmbj0f+9n9WQD9MK5?= =?us-ascii?Q?eRbeOREJN7kM167sti/CsaDwaHovDKw4NImkrPywH6qycUhsEd+ATQc9QEON?= =?us-ascii?Q?rGUzL3VA0KcFLX8dqFFACBttCIUidIv54IuFBECdzhKMUk6bU9cw9h3FjV1S?= =?us-ascii?Q?CVo0TREp5aWsrZrfJEe5k9cCJVMtFAh4UM6NZ4wD5mSqdXv3Nl5XotakZayg?= =?us-ascii?Q?a7EE6d6ynVu26xee70HoSo+a181jvQqcE1HM9ujbOGqPYSlr0SvQceX57YoW?= =?us-ascii?Q?3Y9n7Tf8Je2+ibY8sYjYRPJk/MGxewvGirVAGT+LsLBxMacboDgSm42Xhr0T?= =?us-ascii?Q?gBfIUXu6Q/t5KRYaBEN1sFlcN4NZv9LZjdi2H/cyoWCQmT4U6rGadH13ixL1?= =?us-ascii?Q?v0MLnIpJPNYZbaTZL3NjAjjfJq8qeJXduV+clj0Dg3RCWVGte2/k5qz1cMYN?= =?us-ascii?Q?Vt5S0e6rT3hdwOD4dpsjf4piSqh8IXgqAz0qeshiusnZeElGyv/YC7xJC/kR?= =?us-ascii?Q?FMg2OdFDymRMCOk7w/i22jfsFEZAKBK26ro1triWwCTYlf6NNWBrxRlI2QKe?= =?us-ascii?Q?fqvBlZbUGEeJg7qxiSueaWKq7hTS62UNHY8qQWkYXxPSSS24VX11uX2WaJ3T?= =?us-ascii?Q?CJIH1d6ZK3bSEOLa4NOzFtUCcKgT5vmpxz6BfV7vXVd2PuuNXxtYC/v6B6sy?= =?us-ascii?Q?x0DxnJqLIkVox2MstAfWPIwYRlR3hh0/UTkq/Y7SM8rw7JoLf2LfjT0j1awX?= =?us-ascii?Q?i7STrAO3Il2A/Vgg8SS1BiwLKmgdFLLHja8B997rxzwNLO2+Di0+5dKJjoSG?= =?us-ascii?Q?OICFJd2NWeQBkMuA41WG0DitedLAtAydsJCMNYIDN0n63Pfd+/T7lfE5kNTp?= =?us-ascii?Q?AXy464gaXoa3bB3Oc9y6vGvzS2MB3IDMRuCiETX+5rMa0Mz9+Bv3zsWmxfOI?= =?us-ascii?Q?Rt2MK137hA7CNibHCJbBKA6LxXJJ7tLbEjn74fZejkCIVdegMyQT6smJ4zlm?= =?us-ascii?Q?Rr4RGeLvTkta4M50bZGjz5zUJIXOdM75pWPNYx+32JyNh86zR+mP8y9L+zH9?= =?us-ascii?Q?Y2dvWpik6l9oRhaCe+Oy3vNLIgwDyy+1MiWYKYani+PguOfsauS6PDl0QTsy?= =?us-ascii?Q?ck4wcPGgabwjUc3Gh4hbqjagqJ+OKFYVE4RV1a/k/ZnUhuaP7jEK+PdTkkID?= =?us-ascii?Q?4e1snH5iRUU6+Mjtot7GcN+I+QVUMpZd506CvBfL8so8KBA9sYysmiHbEcj1?= =?us-ascii?Q?TEgfNFiVVAWKfqDQMpkAwRVjXnH48TTPnaYoeHQqUO49JBPQ6RWvmDNgBFWF?= =?us-ascii?Q?DgX7ais00BXSeB6VUmoe2wCuyT+E=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0750;6:AHaNEyiY3UyDG/i08UbRj1XzVBGudHSBB5LR8DAEVZp+b7k0PGcpT5ll1ft7r6VTEfAUSHbRDbcr1mC5tiEWXKCu4/wCbkelBGb2fWg3ckdq68yQHeZq+rQkLRi6Tv+wJCXiRJxfNCq2NokdbTMwB20sj5Zbap0RHMTNhBHZj9WqZvpFh+8igpDxYQHJgxxIfhYhPCpOjai5JdkaSxm2H1R7vmrVN6bKsVrddMdIh9A7EV2mwjnUkPCkCV0oQMV6i34urLZsOFj5Jb/t5rheAB26hClTcLZgvwCN4aU3kPTP9QEJZhDcfyGwGU6ENN5V8JJL4soFsSTRHMaVe6uYz1C0gF/cP2jUy7eUnycQ7Qau4G1rypmKRDv6XDkgUVrdgIzkCQMn1A4x8SaqEw5clcW9u1lcRHUuQBlY0tzddfFGZvLAg0kdYnpNnBHioT2G;5:LI3zzB//LPhH6TgLQbUIOvHHvLIsYzRkGW8M/D+HlDIYfrbWUNpfiE+CuZcV4NDSkTXiKNKYPKIuguohLFkdNcGM/RvyLWrS3Y28wYqGstvXlNluFNrG+QXkTX4SBFDsa8bCvwQvUQxwhgOFhLQvPW3t99JWfegZHcvegJQUKwhhM51E6RQUF0GbkU2uYgoQ;24:UpDSYlCbR/17apiZFWG4S4hwfc8NpAQf8ar2eRxEl30T1vc+5jxO8NkaCwWqfzQukzUmRg5Fud6nxeMQpC2KHKdZUo7pa/KuOi1cux82UKU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0750;7:95UNTmzkQG5iYIchqo8QTA06AuzMWmtTiBQrW+yUdRNU+DUE9B96PjkBDEV86i0UxeBicNunZ/1IjWHJPmsOz9FIihBZveE+dgthUAg+pUSn0KPRQsbtmFnOa+oNq06R3fuJrcyJtwySyflgoEnIPY2He5MBH2UH2HCUYPcjdpxeDkCIAkaoI0oifv5jHK+pcBr2X/u5tt/xlJG8FAREMcNhLkAHocCXsDDSfGpjTiPDBX4tXeP7Upsw6MAZUL7RxtSZdwI8p1LDjq0VgF6rgfs9draNKQky4wT8Ls0WZxo3nnnvTE2bBODNLAH2l0K9Ku521VpNUflSxy9rHhGjFwpMKMjgwvJLrI4dleGSOVSERQFMkXssxTpdX8VNbbFU3mMhUvszKeSp35nUTbOIZhrp/XBMRnpjkNSlcL/xQYftzXaKuAOC/iQJC8v8ntJdyrkiaX05JU4O2Roi+S7JHA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2016 09:22:45.0291 (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: DM2PR0301MB0750 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 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; -- 2.1.0