From patchwork Wed Mar 28 12:54:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 892215 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="mwdAdGZy"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40B7jn0Lkjz9s12 for ; Thu, 29 Mar 2018 00:18:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3490FC220E1; Wed, 28 Mar 2018 13:15:57 +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, 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 44473C21F2B; Wed, 28 Mar 2018 13:02:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A7334C22126; Wed, 28 Mar 2018 12:51:54 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0089.outbound.protection.outlook.com [104.47.2.89]) by lists.denx.de (Postfix) with ESMTPS id 80819C220D5 for ; Wed, 28 Mar 2018 12:51:42 +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=QdVmb/IZcXpAE7Xv8K4hl07dXLRfETQfJVbtJYD/zfo=; b=mwdAdGZylFAhfytX6i0AaisRU9jXuSA8lY1oB5aeGda5bpOg4PGHNkLYzWzx8v+S608gIX7eUzFulG3Cny4KHuerbZV3Ua+FJIWqMtunFqn2lblnuAavam5PhThdvnYt0Vx1m3oxgTIi1GWneVaFifY7/QXNL+0mSxFP+yaBWWw= 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 AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Wed, 28 Mar 2018 12:51:40 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 28 Mar 2018 20:54:11 +0800 Message-Id: <20180328125416.28056-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: HK2PR02CA0165.apcprd02.prod.outlook.com (2603:1096:201:1f::25) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 729c497e-ed4d-4c90-de2f-08d594aaa76a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:f0lNIvzkqryu853vNITd7g8MlLeTqUh4vyJeOBxvU/6MW8b0EQuyBhkYRpaHQh7fyErgEt6fJqJCcRLDH/K4bRgfIHVZOcEmdWApYq4dJTW5ugOBRGKLSuK/NTDI9OsmXG+1s5g5u7g4qLzrh9aSLV70oHNHGKwZXoWPaHDlOwHtoqsucVeQ9N8NBMPc+zMFHnIxgLX7zvjEMqkdwkV5fiMEMIn35EEPN76/I+6H45lk5MzQLq2cHVrQ6VCYVyYM; 25:iq430KBzOsWEnbiGZpCSA156ownkDwZEHki+e6YFljwQ8IfuEtT9fW7DFmGYxApm3+bkUpdnz0EYCYeEhnnYDV22GZ3cXV1kVU+mYCZrOCOfqz3BOyELbv3vL50JHQKPuMPIw7ai4D/AbsZwEvzDvjviKtjzQ3fvAnr2Ew/xiOozvgx6eg+YyZFSJIEawlqf2BXqKLeRfnqbH3hvlp7LBwFPPtR9+ptOjEpGVuTXLMEOlzeGY1MYQZN7xpZv2qOq1dAmt2KVRvQS89S7ba6E9vOUeb4ONG48SCBddzL7A1BkDYXsXfLIsylLpz8WDWnOfuGyNptQQyDy2qN7p6a0Lg==; 31:nD7WKAp+lA3QBpOJusqZ4b+ZGFsVdSkgst9H/L55QZEBphge48Pd7Xp67xLzOKdlHVxH+Lfbwx2KcKTr/0elwlLa/CKgaxrnYurwPFOKdLuWeJ3g/UBLar/JvDlfHTOsKmc7VOxFQjNMmYctN+/lQZgeZFv3ibMffeJn5Q00KCSH6dAMasU50vn2VJ+iYxQK4T0hXpncJlw7hEQdey4NUSFmuC68AdZNCACl2g1kZu8= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:moI4aE6gPhrq+sasnnC19boEtrK49XICjh5FXKv+6Q718b6YWynSWRTS0chwomtD15gh5++LFRTFeLKTtcbowPX4lpwnEbPRtxEsoq79Tq5vFrsGAe46JUtxzumAPRSnw34kTo24qQzY75M6QuPMHW8q6piqhPwjJltSHeTdCq2HhvPvMLIcsyA36Eb4ZU5ktqUL/GSMAq8lDyQlmthLR/wqasdX3mlS+Ac4EMb9cqB+kcCz7K7PBr6bqw2Vpuh6Zm/8+AS2LOvTKoaaP4ynQ2RVUhSbz7wdyzu56D0Ev2nZDfbpqhsD8tafwFAPpDlJtQewSX5EVWTrKZJEZl9HCaxDOspunJCIB7DGuYOJmcOm1V7TbRBapfKbx9/qyHu2eiCQ+fD8qqsqu5YqtZFOcvc78xysNlDRT9CxR5PKHdWvuIw4oi/lRZ7dRX5e0yCelpYF9PziRwLOltYmvocsgeMC46J0zLpfC++F4YkrwsehX6Waau9usLcM0c1R5MOX; 4:uA55MjrFyiPH7wauEj0Ydw8qroZh6MvRV4M30ug41+h3tAIMqvy9iYMJwn9+ANgWvT4P89F3xEL7O85PnURKcpFW8m15XFb4eOZp5lwRMmNCZMl1m6rgE7jBSe9OchpMlN1B1PhzAYRSFBS7RcnZC8eNJrfOu8e9QX030a8tXoy9QTBH52zem4woe8mxoGAvdp2t0tgmf1zqZ/tqnUQJ1X/6d7CDI2weE3kCAj9Q8GIk/kF6UC51uK6B2+eBfC+3cp39/8CTBDlbo/Ylq5SKbO7pdwsSV7/PScegrziaA4GUbURKFOqiTp8W2mjDlS66oTgjTEgOtPAgYR4g/eBDv1jTGA8yORnGl+VasNmSTQI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(145744241990776); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB3218; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(346002)(39380400002)(376002)(189003)(199004)(26005)(68736007)(8676002)(97736004)(81166006)(2906002)(81156014)(53936002)(47776003)(36756003)(66066001)(2361001)(8936002)(2351001)(3846002)(6506007)(5660300001)(6116002)(51416003)(386003)(16526019)(186003)(59450400001)(16586007)(305945005)(486005)(956004)(7736002)(486005)(6486002)(476003)(105586002)(2616005)(6512007)(50466002)(106356001)(25786009)(6666003)(4326008)(6916009)(86362001)(316002)(48376002)(52116002)(1076002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:vClOO5IcnERAA5F3SogXkqlcz+zTFZ9Kf5UR+Omx0?= gQvV7evs7zuZSpDW3zj351K13cEMH3zwKpKn6B/mzBCvxihc73GxE33eDFtbxfwFER+oEp95Pc2SSZtDVi+dbOpPiFgr9ZYgTFXptBHoXZIDRGf+Bwpl3odgpbwwM0l/WuRfbSLSNkBdezlV2TWB9sX0gQjc2LNJgyH8KPERqkAI0PDhaYPfb7hTNFVR6azI3Odie5roOmgBtrDVZ4WRvVn0bUEo2K7t+HHR2KFa4MapqHBmGKGNAROYwMN/IsH1/jlJJiGJ+W3kG6mdDKLDZvknMNoQHVPqOd8m+4moumGqRZdEyy/Bwj/+3L/Il2sIqeUNkCS/X/FZNpsLeJp9xmkE+B6Piyl9FFWqAU3x5nUEpUOvOAREyho6JTEc3QrrbjRIwtuKemt/G+VI6d700XCqZ5Hze0hHBXL53QOBpVsgxr9pHlF9nQYmfy38TJM46nsx0X8EhCZpzVmSml9ZOaZPbn4ESs6mNgobJrvZpm6bRSc/vNm0Gqn5YcrgwDGgAm/ehpP6XKxL9Jvs4Os6zsOBynVkWjfPB9EMq6OvgBouwd4CYRku1OATwsweCr+BINdbAdubvoSDjkqmhluifBfH1YPuDOgyxKcbLpXwWEFlSdt5y9UGv0Y6mHpZkeMUG+rSMSlku6KQLMgpBAQQjnr9VXpvHirQ13qcqsXfls+TQGe5uRW2svDTG2Ii1m0RXhQw8tVT1y5/RLwXHSuR0MqKANvNpppF7ejle5xvBkEGChWYJJeOd82gC762Do1WOxIZG23xtbvBuf/+pYHUVIHmLRptkzqAqIBGIHeyWJ/a6v3tA/TCW7M41xCkwQ+rt40mhk5oE/yffnOgLNRuZB+3IUOtH8vFfim7u+VHGQp8zSXetQt1J0nL6T12m/AzqqeUzTeqd7sNSXu6pGsYK1hf2ygXH0s2tG1qQbBS7b1KnVMZeOnLjlGgXR3otI6AI/AbjVDCrANLzsPUAxQs0uGrd5u6fxJibQVI25dNt8bsRF9RjOMTIuiNo30SPDAHRTrDUjD4RJaJAYQNo6uJ0lSOcxCk71yyaE1nE8gk8epfGYQOYrT2NVqMVfkg3pNpN7YcXvuRPLz57VYfOcJ6aRuX1mOv907PtgyHSBJ74NP4UHRsddn0R0VO6OpL+tX/vCHZuinR6LPHA8BLvMpbEFaJF6PGLrfKWgRuwi1OlEQ+g== X-Microsoft-Antispam-Message-Info: iiS6XC+/RZuM1+8Hsm+DVhnRCsTlEb6rYbMRW91w2woKrIxuN/fYfKq/2DbNttOVQZsm0RkazqqoM5r7knGmuezzr5+6dYib4Okw0FF42Zhw+I6hNSV4bRQ6TBUecASbBj/JUQDpqznpf1E5fmG4Q68DuRBfNAnru2qK79r5PWf2W9epTv0GCGiD4JGODwSm X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:r7msuey2ztSb2ikUKvzR2ZADFJJqnkqSYfIz7laI1JOOM3SLhPYuHxLupk4Xz/OCteTcfSJ2LvDAjE/kotCRIZvGyyNnxT70tgzAHVSTfu73o/3JQarwqGl5XQnibSUjqWuS+mUxYECcazBAHw8dOTHS/eHSfPQ9w9N3Ra45VMMTcsAy7PUSz1z8dUdlq9NxbmGd3RjbNZJ05ivBUA2aEoVneDqqMTGgc7CwTzlBgCsBJwmznWJjUlxDADKMywPgNBAiCR9VM6DmzJ9hrQR4MlMEz/bJBUpqSis3nYI05r51vOMrNg0y8SAT1LLWmplWwT83918QJ4N0KIGhSJR6eZid/HZ49aLvNjDJMFwd8pTNCe944VabTwQKTmEVnrtGD7nbTT1DiAnifbE8Cnn0SazXrUNL6YCRkXryV9HNQF4uiy4hApBKze7TDHH39u6M+wkPqGbJLYwGX7Pd7LQFNw==; 5:aOBD1fSQNhkDaWEI0tJYxXslZt2NwRHA5nD563ty9r9Etxz5T0toyHTxR0adzpD4krkmWca5qHlTJK4KaxKq1loWZmb4AwMGgXnoOqq/+zhO62jDUKgloJLIqEk9vIcoVlPnBL7Fve+wEgLdye0GB85aNUjy5XGTJSoLpKyF2FI=; 24:7TfVzfpfAnPi2zx3KjYLx2KDbej2WmkWO3PPeRXc09x/EtPhdX3ytWYL7flrstCmKlkxsVc1HK8j7kIyu6RoO+mBCMh/W1gQ0lvK4adq1fQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 7:U72LXB+YNqpTvoOzjTYz1XZNSxk+gGmJRzJ0Yd1pGwlkFwVfygnF2/uSG16novqQpMyf7O07wZkppPveYQO7W2d1IJXPru9a3YuWLmh6WxHtC63RbsX2i/ZgakHg6Sib7xrF2pz5pYQAR3cJJdcZxvVOUyUoGUeIfBqtt+meerXDninZ6IrnRPwAVYnur89CtwjS7N+NNWrmWLKVTmfWal/Y3AekH21ITJWg4hLkdHxbTideDz+7wuMG72mMPwF/ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 12:51:40.1005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 729c497e-ed4d-4c90-de2f-08d594aaa76a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 1/6] 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 --- V3: None V2: Fix build warning for mx28 drivers/net/fec_mxc.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index ff7ad91116..617e504293 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) @@ -1201,10 +1215,19 @@ static int fecmxc_read_rom_hwaddr(struct udevice *dev) return fec_get_hwaddr(priv->dev_id, pdata->enetaddr); } +static int fecmxc_free_pkt(struct udevice *dev, uchar *packet, int length) +{ + if (packet) + free(packet); + + return 0; +} + 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 Wed Mar 28 12:54:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 892193 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="TnCqAYmr"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40B7Tv5GJqz9ryk for ; Thu, 29 Mar 2018 00:08:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3E056C22172; Wed, 28 Mar 2018 13:01:22 +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, 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 65A17C21FAE; Wed, 28 Mar 2018 12:58:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7336FC220A0; Wed, 28 Mar 2018 12:51:57 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0046.outbound.protection.outlook.com [104.47.2.46]) by lists.denx.de (Postfix) with ESMTPS id 0D899C220F5 for ; Wed, 28 Mar 2018 12:51:45 +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=76YCuBy1y7l62vHKuRMPCssDdpH8loCsnJabpGEIkSE=; b=TnCqAYmr4SH2fgK9xgtPRKMEwm1aOH2aqABDW6BmemRUB34Z7tRva2BArQ9R16Sml5rwBthJxRUdHwvDB58PV1Zd7Qolw41T3rDEO7ulrgc6/jOPX7YoniLU5Z/5Ma41RV+aP0vrV++SRk+aOKoiKhSCUw5uTDvHCTiKohHiDVg= 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 AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Wed, 28 Mar 2018 12:51:42 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 28 Mar 2018 20:54:12 +0800 Message-Id: <20180328125416.28056-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328125416.28056-1-peng.fan@nxp.com> References: <20180328125416.28056-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0165.apcprd02.prod.outlook.com (2603:1096:201:1f::25) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7159f2a3-d7b5-451b-a80c-08d594aaa8b8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:EeyXXVLiuE7CB0DGd3dk0YjrXeXQLlMxPlM0xITDUDZiBcRzsR126050wHbNMN9BwltY8eBvAbFGVdgNyuHwOkswA/Aaf2EZYxCjdUIn6yK/HEbcDRQNZpH0H1zMCmLcpGUOO27WJrUhcQ23HinqpeXfRV3PNzLOymDipOkQO2RpSAumQVugejawWsYRntHDIl5obct+ehTJz9aot1ysqXDcPzZKHmj4zrGg5/kIFb3vJ0b5uRKKQW0l7pPs/9lh; 25:AfPxkudxYf9dPrk1IUZFDqnGW+KN+ExCqLxCZ6tGDjaGok0Mi41eb9o44zlyLTsFkoGHauUVuAUMXqQevsVZhhHBe5SW/f1GfXtGbxZN5pnZIFUvtHpDXz5jecA9OnNQ//9ZjkdsEdXcnZT+7YdXIOTzFfdUT/Fd6R70a6JiHYEOTiBr1GPsxvC+0iREKlX8SQ6t1ddKcUJXPs3NL+buh12VkoA0hFHRwlxpQQViwoyJJ9G96jTzXXrt31YkT/W5Hvm16ZG1tbKdn8DEdoylC9rvqF/IcsZWCl1BrVQGrXz/3sSZuzFhzcqTMeLlZyR6R0rMx3qt5ruJdDFNlAe6fg==; 31:ERUJQ8gnQehMRTYsI/KgfDH0pv1U2+6QxQrzhBmyyzPZm99s0nW5epPjh2hgbahzXUBhMJI6zxNeuKJcV/46OCQ81r1aA6eEJtVuX30rTzi+36SGPNTQ94UaItJWoXXvjdJalVTRwa+xE2GC6WuehXzXL8GlSYHcTPva5/oxn27CPaAo7AtMRj2e/mD7TSlnvHmct0HcU+BMzvFYrjB/Bzhk5ilLesLolRJxUv8Toc4= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:18JYIAr9bxgPaEYPXpbubqSsbs+UCmMc4ncfhiU6VCqd+sZlAKnKk0sCL3SEkqqFq4QyDHJ9+LAUz33xhy7EFrOtvtjKcJudRpgQV3BovrXAXqxTyFjCVLh+C418TL5VJUwCdVBeKpTsvQL6Q6CisHqiPGs1zmtkN53xLjYO51qs+aVWOT2Drm+R3CLULidiETZSVntpgQRyyC6icOOVe/Yp142HUGw69WzgrklHlUlJHxK0nOEiCFhjKYRyB5OpOczXPerFoh/DfMT5cHWBQyaXmmdTaf5YWe5HMRfw3pKcIs/MEikF7cc1oIFLrL9EUYSvun2Ahy4qq91Q2ZnX8rTKM0a3JZH5Y8sCVzlvfIA1Om8ow5IhxDr4IUVpGBXXHQlORO0ns/IErXFXxA3pdVOKxiVrmlZTulu6f/LI51ix3rZOP87/RD+ll136ZbD2hxlcU1Uv4e2ahU7Wv5mn5d4tCe8lCF78RCArM8iZxJwYqo2KwlmxGvMdzTlLdT4f; 4:Qg61VVbL9acHvOElj8lXqR8sa1Ap2hecgKVMRqphFkrkGmSmFfCiyH7H/Tbq2noSzr15pnVmIO2UVZsu6JcZOOSpSMBu/ufAiWolugZrapn/wTu0WGpsIY4yf/PyCJq1738jaj1INK8/hkjbR9VjjOiQmXaq2bojDEh0NNXADDsFUVCfqxVT5Jkaof0xk28uOAayJ+0Rwwa1E527YAdCRZNwwSq6loUsMWz5PunPKkOVIZoz9BeJCMtCgBDqTXOU3zhNSEevZBUoDB6C2/UtpwqD+PBbx7tdHiJ7HbfX/8C8sE+WiOBKXo+/hmarRAG0ZvxT8+9AT0bVFQMp4HnWhp/BrnDJFnmb8b8GKoaFSR0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(145744241990776); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB3218; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(346002)(39380400002)(376002)(189003)(199004)(26005)(68736007)(8676002)(97736004)(81166006)(2906002)(81156014)(53936002)(47776003)(36756003)(66066001)(2361001)(8936002)(76176011)(2351001)(3846002)(6506007)(5660300001)(6116002)(51416003)(386003)(16526019)(186003)(16586007)(305945005)(486005)(446003)(956004)(7736002)(486005)(6486002)(476003)(11346002)(105586002)(2616005)(6512007)(50466002)(106356001)(25786009)(6666003)(4326008)(6916009)(86362001)(316002)(48376002)(52116002)(1076002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:JGJGlJwmAmJpEleLgi10FTDr7QmEa8b/KTNYA9TJx?= XLIQtcrDjWZrCr1p/ZicrpMSJLnOhLlg+wLz8R9QAhTobNm1JHMeTQmskrkG68Nb5KNqyzquAMnK7Y+rOAh8T/3Rjeqsj+tAzdaUsvx9YY1Xu2DkIK4c7hNGkRZHAzNUpVaPy6fGjqpgq6pLhkxl/e27QJ7UYc/oweO6EWXS8Irzc1HUPhVzO5vNvMpBz0w42eQf2HHqhjZfY8PNQsqdSBopR+E+xPlHLiCz2w7do9yQPHFwLN5Xsqv9PuQs1nXD/dZZmyUDWqfqpRGdTiYvNCbHCwyBg10dbCUc9tRHKuyjUmzCoJ1j5IjPRVbNDSl4Cl7QJihvOTc7NbM+hO3Jb7CZAa1sKcAn2gRK8B7H2PGVqQRbNuIdG3K57iHVR0Imo1O/Zo1jQLqe9DkzAXZ+BP82NsPV7bMgeqtEVXnOLA5qxz+BzSOvKK6WxwQmZnQlTd18ADq8d8zNNdgh+SCU4pKOtjdhVEMOawYhuciN4p8HnUh3YkgQ8WBCHq9tESpEUcoSscvKoR3plecGN5ejn9vKe8ddp1qgbaqE7LO262fgze8NfmV3aDLG/wmXGSt1znMP4VCegfEBYgd7wZW4n3A++P/BRhsVIxoqEOA0rknoJ4eJ6FFTmtnhTDhtrOF35STsLbi4lK1Isi0oBNkaCAGbZgOqPFj26hpNMDPA+BM1EdXy8gkeTDDc0QuLvmYFYL3LgqNFjvqSG2Doq8lyzQZExoscxc/mvoCp+47NhbLWNtsE/8bBXzQzD7XduEyGMFoYmENyjZTzi++9rx+EQOWZEt9ksXA/dD5Q/2Pl0K6BbepYPO1u0DWpGjXFdu3ew5fokw4kxR7oApd6mRaho821elmfOqyN5eRA7LWgwNfLTfeP1CIFtESZ16Os87sTWBVPqBdBaTxe9L8e3Z/RGwY/yB+cNnJ3CbNMuXtgIhNw38v7aHQ6oyYpkoWqGyGULiC+xqHipLZmteU4LnQ9wcbvIOY2N3HfC65x3GhEPpkeztcICjRs+xhr36/gMJpToIvKBzV48a2HefPfXjSsp0o3p1YAfmU0o+Dtrep+H9qii5aZlZaLWAA8J+oRfo1//4GUYdZmaPECaqpL9+4VByn1jaDQ0uSVmjUwyMg5na2GDVsZ0BR+jK67KrVslnjcX/YYCBmkQFBBU8KY1Qgm+mKVcRqYSnwezjQlAFgmCj5Us1BNigGUCdnQ9HQSp2OUHc= X-Microsoft-Antispam-Message-Info: 7y4YdGGZzkfuyV0dCUx/aCob9TyXshW6u4ekxYU+HV+O99ZoCbpiALsv/uc6AAV/+opv8UnC50H3j/gQ597Ppn/7ahSHmpS3qAO3d4BAzkeFJBBjE0DlX7y95Jtyu3TkavgsJTPFTzU/wvU9+LkASBCnLkwZxC7c8o9kvE6Mmmju7svwjH34PGAtDQn8Nub3 X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:Bb2S/yeekd8sf1XTEFkZHczM9rmWnqzhoxEbzhtkvHgQk/Cee59L8SBZGrMQzALDzWwYuZg9PpaIj9nlrZiEEo+IEDMukbacO4HDnNZosQP5qe4/mLy6lVvbeOvKHbPph04Heobm/p6KD5u8FcxnvGbA1bXXsPND8UgmZE3zuDBDgiGCwA5g7+zY0Yyi/fB8xEyFxUGAfbaNsZV3OCMBVT//auHCdDmYqRJzmLUDL8CY/+0rlkLsJhSDIem+E2E85wT6r0dR6BrSZ+WZgRiIkHgQ+Xd3PHhCbtXFfDPMEGRbiaL9nJvtsRqCE0zwjqAdc1rAl6uWnYQiamlhVegnzioKfpsmuWP5qETUf/lThGnhyj+2G08aEfnzxsTDiynqSvWcYGoNTXxPT0zFKHus+Hgu9qqJU6T5KRmk1utFeL5UO+HGHcWyO2iW1IOXcgYoenbGjU6xVcsI1709LzEW2g==; 5:26XM0sPZFkZ+1gnW1yzpf5InoNSfog8KYa3M42oFfGT0C5M3jXUrKSk/XvqyZT4Cohuq3PwzCyoJr4L/CTERr0B9WDIV5m6CXtDMa2xxFHJZNA65+oMMOFwnGQMZrh65HV9WZfwgp31mj/6+Ej6d5N3TTCNx5cp/lSCHkFGJjCE=; 24:o4VKBh0bnTwtvZk3KFsJMtRQ5aYgqXLnBfL3GXpG51xx6kcOTjR1ksdViaS/bkPtnScuK7PCV6nbC5lic/ACVQf/FeVaVukmJX+j9g5R/Js= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 7:avyGErmsNoEpsuTzeInSyULZxGa9YH8nT1f6RRg2ajYoHvqrIFr/eewaInG/6j3ita4dY/q9+R/XenGft3Yvw/lnX2NkcxKPW6MElhtCR+uoZieRtkETaIyER8vYGq9RTWUHQzqO/6y+CLAMexEd8UMnFdfamNM+NJQQEqg9wnv0G0TlRQ7GZCDkwSBFIZf/Wb684Agd+f/XY6/4jJ6JXVvU95RChZMV79O25jxkRjgNQ7eX4x0LhKBKEvnPLvEa X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 12:51:42.2880 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7159f2a3-d7b5-451b-a80c-08d594aaa8b8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 2/6] 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 --- V3: None V2: Drop uneccessary ulong drivers/net/fec_mxc.c | 15 +++------------ include/netdev.h | 6 +----- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 617e504293..953252a92e 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1011,18 +1011,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 ethernet_regs *eth = (struct ethernet_regs *)base_addr; struct mii_dev *bus; int ret; @@ -1282,7 +1273,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 Wed Mar 28 12:54:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 892212 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="mRQEPyKa"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40B7hq0K97z9rx7 for ; Thu, 29 Mar 2018 00:17:30 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A7060C220D2; Wed, 28 Mar 2018 13:16:18 +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, 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 A991CC22162; Wed, 28 Mar 2018 13:08:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3D65BC220ED; Wed, 28 Mar 2018 12:51:59 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0068.outbound.protection.outlook.com [104.47.2.68]) by lists.denx.de (Postfix) with ESMTPS id 278C8C220E1 for ; Wed, 28 Mar 2018 12:51:47 +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=gm8h7AU9U+M4pmKarfhByCbq0MqCMQEToqQHb7+gvnU=; b=mRQEPyKajd04S22w4ONI4AFTA4vlKnlFdLEfYlXK+BtSauk6sriZYDAwBndm8rOrJWtUWRdtJSr7kdqGX9xOxc4bqE/Pa0wH7o1iNUQ6j/WRa+dqx24NiW5kUUvia4WB5ifPHxXnuSi9ot0CdWFbqf97kHmnZFLp9kzRQmTpJLc= 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 AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Wed, 28 Mar 2018 12:51:44 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 28 Mar 2018 20:54:13 +0800 Message-Id: <20180328125416.28056-3-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328125416.28056-1-peng.fan@nxp.com> References: <20180328125416.28056-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0165.apcprd02.prod.outlook.com (2603:1096:201:1f::25) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d35f5de5-a1a7-431b-ad40-08d594aaaa01 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:fkDHZ0/pGy7KSSZDWF9OTMzn9zHGjT0xYFEaY1bYmkwDV4S52Q2p+yovpI+H+KZKfCJePrmB2Nhq4bCamzbsG8Rm/fJYG4tgq6JrnIk1x9mj3YmZYizLf+OLqdBAbKYS2DRu+E8TeYcTaVZcVB8nkZC5DSnmqLN5vFoqjqsRKSXA5RnQeHH5j7tdSijP2ILsrk/pCBAOZWx4By3ljLc2mwY37XliSLxsR0whnN2ItUgrRqDycat7AZK0CBdycVrP; 25:OeKjPMafBAwTSdHuggzx3bw1coWUOogIX9JTFyd55x4RH5d1m8qNbmtn9JrB8tV5u9TwoIJfxomCGmx3N5fZ0TCIG9UShx0UJUO1gEmRNWw1/T/Tj9qKLKc3PVBJMcvVlYjV+lYCy3B7j+lp5+vaBBLEPI8xwy4CfCCSI0w8DeEiXD866LSQlS1Ll0OIzXtFsEIoS3bS5FEcpo9ulvYYYump1BH8NRwL10s9Vn6mvC/kO+aItIJJWwYwbOgQbQucnfC7bxVY377IcyAQ9DFvgvLTk9YINq1X2Cz6vkEwei6QHyUWhdRkVfn7J+eQ4gFFWcRAFL9D8zyHxju4B24YSw==; 31:5543p5htI+I6csLCRreHzVOf0vs54csNS6qCtt4WjFXcb64RuA37oMpySFvVw6tLHd/qJ+qwrmhVOfuRwrKY6o7Ug7vhDT4Gw42v4kSUdrvEXBvtra63Sj5pyO+jtdmUr8/Ofw5CTJky/zTzNrouYBbf6NgPQSa8jnAPLoKIQXEozHXw0AQCiMRi3KYbPo7/b1ehC/TZveNiLVC2NeB58qmZshLnPPThRRtEDvI5FEU= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:rb+GcuDZGpu8t8Zcxfmcwiy1qXJtKXPsbDNH4wVR1A0km00LDje6nrW35v2240N4gqnDnyyl7WMmhO9yEKAuE7TZ0idTS76MXMHdLzRb9ttDi3Kd1K8FQ9FO/A0X7i09jwI1wvk2h7RSDaHNL6ZZGCKpFp05pGseXSXBNDf7axJ+cLWa9kGQOInOkrk/nZvzhnapfWy/B5NFwafrfpEJFvzxr4em6QCSBOS3O7pMKOSgR3QCJMlBZiUE1Cq1ruZx4H/w+CpEsLiilGbPDgMrb6J1bKkUCPsm42fjVf5ArgSUU8ERVkP1FePUvKSojYjjDgvohkSc4mE4e63FjjPu4nf8vgztpEqIl/rUP/puItgdTZjLz3n0CXvFSHL3eo6Lvf1ckvyWuTqLOU9E3XpeTKl88yG1qoxUH0Nna0R87Hbw3yMntRS2mArXs3zuSKI0L7Hi+Fn9FPXICyBj/bdz9djhz4x72A6D+N+3v8EhXX4dMFflQ6hSlLADtH1mvmP2; 4:scOVSKqFlnv+M2PMpgWJN+RdmnB4cLmcxFqrNc9B/6veGr3bbyq3+tINj2xGllm74y30HgzVqp3swYze5YajD8Pxyg5tjrvr4vKBQH/l5CZKXrRi3HqVqPKCmb1oueo/+lyYKrWuRTx1iyIYrLQXh1kleRmjIU5JYERWFc5ySnJV5UZ4FIlBsxp/f/rlZKhakAQdnGPpObkqxAnya3YbGeb2RjTRtssbPki1EGoDD1tghZ3RYXwlPnpCUbfXQg0N2gh9BF/Mdche6drQ+GKHpeIrUzXee+gonceCouB24wz28OyunWDxrJNAFwpzhH+zmbUNbPc8r+WqfKhZR0chHQs3YqRRXxL8lTXTFTB8/Rg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(145744241990776); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB3218; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(346002)(39380400002)(376002)(189003)(199004)(26005)(68736007)(8676002)(97736004)(81166006)(2906002)(81156014)(53936002)(47776003)(36756003)(66066001)(2361001)(8936002)(76176011)(2351001)(3846002)(6506007)(5660300001)(6116002)(51416003)(386003)(16526019)(186003)(16586007)(305945005)(486005)(446003)(956004)(7736002)(486005)(6486002)(476003)(11346002)(105586002)(2616005)(6512007)(50466002)(106356001)(25786009)(6666003)(4326008)(6916009)(86362001)(316002)(48376002)(52116002)(1076002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:aReSjhxSJjLV1Zp3xZaUCznYjUivn+40QPIpfWp/8?= qApUPNjKOkQRzOFS6zojTtTw0zkXYqkmQGtQNA/CEQzRoBZvTAfspnijbo1l+fp7SxQd65DJ5aZL1OyevW6pgxaPG43WaK0hGH2wHPhuOAuQ992h4mxbhAx9+7NOsKul4JGQMmWfWSgxpdypnaYtCs9MSni4aB83gL/H5WZgMnV7470z42wcAfHWpDZhiF0r8udZhJbU0VdpSRzkGoivstf/XIV7ZhPs/Jv4FtjBIS55OQeMftBc6MKVGVCTNAJHvNaV/7GpI8qkWAdHs7n7Ev0nzStlmkj+l/bSF5xu0pWSucBfHjDQmN2ObJSVoWnpQdyz+7yzEWWWInKkUaMD3DTC4kP62Tne9nz01C3H/fWnOBVVuCvz4t/MMjrlQiXSMn/18FBU6Qo/TDMZtCDZC5JEA/CUJ9ESOd/DSp59cENwqvhW/6ryR0gSBmA+QDnhmbP6ztEARB49nRR/bPCk9TrjFFytvL5YqC6zHYwiVZqja9FJ/I+w3RBIQIisRYTfpL38vm9ogPLfT8FI6JwxlovV72uw6dyybFt5evC7cmSZBmdL98l8rq3NskjZpqKSp8MvifJDxIF1DFGrYyJXNKu1Ytr/nkv81W2OG1wEYQy9l0UFk33TxFet983OOGxmlNvHXaVrrJ6hX9ydS4871KNvgPdmncbkve3YGCYGkgyR4AoQrC+dHA9RuN0lAuKBMuyENSolYEk6XAe2NvNPIiqoHrtuj9l2zQhImz8b/4pJPZPwb3Dc72bkHsT+H1i4DxvRd2qp3k+Y7rEXu9OOpbRC6C2jCBZKrL2jNQMPAojk3pKy7+iwK8+rzNtbhpDMpAkCOCP9JJZyADbBWbciO+4aS9GKsndfnlp/6zQ/vC24/ev7HHf108XeNkRaVAeeZdKTqH4o98PA6zGAlNSJBwsCwENNlFHszh1mrf/KszRXzQ1z7o/ijR1jGQzbrepTkQLAsZ6W1CVQ8s7OpsexjLu2QKgGWU/dLEZL1PnqD9Ci6nYkNRkjuFDJGgylBHWSzhWsSoSk9SBRnwSXUtjEJwMN06NrXHLC4Gsthh8FCB4MCYXUqhLASc3mRTX+eLQCZd+CCzOvOYxnguZ7M/y8srX9dGwmEunPy1o9JKLDgbe3FfcAq8lB1EnPWtMlxG3n8kAHFG7GIsz8jS3bkyqzz/021yR9c+vGhL/n7Km4+zP5S9jfsnERGOvmTDQ2VjCWKE= X-Microsoft-Antispam-Message-Info: qJ0DavbfBo8cICMCYtVxNSBF1JMioSnIQxoRyD+pGdbjzev+wwQE2kB0zyvzZdrTFpEuc/b7gYmCUZ0n9Pq1vvMaYgbk5jjuHHNtoOoPfnr07O8r07TNdZmdmh6RUxijtXKZ/2MK0Dl9BAAsMtfqXq66f0pCFIXtH9/bJIRVldMTxiI8ceqP3GhIvagdOBD7 X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:NlswCyIdwn1YXrhdwz9MaD33Cqej+eTIRlqiKsuVj7dEFfyoWoasp8pmw0AD/urx43coqRzA0tcyEIGsbJcDMjFHigLCvb5D0hrndjZEd5Eqia2L3paUmws56phKBmROETPDWsWh77H59VsPB0O6rcaZxseLFPGVlQTWHsqBpmwcCG8ZIfiHiUC/IVOFlgKv4LyavSuU7YO7T3Dr96YGwOiOLE61GmDpfohdjF3AF42/JYbOnPEb/2W4J1IEYEn0B2s0DJ5uNlhnT7HeLEwl91XKAB7yNQUbZAbbfVn6A+zcnYq3b0ektYpSbRpSrD7ZYlrOJ5UgLU5FJTFF2ua3aEz6XEaKPHjgxv8s40MAdMy0ROvTXOWLn9dPt1doizwZd0pSBuUF757chvX+hO1fQsw60AmFUYAar8+rNWPIIshpDMoeoBgzrIHEHbd2nhrDqkd58/hjclJN64IWJA42lw==; 5:c37+Ai/hczr1Wo0f4iSTusdL2jEo+Rj7Fw92+l812bIcn4GDI3w6PjTpq1D5pm1CaCGnfxU/oQlD3Sz+oAPLNraBzwa0LRnXLalWquNxOaNvgjFr9Pd9yNtToGlEGvWugTOkKAE1fSIDTSom3WoZCN4tvT6pZlo1Rb0dSn86xtA=; 24:Pwz6FnsyBYpz20cV4/XH15nu+lWxsDSyfDWCi14uHF74R131d5wVF/3tiYKA1AfKHUSFe4ZuR+puZ/eCrpBdAl3HV5UICpkjrGM5hLl0xT4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 7:A1FgoRi3SfPubOsqWjr+py/WWgN1WdKlGMtTezpGmqUFyFytaDA6HxJ/ziM84n/PrVGXGSjPAsM7MMCUVcycI18fIVq7miQY+gYamRKi8uXJZXTKIsdzXzlLhhcPIgH2PzlPoLc11ApFQ2WC8sNcN1AvqYjgUzc2R34tYntgRwjanw2rgspXwqDa/eaW3uaSwaY8QPNl4lhLsI1pGHSlSvBAi8vcP2BdrYZ6NiFxB3o91XWQoDeyDC7wp7iKiEaq X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 12:51:44.4599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d35f5de5-a1a7-431b-ad40-08d594aaaa01 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 3/6] 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 --- V3: None V2: None 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 953252a92e..4f1c906a72 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1250,7 +1250,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; @@ -1271,9 +1270,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 Wed Mar 28 12:54:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 892216 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="n9aRys4O"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40B7k143jvz9ryk for ; Thu, 29 Mar 2018 00:18:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8A565C2210C; Wed, 28 Mar 2018 13:16:35 +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, 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 A1967C22150; Wed, 28 Mar 2018 13:11:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 269F9C220DB; Wed, 28 Mar 2018 12:52:02 +0000 (UTC) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0045.outbound.protection.outlook.com [104.47.2.45]) by lists.denx.de (Postfix) with ESMTPS id A22CDC220A0 for ; Wed, 28 Mar 2018 12:51:49 +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=RqzeFPnrm7p79zC/icNPXt1jn9b2MqIfFKTUBxEOecU=; b=n9aRys4OYk5N3iJt3YcnBLj3x5jgSG8KXxkh0/K4d7LFIZcoEI8VhrQet6+mWDj5rw36uCm7at5X/BCBT4iEFHsFxYRdcCHqdh7U0DyUF1muO1t+y4SSjBNRUVzQ3lYNY3NBJ9vmEYYAPBclFH9xy+vAtRVp9rwDyYijW5duKsQ= 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 AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Wed, 28 Mar 2018 12:51:46 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 28 Mar 2018 20:54:14 +0800 Message-Id: <20180328125416.28056-4-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328125416.28056-1-peng.fan@nxp.com> References: <20180328125416.28056-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0165.apcprd02.prod.outlook.com (2603:1096:201:1f::25) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 8e8deafa-6cf1-48b4-603a-08d594aaab99 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:NmeWvJrYYKOQG2zTqMAEDvWUJjAVl9yEhOYNY4LxnWz9mOk7zIckfhUCbo+0BHd2f1MEiOLSPmId1D+jw28pZoTuuInWDWqFAaBfHAXkcALlZ26XfXGa3knG2hZhWX6v971NfQU1eDC6BajfbjIynpIOWQIi2Uc5+BOy3CAXvC4EqXVE3QDz6TrLJ54PBDoYpYT3uQ82dbvJKJdPKoE2xe/D6rRP87DF0WCG4vTnTfKT8DkSW6LORt0Kva9TvFgI; 25:Shcsrz5OG0U6HSCt58vt6pIelGKHmDulXBT8uybbAntSO0aX4ExOiboN1Jxu/Tne17BhdUnQ4TCwLwQ8I76RWGGIexbs6PLOkzDqjGgxkMcKpjxLc8jyzDtoOhAh7IeEQZBkbfXX5KlSc3lSpP1CA5ZCq61c3XnKZLu7G5U2Sh7xr6jlDVLT6dRp3TD7Fk/kQXMRKAPnTIxQJ3Ix6H3l8DqcukGTTkkeY+1y5bNZ4zxHv04WL8uYL3U6VvsBbZwTSyXqrVvtqhxHGPgTAnXtSQPggwYnA+zb/ZyxjY2bkRh+E6RyjB9W+xVX7N8QVNsZQXEDVbO3jfiNXn22u8Qg0A==; 31:g6K+/gtYgztjshemU5CkxjYiXQ4P+LJNUli8v9WVGXCta6p2Jy3w+zXJRLXQaX0e6W7ve7+w4O4P8W3iCf7aD04RcqyhUlW2FJ/YbA3hC7DuZIwF7Dfp+LGOiCOfOGWKcEl2OGna3T0loo9w04VDyVglpuMqnE+rc2dV7030VefKj3TsROQxYy1rmtHQEk0wQm/utjPG8JpuvqThk1y1rgzS3KrAw7hJHgV15AQxzIA= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:4bGglryFOXtTVvxwX1jxrrIIWj3+IDVFOS2JqwIKzaexk8ylAWjh4WX0eEzsSi6TzxfE9L0+YGGkJwi4hKJJj1FsKXTI+6X95ypDB55GMvW7F5YthtwIj9LCBM12Rc/umXUUO92XPG7aYSEgOJvharQ1fbP9Y1Bt71eCCukYMVEuB5urEzc6CGowQxaA+6JkMSptWhsnb8YdgxblcpnwlQOdCNHODhWgHrU36zAbx/cfpt2OgeGc43oiBHxgtlmiKvhw2XaIC10QiUHsbFUImcawTCgmZxlT2AleMomPNZea9EXMyYq9VxR+5NAm3wBIWfvBIQhVm3ogLYa63FbY73TjyUcuiM1gXEO0hQa7VDZHmQPPy5tCReiHvmP91GfKzEo9408SJrXOe16ISGJ8MO2AEXIIjuRp7SEGNlHFCrGzkiD7gzJU4DpssTwm49kfERTjO0pIwjX65sa4hwJjxP9JCTx1l9spJpU4wapV1eajeHuFV5BMMG4WIRzRhzU2; 4:iU8HULpm2bTicPIhqRh4p2Pm8A/QaC4QaRs4EyCUPO7BqTSQPXpnaDSql0I7lc0ucxJZGZqzyZ0LPI7DsyIdBQZpZSLqESJTYlxxwFgLrjg7Kym09JypwBm4GDiTf5H/GpZArBiFN1pW4w860MGfVHlhTC2ZpHUCrMc2pgAr3RDeAD+KT+/xwj0/AsZVLlenhhIl1EK5wMl+gTUnTjswVdJLENhiinwHfZRHKJHz/Hful8JkHwwNgKFYQOupMOmGaGGSXDwSEwe3Ht5fTWfQZoTVYPRzyiJbf0NT0gtHnHmqZNHE7ZfsnpB1kxcQJN1TkMAqI5VI+0ITFaRtZG0+8qufNM9iEjCbgUVHksEjPhk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(145744241990776); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB3218; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(346002)(39380400002)(376002)(189003)(199004)(26005)(68736007)(8676002)(97736004)(81166006)(2906002)(81156014)(53936002)(47776003)(36756003)(66066001)(2361001)(8936002)(76176011)(2351001)(3846002)(6506007)(5660300001)(6116002)(51416003)(386003)(16526019)(186003)(59450400001)(16586007)(305945005)(486005)(446003)(956004)(7736002)(486005)(6486002)(54906003)(476003)(11346002)(105586002)(2616005)(6512007)(50466002)(106356001)(25786009)(6666003)(4326008)(6916009)(86362001)(316002)(48376002)(52116002)(1076002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:O2rqeHRS71/OXzpQBgFuFk5rP/3kCAwtxFfCRhZqc?= X9mWK/oC93+JJDIZYWVCSuyM02mguJgp1dRLeA/tSmY1IJhTfeVTDF2IT75+0aNPv5jUx1k3/8pna4op/Uy0vMLbGULXk3uxDl+KvdY1gLgB8CLHEH65cQ+QkKneubZL4lJEapFhthiSNDTzc3cK/FkZ6D0fDSmOCiJWQm2hkn2Jf7dW0fm/GjVB8Ncx5SMQ4odeI3kYTm3uKyTAWl76NQh0QpcNfBOPwtlzCe2zRdl/Kaa8WDJsqy+lKlCpd7QRPYp+Lt9ZHKiqSX5tAH96bcJ5mP/c2NPHCCw+Wx8JC8r4Og3lsXJjC7ut/lGw2CEOC9e83b3XWu425Z+Q6IO5W4aH7hroPEVS28EFnSftCYcOfODqZ8X8JroXyJcYNnZoSZnlvvcvqz8uxYkOF22/zyiMD5nUXUpMWBLJndbveO9u2MXZIh3LZmAUUpUNE+onRqnNeNNuwznzK2jwEh9pbjy0FllibdQoWXsIlxMuXKM3b9GgjcJUumYYwJ3w4n/G3hE7rEl86CCYXWeKWMFa/Arjl7dLiqEu5vYDPJk22ht/BYp6A+kj3rsykROn7sj0vT6ICMPOew71HELOkJ5Y1IubhdlnPOeKn+7oHMXdrffoTT24P99zWnkRKYtijqUVEr1ER2TIGi8G6ddtY9DS8WkiYjBmfqD3LyPdBQLPHR3HPbnJK7OhCa9FlOTvSAZKatm5EFQ3iNGPvZGV6FbgA3w8Q7TrDF0QMbzyxEXLRtVPRFLtRnx+oQL5XZahtYSbNPFHfDf1hFBKX28kFfaLgZVdB89wu51fQPRRjG57nSBdqzoDUlLKAHsLhmBLmK0JcUS20BjxX32La8yLnyM2FGilJMahwIgP46Si4NUISlQ5w74SBLiC4Geu2e/uBRW0zJoudrJICcNpd6O9xvHlX8enCTHqWxBzYSJwzwFVEuyO2sH/97mGTG8APIDyHtBngtymyHaB++DTxEWIv5+e9AyyEPM2nSKRMzBozcSmLt0o6/Ttkitd7IlO1mG96LHrf7snydEeXobb8pEtDmXnQvHdfS6aB3uQXTvueGWhOtEWCPDjXH+k98xv9xeygGPojcBcIxfKyBnAxWhRwOTtZY+xOtgH+Qjl2uFpZiJ/3s5I38f4gO9BId5ozc6JhNvrGbOE0+oXLebydKr+rltO1ykh60cSGzJzNY8qOzHnoTuUfoqOOMVO18r1ixFiyB47V6AaX3qmpTwJ7mQ2zxUcE9vqAoZqdTCbVaXACNICa4s3Q== X-Microsoft-Antispam-Message-Info: KIEtjR5wNfgEJ47J4yKYm/s7ZioEEpXeULIt3/v8sYuMGBVGcCVXmm/y0pAJ+4axPiYAUUGbSO1LcXhrAtjqxuQm/pY0KmuV5hYH1+XvH5M9vvrF8eUSYAnkz3MeCnjrBCcSi3LalQ5Dhm2lV94U/MQCT1JsggpcoEHkYbHYMqPLYuH5+aknNLeUoqoE22DX X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:WTumJUJz2561BbtGaFQRuFtaJyVLm0cYDvSvjN25j2ezxpuM2xU1At9D6qPZ9ZcH9C7OEmxcNrcJKlyjIp24b5o6sNYinCeD5X6Av6ven8oA8Cy3wQMBcKLfLCiROG+w6rqd6Vs394rAssJuzp/rUt80l5Q0WTqh1NuQ9IHqvnUi6yUoNMCdTv7KjJRwBQBRS+mW2o2voyQRU0sdcoXwcazGGkhP4dYY5OG4Ma6E1hFalaK70Y2ifH/2FK7FLh+LijVdZdl2Q3XPMQeGNpH7A7QGlIquQevmNN8UMOgwsaY9ERLCtw7gizc0LNyDAAcC3ZcnCLnPEwQgQJNIieJWKAx303YGysgZ1GM4OU/hUVrvpu+o6aSp+mHshkp6DJtQkeKtF1hU0klFy9SueCzUNlIvPj6KL/pjbbyoo/BOrKZbtCTtdiMq4dQLHq3pOnZpUKby1Hy2TaNshDVrF8Ex3w==; 5:DVidbYraLMss48sVgyUHPdB9cavlGvIDo5OSHY+ar+/3adq/+uQGmfZVhKZjZlFi8TjLSH9RpQ4MRaU02yQmGefy9SV/yN9dSpSiW0nkNErOXA+3D6vDtDsp3CRfMqT6NGjJwE1NnViaWJa1O805szOjkhqlaRxMAlqKUjJHidg=; 24:VnJEYWIHYMkeAvOn27ixeVt1L21SPOOC6qJt6lG6AWoyB0RNP1/gUGl5I6IvF0dNfLtzyQ5TPFDHyQNglTzIvojzHzjWhvgMnembdz0GARM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 7:HD8dp1Nu+4ZRdUddzvc9y5tgnbnqZzCqkx8dZPMoHeKuMO7m/LPYUsDvk6YhBBKDuBUOiTvva8WNTk1pgQGvDB8Mxeea7UW83uXmT83l+0bROnm5s/e335VhMdyKu6PAhve9ZMb//GtjBB7/N0fM0zZ5WGPkgvCMVMg7Sphni1hbtL2ftfvKAMWt2Ml9pS9ZiGD+Oy5wog5COg9NYmu0XNdnMOASTZSaQzEQbWmqhqz6e7VsAERZbWtWfCYxiTsI X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 12:51:46.8037 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e8deafa-6cf1-48b4-603a-08d594aaab99 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 4/6] 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. In Kconfig, user needs enable CONFIG_FEC_MXC_SHARE_MDIO first to enter the CONFIG_FEC_MXC_MDIO_BASE. To i.MX28, adapt to use the new config Signed-off-by: Peng Fan Acked-by: Joe Hershberger Cc: Fabio Estevam --- V3: Fix build error. Add a new FEC_MXC_SHARE_MDIO Kconfig for MDIO. drivers/net/Kconfig | 13 ++++++++++++- drivers/net/fec_mxc.c | 8 ++++++-- include/configs/mx28evk.h | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index de1947ccc1..c4cbe34798 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -147,9 +147,20 @@ config ETHOC help This MAC is present in OpenRISC and Xtensa XTFPGA boards. +config FEC_MXC_SHARE_MDIO + bool "Share the MDIO bus for FEC controller" + depends on FEC_MXC + +config FEC_MXC_MDIO_BASE + hex "MDIO base address for the FEC controller" + depends on FEC_MXC_SHARE_MDIO + 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 + depends on MX5 || MX6 || MX7 help This driver supports the 10/100 Fast Ethernet controller for NXP i.MX processors. diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 4f1c906a72..ba66c2f95a 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1145,12 +1145,12 @@ int fecmxc_initialize_multi(bd_t *bd, int dev_id, int phy_id, uint32_t addr) #endif int ret; -#ifdef CONFIG_MX28 +#ifdef CONFIG_FEC_MXC_MDIO_BASE /* * The i.MX28 has two ethernet interfaces, but they are not equal. * Only the first one can access the MDIO bus. */ - base_mii = MXS_ENET0_BASE; + base_mii = CONFIG_FEC_MXC_MDIO_BASE; #else base_mii = addr; #endif @@ -1272,7 +1272,11 @@ 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; diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index bc58ca5c62..79d4c9b2ce 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -65,6 +65,7 @@ /* FEC Ethernet on SoC */ #ifdef CONFIG_CMD_NET #define CONFIG_FEC_MXC +#define CONFIG_FEC_MXC_MDIO_BASE MXS_ENET0_BASE #define CONFIG_MX28_FEC_MAC_IN_OCOTP #endif From patchwork Wed Mar 28 12:54:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 892214 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="Rj0dLDXD"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40B7jV0mwNz9s0b for ; Thu, 29 Mar 2018 00:18:05 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id ABD3EC2210F; Wed, 28 Mar 2018 13:15:15 +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, 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 B231FC220FD; Wed, 28 Mar 2018 12:59:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0343FC22107; Wed, 28 Mar 2018 12:52:06 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0043.outbound.protection.outlook.com [104.47.0.43]) by lists.denx.de (Postfix) with ESMTPS id 0E337C220F8 for ; Wed, 28 Mar 2018 12:51:52 +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=i/xtMqTRjsRdW4ZjU0IP5Y7sHl4KpkTyWAJ7M03u7uk=; b=Rj0dLDXDcJnhGZSSnzrvcbiJhBbJW/Iou3jLwaUMiJY4r96WYpaOe8ccudbb/BzpKLRIpgPHu45xwWDEAdufXXCrWmCvCxgj4ndxadP+w/dpNyeqvf4o52gaKUvJbCZAEvvrA4pjaaFdlDUxUqMVqGav2pZXEnrLG3KJoLhhZGM= 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 AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Wed, 28 Mar 2018 12:51:49 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 28 Mar 2018 20:54:15 +0800 Message-Id: <20180328125416.28056-5-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328125416.28056-1-peng.fan@nxp.com> References: <20180328125416.28056-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0165.apcprd02.prod.outlook.com (2603:1096:201:1f::25) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f7562aef-bea0-4db3-5129-08d594aaacee X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:hbbGdaFnFBg9ISlP0XqA1eQVR0MG6dGI1jPQTZqyzK6K239AEFHnPja37uqLUh4Csm4Gnf3NuXAYUyuMFvnySnhPq1XxffTRVXVivLn+vboOinW+C9aZHtXwMSXYLO9YKA6hdhMaKEeSy6YuoAS+MHAob9MVPVEszOw6x+hDt1sXZ2k4UsHlnVIfOHyrVl76Wuaj5V3ufkWDjCzS9QaqS3fKRfn7uW7lRF/Qy5tN/oUynWMdaSCvmLU/yrCC/hkh; 25:m35pKsOp0+CYPyv6v6ef55t08y03Zs/gTZ+uURsqwfGFPATLdvHKjaBgtrcGGkDa6+9MIihJbr2PpZOPfRMkhv/4cnntX7itTDLRb2YLRqc9QaPbA8IDidqJVrk+g+WKilubTKwakS7BI+SpG6q30JBdR+XP+iJZOQtwFAgjR/r84muUzpOW19ZqKLef/zAYk8u6Ykw3kxLBqfb4nCoHnAfbY+M8/j3wpl6hfAQXfFJbPnYCu3zJxI9burHP5Jc8UriaLLJVWsafYzu994nl9YcCLJqfbau52vq+a62AQQvtPVTBYprKdxBF3MyKBFYti8Y9I6+10F9/d3ighUhq6g==; 31:IFtKcDTyCmb2x8iWMPhrUurQX6Asx5vncD5tZJrOIAVbV/nz4eDLJO4IS+w4jnh1zUqxxmd4EcpO5Zg3w/Netzogf/ue4xvITKiIO7JlxbU9udpxdfh3Eolx0COXILr3Q7i79HjbS/A+UZ51c4XOv3mgGo8jOTqHHEDzoMFVGqm1+BqHDQ1pNp8TQywrisKaHnrNNjoist8yIjPQNlIPuuDAUwdIbDCSgErJZ5YnpZM= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:LFrlXaBLKFHIHCLz0CJ9nhzBTDM8O0sRA8S+hZZbJ38yXYP40uZVRPjUpQPLCG+FrtJ7PtDzvUQCNuAwTzOCnb91zlJpQHEFZoKrleDNleTxsjMhspyELjA1aNVSeyPg9z8Z/nCfJKJWB6zWRwAthVj0hGyHr300vj1nZNbPpmwC4FNcVlqrV6JotL9Kfw4OjlS2nPR9yKQiZY1GMNwjYroRRNhh9SIA3wVQA5kKNrEsLXA/ezDLGtuYEI49THfdVBK4usWPI8/4s9rAw1OY9L8WD5mkW7WZUon+XYw9aC/tC3O1VlSgHZv46tSz70uSU5CfLGyTftGtRNr59Cf8ThWp5VILDUPuOTx7GemJIVKgi7wHxA1/ZTSesh9YwtRv3kaqEzoDmDd5ceGuhwBbs503LAqbz6jXjL49px05WXgpM19Z0e5Q+rfkmfxLoSO7QALvww0t/tCbhlko7ZaFDjVIk3hl2qu4qZSp0ioTy3IH3KFe77L819xyBlx9E2bT; 4:xFh2U2TijpX9NxA3OQVJA7tBimQfndGhFdhhTNs/al6EyMcyZz9YlCzIOOYvnXBVTi2mHcWwKTKEPuYTmeLY9KywCda4mg7twDyHnDv/pfHJ5UpaAzMvKRibXsGUDu7OIEDAv5MNrCO/zWpbcZuXNT/l3Mvuojj6VS9nxWX9t/dZlGUurt/46jkNCY4mjBhKvpx1ScwHkPUmL/A3LT3zCgzxv5BxTHPAirUVrb/ZZGlRZItweIqjj90pV4uC2eyTLMz9PsRKiTC1D/9IFUf12A9GpIHg0VGLZwbGkF+ilFSPN8PvDBTUQO0OLLGvmzQorZFyoaQxonSTM0OpK4PX/7UhW03Rm+Tr+xpn9btxstY= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(145744241990776); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB3218; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(346002)(39380400002)(376002)(189003)(199004)(26005)(68736007)(8676002)(97736004)(81166006)(2906002)(81156014)(53936002)(47776003)(36756003)(66066001)(2361001)(8936002)(76176011)(2351001)(3846002)(6506007)(5660300001)(6116002)(51416003)(386003)(16526019)(186003)(16586007)(305945005)(486005)(446003)(956004)(7736002)(486005)(6486002)(476003)(11346002)(105586002)(2616005)(6512007)(50466002)(106356001)(25786009)(6666003)(4326008)(6916009)(86362001)(316002)(48376002)(52116002)(1076002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:SeFvsmOPBUoE8LR7YnvKj8qFYRdw3SnxMQwAm7UNN?= cOOgK3A4Pr9GI7pQES3DcDAJbXSO7FWRTjC9weUYMXIyDOOBYBATMwoL0U+BQD42qJEC2Xn0Cri0OLY0RXSHto+MS4nO1InCCP2T8rdTi9imt7dsTPf/gvq4mBWB1zxSxksdYkxpYukYv4LYMQjhuFmgT9HzoBjprmVmsa7LRLRuwKUmPlRAKKzK7mTuGyggwYfoL1JZn/u5MHJc6TPZzhJM4Jd265FeHb0sEEOy3K87+5kJYhudSz5zw121oofBeWnMBWIdMCOAPZmr3rPYPIW+YiFk9qHBbV7TjKQAqtMM1/+fgWRU0BU1Xgs8ns6XqbhbSKrBB7gQQcO4mwn46YcZi+76SZKj7uOtfZ/Qn4BNdMAplBJNZHk2YCP3YlU3xFDy+tRYG/Q1P2mtelX+8srzvFyEgwzcViph4e2kMp1MLma05oGX+aL4txO+XXWpRn3C1anyjvLXFjJFWkm7+3gy1dCh/KjZxd7NRomOWQ+PbYCQuGGfg8EZBWr5JmN7hA9hjspp7tF79Antgp4/4BJ5oN7u7PJm6PtWc8jUq66pnKYTsKGYxU1YSyYvjj19nlG5LUv6GzLOrN9kgPrnPfnoJ+Wyp5gmvFsfRs5teqJOsm+c267a2KwA6EQUVaM2WRdXKqEhLCYWoY9UgSrb9Pt/YPWKB6vyue4HW83CurfqraypHP+FWRcsDIZxtYUrMoRQukrsgUpg+6ZqEZSLJujbaL9ajGuI66n704NfT3Nd+QUh8sg3Pg4s8FaQlK6qd0ZZwSBsWmfJAf/R4cYMXUskhZpGKU4xoUrfO4kw2utuQYlKCt676Pq1RsxenK3duX0S8XW+hF0YLHBbfj6EC5u0aLk+s/V610+L3CFskOie4WDHvEgSCUWEEyzZVq+LS3JB2V0+4RNyvliIE4ioTchWMYe7GiOx2yqZ4nzHCzDs0CzFKm9QC6G3mb/qYJ2ngK4H1D4LU4UejuOoR76wWrujshSbk29PgxHYwDnYCz0EN18ky6Piclr3GhTM9+UV1tNHEqOxqnUdkWTh7wYGwTQtjpyCmF7aJ1OqLFyLW4m64HbATr8djz7no8V3MaUG4pjT/0tEf7JNrSIIbHLbGxTLkNJYRqFtqyoNL/OFCfTUNXG9UUr8DQnWA00TbpLKAPzIQquer9KUr+mLJ7q1kC1VWBunD/zwLfWVQn3uJrkV2KHf2G8ytRK/YWpT+31eYs= X-Microsoft-Antispam-Message-Info: Bcb/DjmILy187EWndFFZTX/GCwK1ut0a1o+AGUeDUlsRzKA5OciphSM+wmIvDjoyO82iRL/1vnwA+9/wsVxP1TmayYXnrrJhftYdAZM6Ts6ASESWVMETzVKuHet9M/8BZeUPoUmqrpeduy5DznDjZ/TSCSGfckpTxKe+DWt95Io3V3mUthyPbJhBae3Pyo0P X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:Yh1/2wz6M6fsvSirv+bHAO7qETnghL2pwYoVYSXrujgRt/cIx5n5I+SURnDG1ne7d49wHsnGRi23FvhuTC/9fAUxQmGRYOIogEZcvwb92YoXXiakA71WdTNJ/V3L2FIi3Df+3VNIgz9d0tHmNnOoWyuOJCBgt3hMXtprT3a7a3eidgY24XjUlldcKYgFPuJKdvPJNTWPEA2FiKmb2YYIlU/Hr7wvjLO1rQSfn0Fexvvx0Ze9j2btZAErfKLOsF4U/VCBN2RDASR5B8P1asgqjzIT2g5ejpJrHFXAkBIfUJuZgexn5Sp9kUP5ag2A4u+jhZk1YZvVPxekwO2QBaLYJfKd6fph/pTtr5nxbMKbvguYvmlqZ4sKSQmQrvv48dJO1yCMXgifNSXlNO1BVk0b/R279jQ4e+EGBW+CWONr5GnvAgPUkSjNJtm5hjPXyaN0H2CBfkOtEf3pLUck4/cxHA==; 5:enRhEwFVntNWpIYpcIm8MBm6sxGR6NEIzK6AyH1Uqg4iwrg3W9ldaskwj7t8sixlfWH7pDduRQMmFtv/Bcwb91BaKso9mAYdfX8KbIcB95YBv+GEvHWCME7AsF5G2EHqpt5AXKA/eWFz7UbVBSsOwRXsTFF862bo6Ei41TsMuYA=; 24:ZRbTXrne8X8Fn1q8gfELttnYtWAdyllShq+3675OdwlFBtq8hPvfl6yXAtM9VAEoSwCcko1bslob2jLsPmDSrwWpcDVT3h1gBEry8HrrF0w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 7:G0YJDSLVvho2gGiCxmmhUc3F5s32322k/62DiixxNMq1YIgoeQSWSq8FWX2BM61v9mPpsfFHYJL1Gnjb3IgW7t1XAWKdrYLPvED2hp4ejYed4v7lVepV3l9mYjT/J/6OCIPCtYdqOkNPRbkPrsWANtQMUgApepeoKg15spBDKWP4mNd0KFTf6S3tkFak3TPZO/4vYPDkL7hOzOeYmiMkl40S0+1scmWD84p15IHriyGQHuHJS1lzIAs7/jZdTtex X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 12:51:49.3662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f7562aef-bea0-4db3-5129-08d594aaacee X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 5/6] 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 --- V3: None V2: None 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 ba66c2f95a..765226e3ab 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1342,6 +1342,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" }, { } }; From patchwork Wed Mar 28 12:54:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 892217 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="pyJHNH5o"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40B7lZ52qwz9ryk for ; Thu, 29 Mar 2018 00:19:54 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 688B4C220FD; Wed, 28 Mar 2018 13:15:37 +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, 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 30A34C22110; Wed, 28 Mar 2018 13:02:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DC172C220D3; Wed, 28 Mar 2018 12:52:06 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0059.outbound.protection.outlook.com [104.47.0.59]) by lists.denx.de (Postfix) with ESMTPS id 417ADC21D8A for ; Wed, 28 Mar 2018 12:51:54 +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=QS9DqtSHi/ZczGYEWWa1KmwQXV3e0LLxCNYizLAIO8I=; b=pyJHNH5ouTKb8fcQL5yXNtCya66+Vv2ELMCWf/Cb6zDf9HWfbYFh9HbRiFVegNIwig5hT/rtzXqygIS6Z2Sf+mczRTCxDo7Y2E7yWwdO27YgtEPduhLlW28NW1FNESKNB5wC9DUHPfjJNXHidIlfdbjQJK0ocAfrRZO81E+hgpc= 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 AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.631.10; Wed, 28 Mar 2018 12:51:51 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 28 Mar 2018 20:54:16 +0800 Message-Id: <20180328125416.28056-6-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180328125416.28056-1-peng.fan@nxp.com> References: <20180328125416.28056-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2PR02CA0165.apcprd02.prod.outlook.com (2603:1096:201:1f::25) To AM5PR04MB3218.eurprd04.prod.outlook.com (2603:10a6:206:7::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7cab51f8-10d0-4cb9-06df-08d594aaae48 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR04MB3218; X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 3:T8W8cz83NjlbiPEI++VmA2e5xdehRxzeeyRwfEGC7HBCAKBg9t4uvMfAtXG0IoLUSQs79eWouQpTPFwjUchFs+PdXCnoSODiA12jMILYe1HiWyYtlqtwA+f8rFRPOM/xTmWi/ERWogqk+lfNdFBBiV/6LVpIPCRySo+i22p0w3UEMUGtMP6xnF0o0PNlZmeV51DfojE8Vp8LRtiWxULhubFBDHzcJwX57k+mozaau319pCcAuiJMtvEaSTkKmLU4; 25:Rk+sD9kZdyZWtDZOOLXmvDWl9Di53CJC4g/5qWED9PKpAxAOCiQQlVAlEs7KNhA8N7qrk2/6nsl8/7LTWIqQLpEPHtZyk6mezDscXVa2+LEXAxlb0vdd18lJwNEl6rfQfNYeo7iD/3aKxG9KB0p45yx8maXJVK+GdzBmTjyUIWBuTn5pppl9nRtf6l9/6eNgv9EYMFkvR1fMVQ9aSlwe1gRrnPl8/0+kQZLT+jzllKHoVAPtEr1Pfit0TuYj78MpjH3Igb2KqLLFf4wtXUH0Ix/bgVyTj8YXRjYpQCbEC7kLzOZHcKn2IXgWXL8NP4c4U880EylSqHjNALib8SD5qQ==; 31:Qnj0jzHdh9ZOoCJbxQUBjAjtKWKNjfZ0LB5NAg/JOXNQ1W8IGp/S08+bA6UaNyqoh63nCNy+PULVO83qnePehTCP9wVsBncTgtJlyFosEHzWGNyJgpddXdnEuPzSaYJFR7lEputsz2lsIw0W/3G+TvVRnxFuntLIFtbPj8PzrFdQoTA7XVac7Nn2zygQqJftyhQdXxuUwYl2yvURgHqujAvYfyZ10v7VUR4e/vN767k= X-MS-TrafficTypeDiagnostic: AM5PR04MB3218: X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 20:g6x3KTizqARJQ4inSbPX5WaGIe4monXc9AOIHIfPfgLX6sJBpyIRIlOiWuZnL946y87cWyYdSOkJCJlmkIfWcGGxhNi5+4gNQ8Ade55XHbq5Kb8bJHPbz8T57NRLbEYfhKDnTBreBThfHKE/eV1eznxc8y4DHU69g9Qgv0iaYYYPOoPo0XAdWw91EApJr52IifW4tO1GqJ4NBr4TStzFvHBBvD7B1zSxkJXjbRavGMVdkGbVKRrcQdeWxituFWRQUx5c+F/BHdzBzVpeQrQe+vDBB8kweo6ReLA0aMPPDhn7Qa7Lw3iGzMN2X+Bg2/E4E5yR0k4aOdTprnoKDJJuAgTGXPhjaS7gcgOoHV9wQxrtMVafd/79NmpaF/XRMx3OGHj45SB+TLmD0qxaOes4YzLLszf7TN7H/0EMLnQlQCHAxjIL7cGNqFnzd0VLVnTIKWipB2C9+W5Np3GiaJDcMKz//AJOQIe8Y5Bk2n1D1SWmnLeLI8lpsVpkgCW0Vsps; 4:IPU2mHBf5GojbzmMplXqEkQqLjWlSfFMrmUz8X9fQA5QQN5pWbwqhQO0+2OuMPTeHf34YadmDi63vzUJ4DpvycvvORwIWo2R95uciHBqclmBzIgtFn+s1BgoA8ApKRIwmIfautwvAxvIan48osUvazIyzTQC4ev7FRi/Tc1gGtOjfbiQYD8Zw+XXXtn2hvdLkaltr/pyQWTJUcjJN7L/+dhaRUbL+AMJGLEKW1MgONMVAvqSPM+v0r16OMnc4E34p8S1YspG2FImHX0+WkqWIKBUObyRycd1eAjqbzJcy2u+YGOHhLs32g4JPbQHtoCn 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)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(3231221)(944501327)(52105095)(6055026)(6041310)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:AM5PR04MB3218; BCL:0; PCL:0; RULEID:; SRVR:AM5PR04MB3218; X-Forefront-PRVS: 06259BA5A2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(346002)(39380400002)(376002)(189003)(199004)(26005)(68736007)(8676002)(97736004)(81166006)(2906002)(81156014)(53936002)(47776003)(36756003)(66066001)(2361001)(8936002)(76176011)(2351001)(3846002)(6506007)(5660300001)(6116002)(51416003)(386003)(16526019)(186003)(16586007)(305945005)(486005)(446003)(956004)(7736002)(486005)(6486002)(476003)(11346002)(105586002)(2616005)(6512007)(50466002)(106356001)(25786009)(6666003)(4326008)(6916009)(86362001)(316002)(48376002)(52116002)(1076002)(50226002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR04MB3218; H:linux-u7w5.ap.freescale.net.net; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR04MB3218; 23:VEUdAhbjVNdWE0V33tP7FTxNVzarPtNgiHwg/WUuD?= Z2fAhgPB2dBX6hkeNXBxwe0G2oG+jNkou+YuNwRV5p/OijZlQYPPspk03ycrO7GMAuAHabbQMGaHu3UQLNlnTsc8HBAUcpeVpyrYzQ2I2ZDdeZFOy3diQy7F00OwS6x6ZrWvngOQ321LUFrlABATk+J5FpnJnvOubMCQUk7apHE0ZqyuLcHc+1EGUmU2rGlydyNevfGMcseIySMV8hYj5yo188ZQ6s7X4KNnkov4Ve5wm0BJwqx4HGbPOjisU5uQKTJBPhgNmEdg2PBd8HGf4kQknJlru71F8WOyBuMeBF1yBYROVZkW6WahfDT2Pzk5ymVEfTuOKzODhQ+eJS1thAbFZC00/oMErxvGeW6sl6A7sQCg35OHBGxacXIvDsR8s5Urd67m8fLuk9IDrZ3ec2goIvgvPsZlkwhnD8dy0w1h9dJgkQhlnfAU9xF5lMab4it/PvTNNht6gNQgZrzw4KN5VXcrc/KJ4BaGo/o3Lc+6svZII7kPc2PphqCYNupQUd78GAtN6/3NsFmKsZAra+abmZII5iWQK7it0Ys3nq6NH2n2mZ59ovXsj08s18pyqPYW4pDWAdwnrd3LjCLRVgZgZZdODQWWo2O49BVDN58YLhl89rzZs1dKNgjcjC3nURs8vSmwzwaGyH3Tra2yyBIQbJin5kkhRiQ8yoh5i6wzTQ1ZkSuEXcOOs5N8G67uGvINiQ7OLednzn11CjZub+1MUu8MkBygOxQQ4SbTzN2xaAhNGN90zg6BbUjTUwH0esS65drQ6ObsmS+NHKZ90PX4XO7Hh0imuMxnuEh+03y4uXccll09nidyaovqPr/M0UDpSzC530IYJM/slSqxqxnVqMrdCni46LVpe1pH7wFwO18mggUV4xHrveYVkA82LmDWmo07smTqRTyOApBIcX93M8CQ59bmToArt8U3FXJTeDu23ou7MWQIvg5bYykSrWilYN/7eOCZb9pyIaXTmmPUvts7Zka60fHAh1aMJl+Ed+5JBdauTLswTl6e4zNfnO2YKqOb/SuUiaWmc2BsSycG1JjKC4HSkABrDLBTBsURmJkaUyU+cFMhxEfGw8GmV9nwXFJeDpe1iuj6LNvOdlVaoDHf+ZkgOrlGuRjb3xPYfg6A8DybZqjZoPlZEssb+JFIjwY4pDcH+zLG24iE1mnJQOfRA2ypdn7rFOS+CJN2/GGxLIwbF+hx3pLMOW7AoA= X-Microsoft-Antispam-Message-Info: ExfvSphNKIw8ukO5xdLlu+ak6VDNDlVWtlXmobbfBhkUZLxPRviOFisXMCRLkQhQeUTEXZ53L/Ky5GzIQEYR2a0heQNyJ9ZDuwt0a2hy9B8vr6M7W0Bs/IAgJ7GY6TBJNliBECvxeLIssZITMvngfVSQ13XqY84lymmuuVlxFh6+a2044D/aVVwjUlQE2+R/ X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 6:oRaHh/E6cKjQwSwPXRGDkG/Roz4EkqH7DOIeOp5yuwLeGzCHMz8qfJ2Kf0nERW9Meu1XNmO/7bSCmcYzLysrKBFuDOidtyxFAmjjGLJ5F9dSpXkUpuYk3yBecvKrMljtGkcGy64P3x8h5LzxgW/mqlf0RgQdRX2ZnDD+jPVVnIJx047GK6lYGINLSAYzzPotVk9FByKoFy81rinQGLVGZiTI29dCLfA3VnVKTXwv29o2L0IFx4U9QrmrtzvnhOXN9xtJP62tsw5fBnzFB7V4DN+Mk7d9s59T+RKB4BjgaDKeSwNuMQ4TyUQRjOZB7O9iM9d21OO7r8KbpEdUtpVIuudEiJCQSwSLLy379hr4NvLhDxrCJdFBIZ/E7YZ1at5Wj0a30i+rXbHwVroBf9O2VcYNmrytufDS6Yw6WhBDg+WF0g6t/l9SqLIKwLQ3KOyQfGRYdJVtlimGsI8xva3wOg==; 5:MA+NRp06EH3ST2I6gsVOAPG95G7VVm22+xclm6SKcZOBBIZFUKJis4YhN5MA0xyGgKrSPIhDLkM/DhEE4DoJrq2zQd6Q/xRgTlletlcETQUCxHI9LZ386YpNT2UCi8tA2atvbNFW8NGJUNr0povxSZc9+O3gfh3t98NJyGQ6ufk=; 24:QPSXZp+7CMDW4NBZAM4NnOhiprwSmXAN/+FeK1quhCfu+V/hU32qOZ/CrLVhj4jNC9tujY7OqbO7DbOl1CEWfN/tNmAxNEBND4O823cYWA0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR04MB3218; 7:ICkmph58TCUiUqmjRLqYWHwziqI2pm2kJse5u+lXlvQRi51gnHZtmVmuU6ZS40oa5ai973PEMz8Q50EP9Os6eze4WNMsAXHiwLHnyrL4vXeW/WPmze4XQEOmkZt4ZarGD9XuyX/wfAAd2YHJCuiOhBoACMnWDRbNJg8TsXjAFV9we5BLUY1InHrsxTu1cEDZk9MPp25ZfgWQS1gnFl/eaZLYgj7Q5I0bugny/flr25eK0cGzvKKtJ+eoP9mRUsc/ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2018 12:51:51.6162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7cab51f8-10d0-4cb9-06df-08d594aaae48 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR04MB3218 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 6/6] net: fec: Fix issue in DM probe timeout 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 Since the probe function has changed to reset FEC controller prior than setup PHY. If reset FEC controller timeout, the priv->phydev is not initialized, so can't free it. Signed-off-by: Ye Li Acked-by: Joe Hershberger --- V3: New drivers/net/fec_mxc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 765226e3ab..4caeddb34d 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1291,12 +1291,11 @@ static int fecmxc_probe(struct udevice *dev) return 0; -err_timeout: - free(priv->phydev); err_phy: mdio_unregister(bus); free(bus); err_mii: +err_timeout: fec_free_descs(priv); return ret; }