From patchwork Sat Mar 10 01:19:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 884065 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="nlPcY4Qf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zymbl6L0Jz9sl7 for ; Sat, 10 Mar 2018 12:18:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 13FF2C21C27; Sat, 10 Mar 2018 01:18:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EB4F4C21D8E; Sat, 10 Mar 2018 01:18:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 69514C21C27; Sat, 10 Mar 2018 01:18:32 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30069.outbound.protection.outlook.com [40.107.3.69]) by lists.denx.de (Postfix) with ESMTPS id DA8A1C21D83 for ; Sat, 10 Mar 2018 01:18:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=MnREdweLlf3wHn2BGUkCpGddWrqoZ6X1N1c364mP4mk=; b=nlPcY4QfUE+L4SdVr2yoXi2uxhqfW+c+h4GD4IgPr+Hr5ryih1CnqkVN0nJoYKhMMelrCPKKrHamSJSyq7/zGsrS2aJqd3mdpqzs+X9jp4DrMN75Uf4GAIqy78O+zbXXyj7BN1Acp6+V05n1wFHUZzitV/vej3tafLtd5Ml5Yio= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Sat, 10 Mar 2018 01:18:29 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Sat, 10 Mar 2018 09:19:53 +0800 Message-Id: <20180310011957.21801-1-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::32) To VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 778230e4-0ac2-4ba9-2059-08d58624d5cd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3231; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 3:dHar9NGRXIVLs1XIY+UOVygp3dBFsRGOFOKUAUzng9YTyH+Dlwxr8tlhuW2cbumZULkL+8UI908hn3WgR1EDefwcNQAP7AhUpeIQz5SY9PT+gFrsffWIQcUG1MariGxyvwFEdKVcxj6k04D4sezJPpsZidaCO7tSDHdfY63wPMUCpqYpyDFeykRQqZK6ZDRKmX7BLlkscWlnLVPn9jWL+gruaXQK3GSZlOyqZLalWHAqcTRGb/HgwUyc4kEJlz8x; 25:e4X5hHZRDTNUEUCNEOaffqF7MY7H1WIqdoY7vD0+aHrEd8MaGL6/5pqjk/v6kTPBiCVXjQPIGg0QHp2l18Winy3n2MmGJw0LPFFDy8GnLk1ACdWrADOCckF79FHJRBqo+s/3j3WpyvTSobx9cHf6FjCyOIFWlh4VrwnLr0KBX8qqx+6KExGybXb8makgKxI+rbD/d5mILMDz5P6b3DBwik+h8pRIHa3/eE5UiImmA5Bl9Kju7BxWUdet0e28r7mFMqFxWp07zwYWhWuZ2DPLy8P2r7jBmOaSx+vQi79vtH0rpVEV1x8JmsFUQlyQoVXA/ZJYqRtmeaLuRHuUVCvAGw==; 31:Yl71U59bkooqmcG9Aa9a6h+l/hHBafyOhAZFQzj0YeFR/etHNopACvrblsfv8wFcDOt/DE8m9kW0otgDtptrgE6MOm+FnkNf5GZ05KOYD76vjUQTJK5A4oY25rIcHvWL1doT642Ygpf6GHoIUt9hHnrgEGdOUTApQ1oo3KIuwnzQSSBz7s1JS9k/F4Vtk/Q/EA8oqeWd3RTS1j6pDjfpvs6aPUCPMRGYsRpABg14uQE= X-MS-TrafficTypeDiagnostic: VI1PR04MB3231: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 20:J/4iDC6Hv4A+YLUuq6+0Kzkloj65WPwlP12ioEZtCEJjO7OedwlVExo/ZMeP7aPpff/MbqSGyDbbOLHQnuSOah3npXSMGZx9BE6hm5LhD1aVjKrKXdFEj4qrTdSypGIY04QDwvTYn9BmDBjGp7jCGJ5M7qrywoXUnTRlGcNVY//wVkyXkgRAeBKAt/shkL3H9Toj3Wh48uAmj1wM8Strw4M/4Ct34NZYONHzV9LNZtbb2tMu9JrXkqrd+W9if1X/5Bgf3DxdgvUyo48IDqNvYrYuTfcYt/jXpGcZ+1VarVrih0t1/KuN/1mQ+k4GLEPuo23leg4+EINUWpPmzcG4uC7W/Jz+QYLCHlz+csR0B3fk6MyR0YFQ5IcFM+pS8taVgEhk0jP0BmrA1UoqmO7G1kkfAYZC9OCITllnL4FQLIdPtH3+SGpn906cw/Vc7VnymXRL1VQYOJ8d2sB5SSGlpjxOeBb9Kk2BEvKIA7uLk6CewVRo4dBSIWTF08bOK3G+; 4:8xt8XMiA6H8wk1tI1hkwRdKVYlI4E6d6VUWaoMYm7ldzrIu5rWekDuSv8lRo1wPBVCSQEEtUCVT/4npgwFkYlJz6q7DRF75nIeIRzcOmmQRZu5AeWqt635XBHBMRXCLlJukM0L3bvOHsTavSMDWnJ1ChU1jSAMYEqfRySb7KOIjBDIfWoOMt9miovBgCD25Xpysvx4P8Dq0Hzu3GCjIxFsSgDAQCZID2Bz698gTL8pvG45JhLIKtFWJp/vH3XzZCQPMhPKRmaFBHMGJxsA850wERb4+XoBshVCWJ7pS3qBjzw3bGmLaIpidwigNYY+1q X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231220)(944501244)(52105095)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB3231; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB3231; X-Forefront-PRVS: 06070568C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39380400002)(366004)(39860400002)(199004)(189003)(186003)(316002)(6512007)(105586002)(97736004)(6506007)(386003)(8936002)(16526019)(86362001)(68736007)(5660300001)(48376002)(39060400002)(50226002)(478600001)(81156014)(305945005)(8676002)(2361001)(51416003)(26005)(2906002)(52116002)(106356001)(6916009)(6666003)(66066001)(2351001)(36756003)(7736002)(53936002)(1076002)(6116002)(3846002)(50466002)(4326008)(16586007)(81166006)(6486002)(47776003)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3231; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3231; 23:ydEjms1JitjEglVwikdDZN9HLlP9HwXPFHY/obTdV?= l9u3J5cEsr6xI8XIExnXldVbDyaKBNj0ACaC3zN6nNEtmc/O/1baqCkX3GYzdSMQ26aQs0nh7fYoxJoe4Wvew747qkUFkqvz1aCG4Blqvpcmm9LPB/BbFHMS/l31AN1RbtOuR0ToYiKusMZ0fwcSYTzkbd9UwtGrAK+2/NOycsVR3XDAt+9L3uI1JOo+2wLQ0qswUJxCjdHDytOrnu6OHX1EmdDhIc4x9KPAoncu1sMgoRPl3Vw/s02nCgcAvCV73fUdAM96FSGAhA9w+JKuCDOLQdhWwzL7iXkh5UG3HJhGbejc7cF/6oghdemqapCXyXTnqtxFkldMYL4sioxsbY/N7kseBwEcpWytc6fEX4zKufpBoKH0d2GE55qVIEegY8ZAN1dR4SR3TF7XdfbtW4dQuLR+cwA1/h7fxT2y+y1Wm2+1wpHGDb9ZbYOmCBP/E08I/EISlZJ0T9/HKnmUMZ13oKzvTYsnFiE9HgzmC+JeFsLR5/dNU2JfnS4rpTfTwJVYIhCzk9m00J5AHq3cLx9oMBodMsRtS2pdwRebtxjj+Un8BK5w7g/m3f/uZL9JGucQSdHim6xNSpIJ5uatRm6yPAYe4W3vii6S4IXhhTKOThoh/y6bcRkEhtnGz9eWQRPiVAv50RCYBaz5X84OiI/eF/0sL7I0Rs/AB6vopgCnzpVmVOI8q2laKlv1qENH1hexc97HH2mxu7xLOM4S+yqCEBcI+XhVtFPs/qa7M5w+7OFpPwaGem2qQIUvRGqdg3HH2Vv4J1EooApcrunDTBSa+aPOWm7ihdWq1MNbD7XsUfO9U6LdFIE1Urwbh7di6H2oRpLfuOr1Qo0zr0a+h5N1cTrWWt/s25eN9Fz0eyzlidxng9WMoKvprCVJrEdIl9flBnHAzsNl5KuU2/PH3UeAz5k/P/Vhlz++O9nsTvW2GZidovJAdooSmQCG2Gxnehem4lmVSPB9wkc/wHiemrLr/T2bLaxGYY4PJoJsrKu55GNdYRwT74u0d6+hrOYaNcRbBy7sD7N7wdmK06/yruh8gTRLT2/f5NTLw/ZiBf4UoxVTeJhS8lepLzsL3NZ1YiaZIoC4o0oBzroAneCr6f5 X-Microsoft-Antispam-Message-Info: 5ptOkACoWf+frEdLQJlAAagaVL7e1xC+v65B1IystXT7oJYEazc7i6fshcZQHiLs6pZPO4eYe14q/GXSVU/YVvoS3MP/w+TuW//RMQVEGQbvJkWRbWZ77pegeGCTFcxilM8fyVhWH2WoqMjW92I4NXrZVbFcO8YnLEhyR3Be+ObwzKhNEQPFDjRSE9E90hNd X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 6:UoEpawvLJR5xWByTrSj+1tkQDTJf+4EbJKhj5Iakh5XbkaYt5zO0DBuu05ByLqe3r9FwjM+Ej1ZiRghYaB01hJjrok5DT4/s0NGrTrfXKH6NL2ASTrkWykUnjQrrjW35PpNVkUVgB4C2ZqdDyzWBXA3dgcsgMFbHwsR5UF/tejjHBOFEScZS9ASahJL0Bg0U0mIKJ7x5npaLlXv3ur62X9YI8IOT3upzcrc/riHPZI8bhrlTfnNXAg5RkpyfDbkm1mKQG/WENiyWYHzkoiOyPHup6sT0Kj1qrtsCyA3EX3iUSnA46edcKrLKV/3UDIawsvD3BnhPsxuQLe/0EQN4Q3fWvEnq+6buxfXadJ5EMc0=; 5:2e79RjL4xzOUAp76dg6vveizi2zfTSFYOVB5voTmiYV4dRgQw9g+oqvO8G0hnTH8fpw6QO0HobuDqrIfJ5Juo9MHrGsnw3KIBmmGUbBcEKWkqiPehBm5OzLl7DM0AosXfiU1iPIDcautss0Bcpeg4y5Rdgh38PiqreBlgGvORuA=; 24:FUwXgtMORgHmegvupvBW7zFQiju8xs06o7AbMiJVJRaUpl2173KnenguCL58mCEurS1dCyo7oeJRDFjrB9ZQMtwe/65RV2rnSbwyqmPruNY=; 7:N/Vzq3rB8XQtKQpjOJVdal4sPirjqbQicFRWDyjJ+Hg5v2jx017VRBO94lysUGh/MPaiEo2zChUvvm+KGtmjZzok9c3HodZUdrodUtqV3gwTLsinE0lUQcC9TXMBCcwdmgKBxtK3OkSHYwwXjeuEIcG4Zx+wigciZa8oY3toJBhp1oHAjlX+xZhEcKOpbhk8hnbK/elV6wu8BnHWEXBxk20UF6n1Kd6Pj70ZtKYZswPJ45y36NAn2SAwFxH/cY89 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2018 01:18:29.1727 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 778230e4-0ac2-4ba9-2059-08d58624d5cd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3231 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/5] net: fec_mxc: Fix DM driver issue in recv X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Ye Li When using ethernet DM driver, the recv interface has a change with non-DM interface, that driver needs to set the packet pointer and provide it to upper layer to process. In fec driver, the fecmxc_recv functions does not handle the packet pointer parameter. This may cause crash in upper layer processing because the packet pointer is not set. This patch allocates a buffer for the packet pointer and free it through free_pkt interface. Signed-off-by: Ye Li Reviewed-by: Peng Fan Acked-by: Joe Hershberger --- drivers/net/fec_mxc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index ff7ad91116..7c396d8d95 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -806,7 +806,16 @@ static int fec_recv(struct eth_device *dev) uint16_t bd_status; ulong addr, size, end; int i; + +#ifdef CONFIG_DM_ETH + *packetp = memalign(ARCH_DMA_MINALIGN, FEC_MAX_PKT_SIZE); + if (*packetp == 0) { + printf("%s: error allocating packetp\n", __func__); + return -ENOMEM; + } +#else ALLOC_CACHE_ALIGN_BUFFER(uchar, buff, FEC_MAX_PKT_SIZE); +#endif /* Check if any critical events have happened */ ievent = readl(&fec->eth->ievent); @@ -882,8 +891,13 @@ static int fec_recv(struct eth_device *dev) #ifdef CONFIG_FEC_MXC_SWAP_PACKET swap_packet((uint32_t *)addr, frame_length); #endif + +#ifdef CONFIG_DM_ETH + memcpy(*packetp, (char *)addr, frame_length); +#else memcpy(buff, (char *)addr, frame_length); net_process_received_packet(buff, frame_length); +#endif len = frame_length; } else { if (bd_status & FEC_RBD_ERR) @@ -917,6 +931,16 @@ static int fec_recv(struct eth_device *dev) return len; } +static int fecmxc_free_pkt(struct udevice *dev, uchar *packet, int length) +{ +#ifdef CONFIG_DM_ETH + if (packet) + free(packet); +#endif + + return 0; +} + static void fec_set_dev_name(char *dest, int dev_id) { sprintf(dest, (dev_id == -1) ? "FEC" : "FEC%i", dev_id); @@ -1205,6 +1229,7 @@ static const struct eth_ops fecmxc_ops = { .start = fecmxc_init, .send = fecmxc_send, .recv = fecmxc_recv, + .free_pkt = fecmxc_free_pkt, .stop = fecmxc_halt, .write_hwaddr = fecmxc_set_hwaddr, .read_rom_hwaddr = fecmxc_read_rom_hwaddr, From patchwork Sat Mar 10 01:19:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 884066 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="fUdlAZXm"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zymd40KXVz9sl7 for ; Sat, 10 Mar 2018 12:19:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AC54AC21DED; Sat, 10 Mar 2018 01:18:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9DA97C21E07; Sat, 10 Mar 2018 01:18:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7A88BC21DF3; Sat, 10 Mar 2018 01:18:35 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30041.outbound.protection.outlook.com [40.107.3.41]) by lists.denx.de (Postfix) with ESMTPS id B60AFC21C27 for ; Sat, 10 Mar 2018 01:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=cpamEhKuguxz0akXtmGhYP/9CW80WC0msshfHz0THi8=; b=fUdlAZXme19XM9Fz75aOhNkkbfiu0u4nGsh0UUYBqWx7eIU5b/Vesf4Ed/Dy/4mTyIB4N4l/5pIPIjbm10Q8GURxedFl7Pb5Q75wCneL9Af0bP5IG+p58M2zTXEs6gKIyK/xLr9TmZjWiWmFLr9Gr8WxHWpkcIW88+yyUpRTzO8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Sat, 10 Mar 2018 01:18:31 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Sat, 10 Mar 2018 09:19:54 +0800 Message-Id: <20180310011957.21801-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180310011957.21801-1-peng.fan@nxp.com> References: <20180310011957.21801-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::32) To VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b60c6fb2-20ef-4c6f-4d2d-08d58624d71d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3231; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 3:BHOZL+4dp1S+tcttc0A6iiLUzZpNnAqS88quzElis/AqpryP+KD4VUMlekKC9ii1vfONckUpchs6Cn2TLGdbIdsWnMz8MsiVTMJ5kYR7dkRhPflhVdKDE7HNXO/WqmyV8ZPGHs7pmQE/rsd/auIRrieqV6LJq2utLbS1X8lXhqOD5DiTXsVMUelrQBZykd6PbSgZurTOurqKGZmPJvfWWVHtN9MEWGI+LeiihZk55jgX4bkEQ3qYvi+rMduqcpwJ; 25:jJZyr6ru3A2Xeaq6slThqQd+F1Oo0zNu3awTtAab8AaWkpGk245HMYmY6KDYWoJviStGnevO1ZHQ49lx2cBo05mwisnHeccpVv2azvABhmzuYms31PydOgbW6o6cwJJ7OEByTL8BD4/VHqTyS52MVH/tsdNi7+3hYNj8wR60New3m+rFmDR4qRu+rv0gO136zadRZ6KdcQOXmAX+WiCwEwtTg79yZs9XiCkpsfNblGbjwQYYYV7JT6JXXzxma/rJuoP45BAnok2/Rw/9uEcO3Vo5HcaQx5a2yjJ6nS/pBEdOvJAdUvleDACINcHZP6mg9RNCwllPhVptID4UPrU1uw==; 31:R4R0cuWutpAfeGpCJyVO0CEMWDRUVcKdCQg8pV14mkHj7JnFpBD2hIb4xsqivI50gFFWx8HlrMOwYAOiAT8JpCgDiMMitWtz5tMRWqOfN04SIS6cTgEga8Yy5LjG5qYk4BLyOeFGemEUOoB4sTEYQIDM90Np7hkLBn6HnSOiWD3Tn8lyU39LzffSKXm4kc9PIKuHYRXdxomejdIrk8EiXFvvKD5njdSp8hNH2A6az64= X-MS-TrafficTypeDiagnostic: VI1PR04MB3231: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 20:m3MkPAqSYPSEOJsMszv5pNF4at9pd1/8+sA7ez8C8NcH0PgYfKXDy8FlnHUUh82yYLI9c2MfbtQZd0vbFpRe1PTVWwt6FvXqZ2sTBDdNEXTXAKI4LylywGdUZy2ljFcO6+KGbM2Q9bVuiQj7VClC6wsVi6nvRabqMoDxOXxSyyGkFM7en5flK5kGO9bVOpXY6xsdvCrIAnYwCfhWPLWMawNXr6BkfKFNem3E9ibfdgCwX1dlOjyz0ZpwOgkjmESF/xhh+9B8dHC5b25vNFiH4lZxXJvVX1isbyrDODHsCm/iYCf4zFwFdiaQER/0qFqc1xdDrX70Os6Hw679i++SFib7iAVvwergaOS7JFcGVe8mBp1U+S2EYYrQchuNfkuaA5MOpqSXViq8AEw2OiGweNuPlvdnfl8x3c5pSitqwgnv/tSKlv+2+29PWcg/0HEVIKr6n/TztaExa+Lo2G6E6APKogARP8W3jXRbSa9HygFGEjZppjcxXaCeRfn0J4vU; 4:DZYKGdS6uWfof41/0cSJJmEdfWCK5f2+SdYUQjFdxIGMVfvSRnZ82B5V70eEXO8F0Splebt5XEOoQJU4FrelL7Wk8xqAIrvuqmRWR/pYkpI/16S2Lm8kEdbXNvIOg5XHYBftNsZSVK/17FCv41FGlj4SKsih2ceBT8X2ipq+QgSObIdvASjfRXr2BTi2aqfTcGZrIEmJyK3ycxJ2eJnv8QqEihRcOLwllO//VdUqLCzW0siBnK/Eger7F+PwvzXn2Q+M5Y//zSLT3QM05k80IO+s5zJxnkdkj/wphg/+Xl0CV5HIUtp5lf6dbuyrqmOh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231220)(944501244)(52105095)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB3231; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB3231; X-Forefront-PRVS: 06070568C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39380400002)(366004)(39860400002)(199004)(189003)(186003)(316002)(6512007)(105586002)(97736004)(6506007)(386003)(8936002)(16526019)(86362001)(68736007)(5660300001)(48376002)(39060400002)(50226002)(478600001)(81156014)(305945005)(8676002)(2361001)(51416003)(26005)(2906002)(52116002)(106356001)(2950100002)(6916009)(6666003)(66066001)(2351001)(36756003)(7736002)(53936002)(1076002)(6116002)(3846002)(50466002)(4326008)(76176011)(16586007)(81166006)(6486002)(47776003)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3231; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3231; 23:kKd/bf3K09P5UCcFAYAPGmv1URXR/uqLHWculbm7c?= bCEdHlG826kzB2B0Wyof87WJfWCBzUMECTj3T2xqNBqjb7rUE098gc+qbfXGzdAjZIcAUa0MiJtgx7ifYhkwrLIOhiULM8G3pjloRFhugWX8mNQjmekMmFvgsjN5pJh6U4LPxbMAKfSHmZ/r4PQned92KLvlg2nZvv523N1aYpaSOZrL20X9Nk8EkaZF4Y6wqI7d4Fa1cQ/oAgYliv+YUFja6UIL7Sh2tgSh5ZRIL/7EauyUT2I4anG4fOGHYLPZgiMzcDJPYAUXprGiwOY6PADs66dYsixmZCT6lAgLpsaWjVnZCCJQb2747yenMk1Xb/cGrBIvw6l59Ncf3P5yWbydW+AcV9URXGNFhfT6xdvbj1WrS67IwUrOnEasJsKp8vNkA2ldeCak8WQlLKMuPV4X46Y9KWlFsnmBo7HGPilU1CFmti8lcdHusJQ+xw1Ln2/yc8NKQBSsV9gJB955Ctld2OMYO9xuPB8p3lGO5IPN7d55/+GPwNJm5KtR6LOEBc8dSITRXx4bMJ0yLD33Y7bGmmDI2umgZA9f7c+0swCTBnyIqwVgKcdr/Q8s4RYm1I6oXEDG53WJeRrGuIerhDSNPWjhUkJvKKY2PnRLxwBsw4iOmp/AyqPd6kRtfSo6dQh2mq01stfqWLaFLYx5bdCdYbF3Z/R3n36Cu+cO6oYTIju53HXad3KzbmV6T5NN8e8KFSfOtAd0Xos7dBmtnjsjtclm+ZrAU1LdUQfXdq6Ouv+oY9AlSMvpUP/TMs9dgp+qpl6FHWn/BQzuwMogeCYnlE4W34fy0W7UvMdYw53NnfejtbkYgviVxcTFISC7Eg68FekY0Lfvza2v4ALLJzgSecmKxpzONuvfwrqg6WkluEzBrOVT63n2+9N18Ip6TfRYodlPr8VdsaDdHSqcgpHGZyXvAGhOxkNUg/EQNjnEWDdjirJlOZND7fe49MB4Y5t2Z7ZgMbn3ObevNaDHZ91xFuizNlqO4fGQT4Tb4yx4YwdD4S8H7QugPCerBh4DHsbatqFl3uviQFuQB/2TBhZkQSSFt1VvP918uIN1FEkzX/D5tRWVOpEkIQqHe6r+hbS++DT0s97oiYQ/29ZrB1j4wt4wviknZDL47eGe8gAmB/oGxK3Q8ac5zWQ1G1QrLE= X-Microsoft-Antispam-Message-Info: Lr+g4jGEv51t7I/ENfx6dlxweVKKoEID9ws5t7WNGsSDxqCakk5MD/RnsFc/Bqmfoj9XvNPT25eRhE7w+6+EqiAGJcCkrIQH8zJZjd/AMMwurknrD/8MXf+9v3yVFVD9Qqx8nh3ZBdO1ZYTlhyWgbF698g7u7brdTIsVyHzUyZ0iyP4GxOPYJho1VqMj7Z+d X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 6:BNh+vT2sGeOGqyGJGcwdmjTu0sdfl4qivMDg/jM6tufwhWsxgjLB25Srgv2e/4i7F3zTCpByBGaOsbNlCXZJZnA7Q3XSZObLKn6wtsYeNHEE0FDU6s3TpvYZNHVjDQ87p6xjruPjLzgQPaSsphI+Mmaqd3GNamkx9lzlbD1+BBM56m6vNQjHOY2FGCWZFJrJENAKOASzCkW68chQFyqYj+ImAdJOMuXTDWLzEXQZwOKUbC4/VvOk8frYnifIJML/vOHjppXsp1b4zsEtqLO9fswMr3iJWCQHM9s+fBuyzTGuJr7nQDjrPD0PSlAFVsTSLUM2DgSyQPrQ3vA94YxQ3Zh3owOURS1pGc4jbAET8jc=; 5:CCJKJqK9KW/Xt/FShWwmr7/zXK9TjQDzdIMqMqJIV9YfLq4z1UT2PQSVS7QrlR18BLwqK1ToWaTip+SmdkSpsEbZ+qI7Vjr+uDjAGiDLY4RubUvvEjF3iKN48tuobEKptWjalUjpCv3hAyTgEPH4kkx+bzPvua54UhAGo1YoVh4=; 24:ttNDuTPSijhRn0Dfy1Ag18LmbMNmyrBkMOTTsq+k6oOlJvjINgdPJyHieZKQFzBc+D66KSNjnbm9uOuC1xmDttgZWJMvb7B8snLJ5Y1Ya7I=; 7:DQFfReBmzx51RuDHqR2CmQfRLXO8d0c8sSlYykWp39hRwN1W7feqnNFqAKXJ9DLP/JDmY2ezNZTCdNaEIt1S1sf0WJ0v1auiAIMdHbxGvqwu9n/tzdyrMHYSGq/SvZcprsUsXl2Py5E9E9iXVaWhDOOvfcVm/Lctzcs7JRjMpugy2uJEmSmM716qCojOyqoy4Dfok0bGTHLWNJqvBdCMT45R1nHStgBcuTV0SeiirJYA/uhkqxzNs6Ng282ImBaG SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2018 01:18:31.3915 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b60c6fb2-20ef-4c6f-4d2d-08d58624d71d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3231 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/5] net: fec_mxc: simplify fec_get_miibus X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" No need to provide two prototype for this function. Use ulong for the first parameter, then this function could be shared for DM/non DM case. Signed-off-by: Peng Fan Acked-by: Joe Hershberger --- drivers/net/fec_mxc.c | 13 ++----------- include/netdev.h | 6 +----- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 7c396d8d95..2bd4ba4ef1 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1021,18 +1021,9 @@ static void fec_free_descs(struct fec_priv *fec) free(fec->tbd_base); } -#ifdef CONFIG_DM_ETH -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id) -#else -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id) -#endif +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id) { -#ifdef CONFIG_DM_ETH - struct fec_priv *priv = dev_get_priv(dev); - struct ethernet_regs *eth = priv->eth; -#else struct ethernet_regs *eth = (struct ethernet_regs *)(ulong)base_addr; -#endif struct mii_dev *bus; int ret; @@ -1284,7 +1275,7 @@ static int fecmxc_probe(struct udevice *dev) fec_reg_setup(priv); priv->dev_id = (dev_id == -1) ? 0 : dev_id; - bus = fec_get_miibus(dev, dev_id); + bus = fec_get_miibus((ulong)priv->eth, dev_id); if (!bus) { ret = -ENOMEM; goto err_mii; diff --git a/include/netdev.h b/include/netdev.h index 3958a4cd32..c96f851be0 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -119,11 +119,7 @@ static inline int pci_eth_init(bd_t *bis) return num; } -#ifdef CONFIG_DM_ETH -struct mii_dev *fec_get_miibus(struct udevice *dev, int dev_id); -#else -struct mii_dev *fec_get_miibus(uint32_t base_addr, int dev_id); -#endif +struct mii_dev *fec_get_miibus(ulong base_addr, int dev_id); #ifdef CONFIG_PHYLIB struct phy_device; From patchwork Sat Mar 10 01:19:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 884068 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="MiQOXkWT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zymdw6C9zz9sl7 for ; Sat, 10 Mar 2018 12:20:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 94686C21E15; Sat, 10 Mar 2018 01:19:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 59539C21E36; Sat, 10 Mar 2018 01:18:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2F64FC21D8A; Sat, 10 Mar 2018 01:18:40 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30062.outbound.protection.outlook.com [40.107.3.62]) by lists.denx.de (Postfix) with ESMTPS id E109BC21DF3 for ; Sat, 10 Mar 2018 01:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rBMzWrakuRFyAgDLR3ZWQzDZYbBoSlnqCI7jNVyAfzY=; b=MiQOXkWTVBCKaX42mMaeKzMbAxH2fk01XP482WK6Xjz3wd8Ir2/yHILTC5jd8mAHSyraHKu5cvopkOQk5yv86SxO3zqDFCxfhJpBRE7meQ6lyED6/G00nIzWb9Z44DwON+NykTry7UWMaL9xpj+c1izyA55hyCrnRN7j5xeXwGM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Sat, 10 Mar 2018 01:18:33 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Sat, 10 Mar 2018 09:19:55 +0800 Message-Id: <20180310011957.21801-3-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180310011957.21801-1-peng.fan@nxp.com> References: <20180310011957.21801-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::32) To VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 3c3372d1-29ed-4f6d-c96d-08d58624d85c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3231; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 3:y6zYrJ72U92OYrzbXWeheQuWP4ZEvdsGPT+jPT3NwB2GnRnFFkWQJGC56RUzdz9VzlptJHCMA7BS8FrcCM8E1Qs4Ynxa/Pat5SxbdNuh7BdOXgaYm0zl37B3uEBP7BgCKQqlGMb4wcyXpbcoXjZcL5X65oaFx05Fxxb87g0hRkNZBldNH7Vi7qZipVauUTLIKV0WOhllMxxpseLuN8rplDNGnsbUiuWQqLhfcnaegsXzrutlCCkUFgkNPa2ZZTz8; 25:Y/aJ6Ky0XQRKYz09HOvmrv7fPYhdt7GYqavL01cs8bqswU8ND1lgYuTf8Tw3zuBaUGd6vB9iBi7DaBXgdbdOk5bVN62211ug1hOsqEvA9PiWEF6VjFrAJLIOJl2Xv6ZgXUhXKE/kpCkrm/9QjRyTSW9dkbq9FPdO0jGeLCft56naHcYRbhRl0esd/LMnikIBR6dYr3u4xG609PhNc15caBzYonp4Oz1kUwkfuDzm8sz2dmooqJJWYfj2Ft7k2dO9/u5+t2iLMLjFCOJgSYIeYFzoiZR03skYoUc7I7qOqvqFw/ZPIrtUZ9djWRwlHx/ig/RH5q3LTKRnrlzbK/0XVw==; 31:BfVt9zmniHcK17hb9HADDeWxGGJL+wbEMfceICvF2JkbWsa2XThQeXDPWad0KnF0TOPWazaEd6cvg67EqVRysuVN6EwLwMBTPQfZo0pjHr1mk2zO3pYIv8l4Sw5fBL0pz6aqZ2LR+2pQ/+RZXemf8VU1F3Acm/X0+NmMsiAW5qPF23WhSFaou1Z1SbuISel+SUFflMEZhJslsxVs4HKEt/H9ak7yZOQCFd72R+DjZ9w= X-MS-TrafficTypeDiagnostic: VI1PR04MB3231: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 20:vlefkj/ta7hkHBzv2VlsGaOkkftC9xjzWrz36YXYBD1FPpEMYTTqV/rC7ZEnv37uCrjPtXYGleBnicTB1R81Xe+6lu3tkyIXwboFZ/VNkMJGlezJk91HZasRQwOAT/eTTqLho+8O9PD0EvHfy8tN29y0e4ex9RTB1lphw6E+797kDZAh+mGjiBBLqtLJvM0qhtPUHMj5QAAzormCjKRnFafM3bo/VYoDpt8xsS4iBBamy5RVs2CL6sgGBIKdoUfIUsyD7Gg8GDrlpHnle4kUbB4sO5n9JnzQ7IJvOTaCIfZIjgSyq6X2zNSXQWPGdEhShmXr/QeQ9QyU9LehnaBMfQMp5BBPhj2kEXcfbYJKzPizSQgjEw4YpUWXR460TOvT79tF6WJ27pOWaRcdBoCfmNOku4/+H+4nHQWB4VqYzkV+gSIjZvpiz7J4eP0RJjQgxpO35OgneLSTBAj2dUN6i7h5vAWGw4ShmJcNQGAc5PSpkjPqv1jnwQEXVSI7lr4+; 4:/zm0yZjLuXWpHA8iQRrN9ZK1tghXiN3qFR8SMlMLwNc25EtN0ZR/qQuUZAFS2LDui/JnCT3t+bHWfRHdSOz+ubad4HzUA8ZjYxCEPtmqQatw/KHDPEoMWhfrYWLhaZw4VYQzWOZL0FHeLf+9W0/D+fBCJ/eKRcEpZLNld9xnf4S/f+T+f9R3Tg0uuhaWaV5py0y4Eh9HBVUy6VOjOgvboi2Nan2kVZplZicqVlQ9YWD7p9pUMaViyer3QzpCM+aOhDR9e1kRvTrVs1CZXSd6bB2jgjIF1T+ZoBzPlYsVfKcbCSZJKl30uh4m/GgjqPN3 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231220)(944501244)(52105095)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB3231; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB3231; X-Forefront-PRVS: 06070568C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39380400002)(366004)(39860400002)(199004)(189003)(186003)(316002)(6512007)(105586002)(97736004)(6506007)(386003)(8936002)(16526019)(86362001)(68736007)(5660300001)(48376002)(39060400002)(50226002)(478600001)(81156014)(305945005)(8676002)(2361001)(51416003)(26005)(2906002)(52116002)(106356001)(2950100002)(6916009)(6666003)(66066001)(2351001)(36756003)(7736002)(53936002)(1076002)(6116002)(3846002)(50466002)(4326008)(76176011)(16586007)(81166006)(6486002)(47776003)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3231; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3231; 23:QhpMaXZpYj2wR7hKNT8B5z+Hx3/2Uy/7v2mWwu0jm?= kPeQu6HhC0AAxlqlQeVe5wH2Rb06AL7QS3ZrB67wqz//8Ujn74P37kugdm/kmxqSUwC6duWe7y1AdKbqB02WebaLuUxzytKS9vBQEvb1Zsr0Dv7lqj9V+fG/raE/NFE6lc1vzplKHzxJyCD0+5Qup4Wv0+8xH3lNCINCWnoBqdKLhWsxzldJBOJ5moFY0bUtt9n5qHjx+O8rqUyHdgHxtO1v+UR3LrPQa/SxGXbJEu0lhUZXBsoVu6u7QJKXyzm0JVWnwF0B042Fgjr+3FLDopu1FPyJmUFCtvqmxDLhX7yC405ANvtgve3sie3i5mXGEjYePtlS0L22QImEx0rzQTV5GAIL5EaDnhZpvYeGoMJNtbE6EXWRqr14k8nkRKzdQRdMWeV5wdqokp1fI0zpR79G4KARah+Mu5NGvQh6LIApL/t5I5psacmU7slHR0qg9Tyn7J6zdAflSuVjvXz4eEfXy3EvnVEwRkp9FxEs+Hs1Syx9D6nSlHb96ItrnA0HTcmwYAkDCF70TTfyOhJ2Nw3qSn4pWw0BeLoWOCL7MW7meuaFblcRWHMzK6ZQvJwFBmqx9YDQEfEzoy2x5BUGe4sddvdGcv0PkpfQWeeW0CgGMtRCXhj/JfnJWh9+Y3XyAX7oCz9VR2kNwgxl2eHL0l4lp5cSUiqaYFcBceT+BIOjpv8oL3PbxrX3vSCQHnEUG7uGZdGPa65f63ng+pvuB9NPa+Fg7T1TWFXUdsquynfpEVqd/9zlnxT3vqicRVh9Cd5kvH2V77tYQV19bxfMZRsJ3zrBwSdmD5rU0B3rUKq9yMipaiCnrthZ3ff7zSj/usD5OKR0bYbNNTeV0lWVOlfTKn7Rr9cWHnQFIkpZrX2IagR9MVnyccHGVjeXvdX3w2lSQbIvUt5pLg4u7vcrw1xLXlOVZSI5/AVdh8fZUEtSN3yog+qV4s9wyzsDJu1ykgnkl+gefRWi+gkNbfpP0SpyfrFow8ftGZRPb+6/LPe7cmsUFnPAnKHEevDDRRYRs5ZQxLESrNKChJ5BlmCsbo2S5g7vurlIlaXg//M4bZhQuqAoBm5J5enXQ7rHxkB5B8VCfxwED8yPFmG1EgTV6mwF5tr78552k46mQvBZOy6aE5zS1cXHIEAXQkqETBvhaM= X-Microsoft-Antispam-Message-Info: 5BZKzWEw2gJY5LzABhC+GhAVjzj2FdLyqivHTPIic/EQTIa6XlakmmZtFmnyMya8lv7WsGORAETMIZ9UTf14d8CVSWiPXyO5wAIYsDCRiDj/A2yRAg6eEmgOY+z5HRbh22QuignYInFENfe9cG19W3eZ0pdY3ujTqL0M5dIXLeXA7o4tL1D25u6Gb9O53EJN X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 6:YdYKSjTounC19BTUjK70tYXTRdcO9Sgn2/dj0t8+iIw7YH9E3lkZZm1k01pdw0NbaMn4XrnTMmv92YvfM98uuYcVMJ6798jMPWDglIrme6r2pcEsMg6o5df01c7YxM5Mr8pGMnXkLUKrzvr7UcPiWfscOUeg6WwsYGAvfEqpttF9+Cb/4GuNQVVKGIUxG3AA9YAYFtA8oHsBfDibixEJ/FWAQ+dxJLhoa9F9Rx8AjtpYQpMuyZZo68qkRI/KFoYM9BP3312ay9AuoO0YfqO1nOxp6p2pPSyTbMjwVeGCQR6fVU0mwKBobcnnoQj/F8ogr4FhmQSP18qsxMp4zwlASzlmKXt0qXQHKu5C6i2weCc=; 5:a5FIbvPp2P0dqwjJcIChcPQkhfqLiyxKGsy80rtB9idguK81NuxMbh/Gla3p4VJXyIBWl/k2SKZmqhrd86rzjhrSYKJnbiuLzHgbQEWu6NE+4/G4ziTxkyCAYMdjZHRJIprUm1uzRQ2fWpIyo2ps0kXB4vBbPzxxVj+a9nv/tPw=; 24:NDlmjd2JCdRhT+1THszgwbtou+m8ejEuNpbD6jcEKFpUuTy2kKxezsBQo6o8bzFyWtJg0JDB873q0Dz1QWVnh7HZCKgG7sQrkf/4ggLpQ20=; 7:N6PKgUMQpR0TUWgZDuEfgNwNEYIuiVyH/TfAqSASNJE7HtoI/r0WcpOpeUFWMrslPSW65mfqSUQnJnX8aDKqZAukSbQFxerX8+j9+a+kbnmjdslPSV/XR9WmBBdkr5m3HLf35vb67i+AuTCaAMnIpHyI8BqmrRd+Ai11JVb3mhR04/nr8vBl38PU8bn4jacBtkBmh3J5eRuiFrdRz1iJYLxOqS4GGOVqE4Tu7Uemf1J2527AMr3Z/pN57bSvMC6z SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2018 01:18:33.4697 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c3372d1-29ed-4f6d-c96d-08d58624d85c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3231 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 3/5] net: fec: set dev->seq to priv->dev_id X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" To platforms has two enet interface, using dev->seq could avoid conflict. i.MX6UL/ULL evk board net get the wrong MAC address from fuse, eth1 get MAC0 address, eth0 get MAC1 address from fuse. Set the priv->dev_id to device->seq as the real net interface alias id then .fec_get_hwaddr() read the related MAC address from fuse. Signed-off-by: Peng Fan Acked-by: Joe Hershberger --- drivers/net/fec_mxc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 2bd4ba4ef1..2c3171ecc9 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1252,7 +1252,6 @@ static int fecmxc_probe(struct udevice *dev) struct eth_pdata *pdata = dev_get_platdata(dev); struct fec_priv *priv = dev_get_priv(dev); struct mii_dev *bus = NULL; - int dev_id = -1; uint32_t start; int ret; @@ -1273,9 +1272,9 @@ static int fecmxc_probe(struct udevice *dev) } fec_reg_setup(priv); - priv->dev_id = (dev_id == -1) ? 0 : dev_id; - bus = fec_get_miibus((ulong)priv->eth, dev_id); + priv->dev_id = dev->seq; + bus = fec_get_miibus((ulong)priv->eth, dev->seq); if (!bus) { ret = -ENOMEM; goto err_mii; From patchwork Sat Mar 10 01:19:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 884069 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Apl2fz0k"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zymfK4lcrz9sl7 for ; Sat, 10 Mar 2018 12:20:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 442B7C21E0F; Sat, 10 Mar 2018 01:19:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6A0B2C21DEC; Sat, 10 Mar 2018 01:18:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A2973C21E1E; Sat, 10 Mar 2018 01:18:41 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30052.outbound.protection.outlook.com [40.107.3.52]) by lists.denx.de (Postfix) with ESMTPS id 205F0C21E1E for ; Sat, 10 Mar 2018 01:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=AK3JkjXMMSSHqQyEwxwq+ZYrhVUJDMZ4b8ONFhPcINQ=; b=Apl2fz0kvy7a/RCsRUgKOf680iSxE27lpSxwcQmXxTBJeFBpymBzQQ9Zqha0ChAN74SkfbhvyObCsv4Po8cDBuv2chfG2QYOozCCyMrOSezRD9/0fR/u05Bxcu0oO3+TeVYJSa10p8zQnx8WXYpZS2jKCPKlOjMWndGrOEUnyUo= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Sat, 10 Mar 2018 01:18:35 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Sat, 10 Mar 2018 09:19:56 +0800 Message-Id: <20180310011957.21801-4-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180310011957.21801-1-peng.fan@nxp.com> References: <20180310011957.21801-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::32) To VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8106ae13-2186-44b4-f63d-08d58624d9ac X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3231; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 3:DYnvc+XQgvid7ROZFdoPZIgP8+D4RRYIwKcrOMgRUZyz2DMjhdZ+mttYlJVbJZr5h2R3aiJypqfovrDHg3JD5lPQLsHOHcNEP4hR0dSwq64HNTjUQt6GQvKieCe+R6ZbKLO/V7a3LauTMHEBd7dRDdow7+lEMsagmXo4QG9HOZDDRZQvr04PPPYzYn42cdSnmfS1rBRZHd7hWn2B3gLkkAaWcsjDjWYqHoX2dpakFE0bJXsN5WIXx9CrLN64DCUj; 25:m7hV+EKQW8/Ggu5zKZq5Wmn8HYnkelaQoob2o8N/9sdDw67yOnsqkFLrnf5xaQOlRFGKHjdJGsCyfL9S6temIeiKzfqbabhbewkh3kC3IejWwAfZksiECL3YIzqwelIo7LTsXAaDLDMwV83oXRPr0t5dt7NNiLIbht7cp7iNyrQzr9uS+HCAk142FC9gJhqbhF8Kp43akoQOswuTfSN3mzntkmVdkq4sugNCGfK+q0+bUopeucdS+GQYZjpN6U51gpHXKMFQwCfR+WLtQ5V+0Cv8YGvSE+wHJ1hvjQLc7+CsIOXk2Zw2F+zu6OAC4DzKKN6z4Uyb7gYjduNC4GVctw==; 31:R38IjIExfNrLyz1dHjzNYCp9RnxzVYORrAhD+7m6RdaBUffJlj1NOYz4G3DRH3IyZ9FCk+z8kf/1+b+VDid7jswbd5Xzkyqc0R5k3B60irLmKozplk9VN6vg0Gj0q3n0Aeljr1lIpe/FVJ19OwpbkgPVvcj6kUeTs6zka50rBYI3FaM+YprksABIVWcQGl6TTucxR47kwljm+DVR8bGoQ19u2jvxj7r8qHntFIHPD6o= X-MS-TrafficTypeDiagnostic: VI1PR04MB3231: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 20:3J2ZHzXlhXutX3c6vN+8kAEriPhLZIWeOLHYX//q0DqSJG03WDesVjAmoYgAfdJnT1C6LOgQ58Lci9eVs5ZU10OMGHD8oREyVnwBVwP7WLV2p90HVCOVAj5DV6YbaWly8fNkii/WrffzbweP+s0+FiLccZS4knT592zM3jkW8SmSqW2jxYDEsrhADxWggrZGDDPyWLyUMeyleklGY7cDgvsnBjzk47Nj4pYW7yh8WzSV/0xL9s6X62iZLYqgG8Vaefjs/FBFIkD3S+bc/v54HTBlXmj6+Jrkm6QVOfX0Yb1Sns78THJI+5NaCbPfOepXPqxg/BG9KABf82Etu2xQNDUXLmaRMHeIvqdGtHw6f7d+32u8EW3gJDOyb645DBQ+NzmszncPPhyMw5bUCuSjSTy+S/fBtTWqkXWbuVgBAjwmYp0+KMxcQfCuOdj9pIh9Vp/OYCgvjMAGYiKe+KZApNtaBeAJgaog4PbVrQP2x2gz9WjxosQ8kiFQhTXg2jVY; 4:aiV0BRB2W62MT0w/CA5RAno5lHR72yiiOG1tIJ2BsjlwfXzp3/AKB98XFxRsonDHlQr9VJOGXubj5cDj8rf4hnGPHvKjv23wogTjMG8owzXtYoFFmD8pdALIV/Mtzct2aKoeNUklIC9loe5gWcUHSwoH5YDToSiytwBiknYkUwH14Z75VNokN5Qku2P7lP5+gOhJsyKTRwHe80fUzDyQfoFPMShb8MdVrSuH4kUQMcDyQxRP4ReC6dlv0/W1akIYadEGw/SQGClYfR5kFVWeda2WF9zuhA0bvdpbqhOOiF4u0aT2NiPXWvT1q6lrutW0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231220)(944501244)(52105095)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB3231; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB3231; X-Forefront-PRVS: 06070568C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39380400002)(366004)(39860400002)(199004)(189003)(186003)(316002)(6512007)(105586002)(97736004)(6506007)(386003)(8936002)(16526019)(86362001)(59450400001)(68736007)(5660300001)(48376002)(39060400002)(50226002)(478600001)(81156014)(305945005)(8676002)(2361001)(51416003)(26005)(2906002)(52116002)(106356001)(2950100002)(6916009)(6666003)(66066001)(2351001)(36756003)(7736002)(53936002)(1076002)(6116002)(3846002)(50466002)(4326008)(76176011)(16586007)(81166006)(6486002)(47776003)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3231; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3231; 23:UHx3VwLMyiy4rQaGSD7LTFLJi7AZOeZsCG6o9lojr?= nd/0t18ATt0V+FXkfsN+jQ0uR9hihGZmp+smXx1nQKw75YmdXla79p4PjL4eXexzOB6PZUuPl2/Qk49jF4Ps2zlwlO8y+m17t4hQcmGX3vg2Zr8Nd/PZNHanZnn4dwvMO3ufHYa0tR63M8jo2KNXTo5gYVfQtc060b4sq2xTQNm3fuG3fydafG//ONFDFwVNHH05jM4wE9ysTKdXMt+vna7BFP4MsFw/vnCP6zgqs1bE4IYFi6J6zsM8EDgMRas0mIWQuV4I5/uXA7a65yS3jugL0/VMSe78toMcQaaGAZBgBFaBOwudQdzKJ1+TqSIBI28QmhQNgG1a/23Ju+t4Re3+cIkV1+XtNWCNwsxN1/8SUUm9711rJ9VbtVFZHNqrSpFBef7jR/QUFbUE7JjuTDkoh9RZxqBQQZeK7DfccRYCiJiNBkljeCTq4HVRJKr+9DeIig1w6z4o4PEkQQu84Qij7REZhVW5Fcg9/umD4rE6sgjh7Bqah7avehIa+X3uYft976EdTiuh0N4Xa+o9n89NZW50W1azJkytrxNdWttX/9aDKh7fqtMjFtAw3Jo43JsY0KgV5x7W7Fq0uahGH9nqj8T5+obbojF9CvX+MVmSnlbe8ZWreOQmbXvYVyzKl0xUOqH3MsL9sL7ts9k4Txrkax6Y8Hr/HlDJ88jYFtIlmMl0Nlz7unt4fwMDH1XwOiw5pJVbwfGaXRk15bjfU6H3jC8lsy9TB632VebI3EOkVoYax/Lqu3SEMATfKc8biyeWJAxSedIQyaPxOEVAUsjIEZSNzBOzgh1kCK2BNutjPfS6YmYE+ouZOGbQFSvsfFXdRnf89t48Np4y3BbJpoJvhEF+Bl8i7oFKzHklkt0YntYFHmPXjhd+o5Xpj9+t8g6aWfAGia5ZmM1Gb38kJBCKASjzHNX7FrNY2Yre1FytMsqxQsLEsuiCer6UrgNJvgwC4C5tkD9G4R/SiNtRn+WXolBTuZQ1esofsRwgaLngqhjSkWawMv2pDI7XuCCVMD3IE45rFJ1iPmxVcjZAUndjH4KQMIZG3uEGeMttONI5xf7QDOJZ6wdZItbVHhOW3L5aKh2rorZ3NQQaF5EpEivJSoZI3BrwK7YkbKawC59QdDjv4b9CjZOJA+7vFNRwNqCyvOVxMt3M5FEeVfigaRy X-Microsoft-Antispam-Message-Info: QNjJtwa4NT6uy8Qd9fLSBS4ToYd+oQTt6F1TfgnOVFUufWe73siIyCbhizXISdOVTZhcwqLt2DDVXl3QAECfV163Sr2f9upMjVHurNUELaQ9gz+rPjVxgK8pDHbWjTQBq6ILkq0H9/VY/C3fSJNXOwLOA7mj393mpS9RzEKOUnUEpx5ZNNuokkRUm9n8DgOd X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 6:MlIqojj6XGWrSzAsT163IBSAUe7i8sgits5Y6/lVZnXRfgb/9I5WQy1aDOaoeW7ConRW6emOlhcg3YW/UW6Ub0pYa6ZbiI1hBzS7SvpoFgVca9m/lta4fGFYLqGi20mWIWS9E+PkN4l4WSpcXCRJ1R+/SuJ5T60jkfO0NaKE887G1aoOL4sTdMBV+YvI3+Dvaz9C327ni6W6Z8jSw1AfY6bq+L0oTj3/MdiGZd/2p6d7XWOFDBRKbu02p+1bEtnpzpGl9GQ7kHSeVJGU7q6vyNRt5PqxiUI9TKYGGdVdAOfTCzW9yjJaPW6Pl8ML07LIVnc/kLtKKxhENy3e1ZhpCcVDMptT+4ZVfaFd/gEIwbw=; 5:MN5hunUp5N/HoMeNLMOPURvo21R4qw3KFjvZw5FyKI3sXaVxFQXZKZAlF/3/KBoPPyqMbuqE2TVDHPMyapk6elwKoeci+h4P9x1WDQBmHPyQAGcTFilZUaJWvwyf5tLkUPn2huKa0tKjG796nzlZn+4Kt8AaqtH8cSrWOzuNHxQ=; 24:HEk0sSefYGGFAQCL8xsW3587SNWlQ78YjiHpsb5XjS6K5zGBurjJP/lL4KAh4NU4tNIDqTLiSoLS3Mt0bP0SIFBcXF42yM+PdIz3D5EYacU=; 7:Sje43W329mDa3DXcy1PqJb0kOE2Ab8Pk3oWU824tGRoTsd6NLCgaZO1QEvSvEMez+/YG9Np/0nodUEsIBhi70Im2LCViMtGHY364V+ECVyTzxUEnu4dLY2rhjxcPcql0jZDOlhzuuj8kPjtR5J7aJ0z4kaUDAAKKggoagzPl1T82BAU/EG3YuJhc3iKz7tLuyfs8SdskvF98wc/KdsuRe02e1+5wcQ6kGpTaEpg7guS3s3D/USHPjMKshWZZAyZn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2018 01:18:35.6884 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8106ae13-2186-44b4-f63d-08d58624d9ac X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3231 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 4/5] net: fec: sharing MDIO for two enet controllers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" On i.MX6SX, 6UL and 7D, there are two enet controllers each has a MDIO port. But Some boards share one MDIO port for the two enets. So introduce a configuration CONFIG_FEC_MXC_MDIO_BASE to indicate the MDIO port for sharing. Signed-off-by: Peng Fan Acked-by: Joe Hershberger --- drivers/net/Kconfig | 7 +++++++ drivers/net/fec_mxc.c | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index de1947ccc1..3a468a7c59 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -147,6 +147,13 @@ config ETHOC help This MAC is present in OpenRISC and Xtensa XTFPGA boards. +config FEC_MXC_MDIO_BASE + hex "MDIO base address for the FEC controller" + depends on FEC_MXC + help + This specifies the MDIO registers base address. It is used when + two FEC controllers share MDIO bus. + config FEC_MXC bool "FEC Ethernet controller" depends on MX5 || MX6 diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 2c3171ecc9..e8f8fef66a 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1161,8 +1161,12 @@ int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr) * Only the first one can access the MDIO bus. */ base_mii = MXS_ENET0_BASE; +#else +#ifdef CONFIG_FEC_MXC_MDIO_BASE + base_mii = CONFIG_FEC_MXC_MDIO_BASE; #else base_mii = addr; +#endif #endif debug("eth_init: fec_probe(bd, %i, %i) @ %08x\n", dev_id, phy_id, addr); bus = fec_get_miibus(base_mii, dev_id); @@ -1274,7 +1278,12 @@ static int fecmxc_probe(struct udevice *dev) fec_reg_setup(priv); priv->dev_id = dev->seq; + +#ifdef CONFIG_FEC_MXC_MDIO_BASE + bus = fec_get_miibus((ulong)CONFIG_FEC_MXC_MDIO_BASE, dev->seq); +#else bus = fec_get_miibus((ulong)priv->eth, dev->seq); +#endif if (!bus) { ret = -ENOMEM; goto err_mii; From patchwork Sat Mar 10 01:19:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 884067 X-Patchwork-Delegate: joe.hershberger@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="MrlRmTuJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zymdb6dXtz9sl7 for ; Sat, 10 Mar 2018 12:20:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 28C8EC21DD9; Sat, 10 Mar 2018 01:19:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1D371C21E02; Sat, 10 Mar 2018 01:19:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2984FC21DB3; Sat, 10 Mar 2018 01:18:43 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30078.outbound.protection.outlook.com [40.107.3.78]) by lists.denx.de (Postfix) with ESMTPS id 39F11C21D8A for ; Sat, 10 Mar 2018 01:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=P0/DvFo8GcuzGGokYAhVmiC0XhtJ/lTnd/pYvlJL7Ec=; b=MrlRmTuJRAssc3SFfEPxXH8LWs3CHvRiI3Nx5U4k/Bpe3EuxXLFP+6x0H/0EOHY8/+D8Ni6x2hluwv00l8Kityx8z7CX+YLl5K0EueWJKj4Gu9shcBO6jlOwsPFAxjP1TbNN5JKP4SoeYk+cVhaQ8j7DMwsby3fHXo7yDpZvInU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; Received: from linux-u7w5.ap.freescale.net.net (92.121.68.129) by VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Sat, 10 Mar 2018 01:18:37 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Sat, 10 Mar 2018 09:19:57 +0800 Message-Id: <20180310011957.21801-5-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180310011957.21801-1-peng.fan@nxp.com> References: <20180310011957.21801-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::32) To VI1PR04MB3231.eurprd04.prod.outlook.com (2603:10a6:802:6::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 55078ee1-12ba-4692-d4df-08d58624daee X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR04MB3231; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 3:BQ296cYoKN5ksRE9RIBBcy9GI0TUTHpc+Cd/SVCathodVrfiqSfDoVq6HIRZPPEuDmeZn+Gr5PUj77PWk3CjZUFXOtITxE4CJa88ozNkkTbzKexiEjY618WNHb/YB7Oiual7LYprd57zxHLb+T4E9BgzfOAH306j27VqJPP/KupTQ33YSfSKAVC0l503NF4AdrjDnBSbmtsyH/bq1+9lmALO5ccvT9bPqtRbNqTs0FiUY42DIuWeM8eZf05HSZKi; 25:xS1lP3UzICJF61FgjD6CJ2MWzV8R+9WIAZ8d5MD11Xv0zDKCrdonDU6IT+knSTyKTaQAGTTmggq2pTIm7fjdQreY004DeDKmpAVZ3tigIph3OuJT3PSJT1jSbQv2XUASBHYEkJ8rnGfSGldpqq7fE4OIzmEEiYfsKk07lYSwi9jOK+hu+31h8svItXxAZVqBSL6Lqe/4JcmStPV6ZXaYgLtXCpr8VaRv4fX358tRwBkrHF6JE4V2uFofVF+7Ca0LZneLB4ndBuwf79tcZimhFP3zJHZZPsFTU09pen/m/litHzjQOsGLZ5oLD0QkArcFM1w69Pwf4HJ3zq6hESpUDQ==; 31:x0hhqLYZRrZX7lQHc1VNiBwNTYJH05hkHJucx+K7m16jKwa9GlojKVIcOYL9i3hKlGTSEdVzSxuTOi3h+ia25IrU7wqbsg2gU3jSe8yvmmzrGjEg6V1VWB4ywwlybIYOaZB13ep/uofQzfF2rKSGVHg7Y4RnmH9DbSIIWRpMguKql0I9KJr/fVicB8kHWRgN0H4Wqs3QyEZJydX+nKpeK+h5cnUDIUDoPZ3VWBHieHs= X-MS-TrafficTypeDiagnostic: VI1PR04MB3231: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 20:FuzDobWiCa7+jiPyZeGth3Wd5P9j/CrjiJ3XZlOVynPucSz4M+ZrTeqMfjFK2pcS2iy578m7VD+PsOPRNRI6fLb3bD+oF3MDzOnW1ygGVzJWCVbUuRb9yctvMACFjLYnlfMKHYuhV4yh3TJmYL+p/o/SzhUlyi+kGqqo5GvQpj2ambpcYlCL3F5B7+J2WxC5SbTDdPse/u2BCljxoG5t6TG2BpM4mfMBwxsy1JTn5AKit+T68brMqWDQALEUJpTwVvAQVECi2yQdV+zdYxvZnMAhywx9a7pvsNosj5FySBmjYD21YeKhOAmbEGhUWxzCZPrqRzhzl4NtYbh9DxK7LfPSCR0sSnN7Ar9cT+pVjJZAJpsTdos+t9ziL3o6smRA3scRLpEQaMPTXKa0G198f7qU+FxgqL4CBYfkLiv5YgakmIPJQ/ZocKBj+75ncvkAK0pC7iLlrlFieFUhKTGvVUUVeiquD2UTX16aQwKiL1YgHfHS+d1XjWsuVdAGuqTI; 4:KrpqpDaq/es7j5vZDntzCWNYAgwexdYvJ3NtcH3EsgQNdTig0rUgUFrT1sbgjUAmnPxofbhKDTuGEalr987OpfL0VSX6r7ym2B/LsaR3i8/bbsjkpbY8whkvP8Ibu04AZbJwqYG5beR6RiVk42B0W81URIW1+5aqb8BMJ7BK3aeFXjeSk+BXqQf4/5/K0QB1nwtRBbxNdC4Y01P61GTqtRO48GpfZfzvpj0EpdfZII7Ep1CMLvmdM4lzMrrGkScHamH7yPRXEQnpGoVRxVA2g8YfC3zSKQUo3FjpmniJts3NtcAV1LepAIclBxzJ8gT0 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231220)(944501244)(52105095)(10201501046)(93006095)(93001095)(6055026)(6041310)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB3231; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB3231; X-Forefront-PRVS: 06070568C5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(376002)(346002)(39380400002)(366004)(39860400002)(199004)(189003)(186003)(316002)(6512007)(105586002)(97736004)(6506007)(386003)(8936002)(16526019)(86362001)(68736007)(5660300001)(48376002)(39060400002)(50226002)(478600001)(81156014)(305945005)(8676002)(2361001)(51416003)(26005)(2906002)(52116002)(106356001)(2950100002)(6916009)(6666003)(66066001)(2351001)(36756003)(7736002)(53936002)(1076002)(6116002)(3846002)(50466002)(4326008)(76176011)(16586007)(81166006)(6486002)(47776003)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB3231; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB3231; 23:LK65sHjslo+XLm4TxKmdD+Sfro8AvRmAtlIgrZI8l?= yFvRF1e5U/3T3rYosD4Z2y7coF64rP2CXvEUnti+kXopMSuBQxH1N504V6i/GqMzqJtReYnkzqV7T2+Z7HQOWpOPmcMEpjAH6Kjvm7SGqeICL0UP/0kZxcldB6OXf7S3oEBXEnAIQm/diUAtYqmYhtrb1JtCkVA3wDyPzGCPrQNaBRmOlguf8S8l/RbRa3KnIl2ak4nHWzmUdgKPjXNd96Igq0RrL9fYZ/YAQXoqi4oDS5hvkQkQ6dE4YWLKzVDRPUtmgGArAP853QYEemjviT9v+eT2f+GKke5PJEBG9N2GcyPiYw36f0umsTe5uviMxyWEZO67KjE3k487rLzAcrgw3bU6Dq6vYwa82yA1k9DlPPKTLaJ7dpnmRAbkom8Fz6KxA+VxjUNwFiazAab5IWT7KUha7Ff1kmeiuIVSCXF61i+zB+D9dJuwl/t2vvISLb5CpHnAvqzOi6J/MbKTi2pVQYf0SQo0OcaASA/8S/2IFDPUHEmO2DPsnwruevS3D2/CjKFbn3CJp3aCJRntVz9mKcMlsvNlfFyTw7Mh5z0hb939dSDlIdjxq2e1xnjTzJWhtIG/HpYHCpk85wTyD3BxbF/p/1wIN5Tcwt9rAvnTZ3LGK+mQPN5qWyw9NcnpGdzeR71G/y5GmCD8/dv/c685FQVS4rVZomE1q0QqNLW62LJRF5kP03+fS26CfGNS3uHVTH6M+U0sz88KY1ncS+qOGuJzy+2njTB8VXOUCxmxAw7LYLwX/ZY/CS01xTBS+2+VZgt7K1yN4Kg35o7qd7VHfklpfG57PQjgogopDpnSL2zwBHzliLl+LdIssaT2KzpDL2HJPSgx9ZbgQ9yV/Ycgrzh2Mow2jMpmbtFNewU4U6JA9tGBPh8xGgeFYP8nVTeNh9v8EdLExbCedu6AOLixU76Hf9+sZD5IiMuluI+xeLh2y0nTV3kSUNKWMFUzYmyLJCsCjL+OiRj/LZsU2kclgGoRsrUFdDdm7nQaRcw+Sb3An2frhEnqjLjqXnnAPYWmuAG9eYa2pT+AvUB75cGcfb3KEXriBnQe8jxYSxVofOIj/yJTiEZNySOQ2DqJylSSA2aQZiUUowo5FacJOxwWAL/qD8Tmk2L7jVzDyK546PgoJJ2mgcgXizbP9VvG0Q= X-Microsoft-Antispam-Message-Info: vs+Wr689w87u8pnCcS1cUNdhb7uvQmgGEVZOQpc9fUOKO/Gwiwt5mXJvpF3HejfbqFRfFUPkvLK3tG/ASmx2zUFUdmT67RFDjvOsTBjPCNjRcAWWh573PESMsm0fztI95e6pv7o6tHai4x9Ydw4PN/7BpMUqE61kLnNQ5d2LFOvJJdsWdn7gTUWJa3+XV9x7 X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB3231; 6:Miwgjkio+EQ5wnXiq20EC+9oIEbuCOEXezMc0xxqRBaJdAR0jnTQQzlP4h1LxN6WKIH9jH2qIRMJ9dbit30fx5/NnjRvMPVDtyre0d5qBr4q7tiyH3P6M1nWqzmmRX8/nqM3HCnZMoB8RbH9mb2DN97YHgxbBaz9SOKFx4JrGYqtj09sLVV7Syg6cJZZ6XB4hj0hh3TBfdzL/2k1PHz7QEpbFVEiN2qxK2Io9017a06TE2t7WfQ5NopXUDIY8Se64RntwNRi9WZbMn/2kjWgNQII2ALjPLcV2WWqEd1a0EILc3BTiI5Nz4/vcRlHLIQ9Xr0NBLS4y/h/3TvCK1pbwhzVdAKTyMw05xYlodf1/9U=; 5:CGchTuNqcZvoOpPa+s0p5Inw8hUfe+7/qiKLez4/pw87cu4dKh4sWDRekOTshaL0N+mXisucxHYjWZzUy0/x6Zl7yFx5EpqUvavCL2dwel4TUBTJhwMiAYccDk9sTVJU1qD6U4LTvni8WtMxhvRyoaAwQ21gq45wFyEbeT6ibhM=; 24:D4SM8s3KIot9oPUwcHBVn8DkkRoGtmKnC6NbQIJFS8b2myZJjq4ZY/22S25N1Ed4FqCLm6qZ3ylCidkXSCnmMVfhKz7mOoMYS+Izv7/UCu8=; 7:YBXi5zuPLxOiDk9DxLePJ2CabUHsr8QBEcU6iL+/Rl5GIusvZ73vDs27VWJGYw5X4nQ/cKMWRLRkFzqEQVKm32UzRd2nt3WJlabJ0UN5BXZJjMfEIz8AcxycPhFeQcn4/tNXy6g4I0dIUGzzcz+MvsqOrSb+X7q1O1LAwhmPpezkm7yzhFyajKyv17WY+qMjMKCoxGc4sC1/rNH9bMUZs/tXyGTwLcms4nYuyXm+kdHghXnLjHx892KXP6ZiDVod SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2018 01:18:37.7979 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 55078ee1-12ba-4692-d4df-08d58624daee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3231 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 5/5] net: fex_mxc: add i.MX6UL/SX/SL compatible X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add i.MX6UL/SX/SL compatible. Signed-off-by: Peng Fan Acked-by: Joe Hershberger --- drivers/net/fec_mxc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index e8f8fef66a..ffe3bae59f 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1349,6 +1349,9 @@ static int fecmxc_ofdata_to_platdata(struct udevice *dev) static const struct udevice_id fecmxc_ids[] = { { .compatible = "fsl,imx6q-fec" }, + { .compatible = "fsl,imx6sl-fec" }, + { .compatible = "fsl,imx6sx-fec" }, + { .compatible = "fsl,imx6ul-fec" }, { } };