From patchwork Wed Mar 21 09:01:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 888639 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="hddATWpB"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 405kKS1Mg9z9s0v for ; Wed, 21 Mar 2018 20:00:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CF42BC21DFF; Wed, 21 Mar 2018 09:00:21 +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_H4,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 189E5C21C6A; Wed, 21 Mar 2018 09:00:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 99C63C21D9A; Wed, 21 Mar 2018 09:00:17 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0079.outbound.protection.outlook.com [104.47.0.79]) by lists.denx.de (Postfix) with ESMTPS id E4218C21C29 for ; Wed, 21 Mar 2018 09:00:16 +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=8y1bTTrzqt8uG3HRDWFR7lJjdg9BR1R96f2tjSesKDk=; b=hddATWpB21QCK9zs1gId169NBMfzXXPcCQDzzExE1wPgb8+/BpHoof83ACVobT3vSpAL03YbtvhNopr7ev9Ilaw05G4yFyfHal38SXTn04hbgTku2EgOSSM7a4lvrCbHyj/loqC0O1CS6FIqgBMbO19C7vXBDWnjTr739LS9pE0= 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 DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 09:00:12 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 21 Mar 2018 17:01:47 +0800 Message-Id: <20180321090151.14917-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: HK2P15301CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::15) To DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e422b055-37dc-4e91-aaf5-08d58f0a296d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR04MB3222; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 3:EWYlgFxdcCjQYJ1MDPQPBpFYhCgOdnvUgsw9I2r3JdVC3Rp3SAe5W95mYlWeanVpTigd9vnkqZhcHxL5O3N3VtVQZ17iWcgq2BLdjBN72vubLx7aV5JmGDaByVG22dxVIfb1pGqLg5TVMtvrxbtOX26udioA/2Nkph2I9aZ57xJHWDpHMfNeQDFIsWID/Ec7YcPnGSillNZjbvMz2DmxHCQnhzd/VOMb6p6DVBktfC0v0oH/D/+3tPOHTYLRk9KC; 25:vkuSH5ItYMg0ZPNdsjPHGU8qdm31Wn80icF4+Pi8MqgokP0/K7F2SXPZRkfq+TBGd5ouS5XPhxXc0JCJGGNU/VsekF67iwQyAHrnW2Z69NVSWdFqZI3mqs8gx4Kr38iiMmHvcB8hfLwNshDui22oLNocWjzNi0OnAYMsWQIgwm1umDNy1EvdCMNGxtz70IPT+/AqE0d2kgnF8jO2frQWhvRGrEzp7zmiLU2L6KrORax7AbKBl0/H6aolD1K3I9qv8kbU5SugmT3CnK+b/uvJbgLia6WDmaDnsp59fnkCVYveGL+HMKF3hF5QPV8lxMZsFoumaGOuvx9rjKQ2qa0nrA==; 31:u10DVfIRK0QW8wvAeFcoSHNzPDnG5IICNb5EGMIRC1DYbX/FQ2qq3/s6SMjsJ2xLQ2jZYvfQRwGFXMoB8C/6qXuWY3vvMNE/hziHbDKc8zdnvC+hW3R86YykC6k3+JDi2wYan1drWBUIwwgPZMCWq9QGZ3iQVizazBZb8ODnb924jWdnX2hLTyOP5i4Ngd30ADVSOSU+6uyUwuI3pq3aKWO/4d36/JrGqRNYEA5So34= X-MS-TrafficTypeDiagnostic: DB6PR04MB3222: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 20:kKs02CgNDaQ8+W36Eok+B0L/r2O7QY9jvcNc+RYTakKAuwBtTzMblDsa+olxiO/ADlAaX36lxM8N3TpwMmpadFuFIHrnnftml8UQltCoi50MvOBnPfAZIZ86ahs7K2fwvkc07DD5ZJNCaJRUZ7vzuTEBvpE2WjuIcoy+/brSdBqAyNz15EPVLX02hyz6DQZfGXYBj9L6dixMZ9a/21L+dBydjKEf1ZLejIMW4E7wuQceYUA+Vhp2/W95yR6yTwGF50+UcED4NX/j2iS2NDhEDv9j7lcnXX9zezuZaKotsRghrMdokf0ZAZTnVipMtWplAUVjn0+Ite++N3GljpHVK9DgBub4bfvOz1W8cd6PES2YZFicSeBIkbpPvaS/ou9Z012p0LOL+qlUQKpbdoKugcPr4+AvAPMnFU8Q47ulXo/Ru1+Mse2y89AzSgoAT8OpFEdi4PCGlZf1/zxMPqdP8FnkoBlErRwaYgqzW4ace9pp0kdAeT5wGMq8SnzjOjr2; 4:DcrS6gG+azmCMOY4m7dwyD+7VGL8qFqP7GCaLW65ZrloIrNIVrXj6RUvo1tMZDXiVqfhp4zyjEDr6bmqn0yyJeIdyIGtkXX/nWwGrU7nP2qcIvPh2xBtiqIoA+i2UAltEBI91fG6MrsyWNyR7knuGoux40k5gWFtnpB5JJNlNcMnZ/IXwwTez1ajsiLekUT75WuABplaWi7WXxgRfP6heHi2tDmpScs3xGDEdzKwFgnQn/UgLr5N0fuFul8vLhCNt4fCBve6dA0KFBunUQPhTXXugBppluncwBQiCmQ2W35hCzBAZxIu+ZGbUH/FZ29gH2N7w0lSS1mjrJjFBS+TDhoAklW8ayHsVwzBK7WA3uA= 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)(5005006)(8121501046)(10201501046)(3231221)(944501320)(52105095)(93006095)(93001095)(3002001)(6055026)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR04MB3222; BCL:0; PCL:0; RULEID:; SRVR:DB6PR04MB3222; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39860400002)(346002)(396003)(376002)(199004)(189003)(2351001)(305945005)(81156014)(81166006)(8676002)(6666003)(7736002)(6486002)(316002)(16586007)(97736004)(68736007)(6116002)(86362001)(478600001)(6916009)(1076002)(2906002)(16526019)(186003)(3846002)(6506007)(2361001)(106356001)(47776003)(386003)(26005)(59450400001)(105586002)(48376002)(5660300001)(50226002)(6512007)(50466002)(66066001)(51416003)(4326008)(36756003)(53936002)(25786009)(8936002)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3222; 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; DB6PR04MB3222; 23:iMD1c3ydZ8UjMCbR3M+5dcGFSe4KzLiOBTXYVHkyX?= DAvVpYJxn/3ECff67dYOm/O0UCifVAtBhoemelhadQzT3biOHdg+ZNjI3hmbb4QaUnskQTSjYzLglNRXPs8n8+GW6DH3EOxmdSfbakf6eQSqY4g70v9XHCnfk53gyfvqND2GlVpfRJw9AEy/IaiBk7upvf1mwizLa1r6Zvl2mMcixcbCkR0r5t7Gk/i1FlJ4PBp63NGTXavW5eOTmauzvxWxpAGEMhUrrcdH5927/ticZxPEJJgvx7IKT035O89Ojhbx+BjV9Gyluqbymi00uhv1tFs+lotnjKjby6erNAL+zRIZeIurxzmOjztjYc6GKs0x78eYggwZabsUFwqmngVZ3gNaJSgY9W3+XWnYZyjGHgmPqbDS781Ni7CW2ltNFvzbEBIZBz3Odcv4x0tr1mdrnquvsJ0W2rKr5OURl9uAjkuA3cu84NuXAiZ2TPhoF5r5HFaxlBuWQLmAWPpgXaBmc4k4kQWmAjldaimZ6Q/BICuFULZikcJ1ewk9to6gAAAumMYwTNUoAtB+axn4qHHueDqeowpeusXHComOeOYvUC2qRHkzYW6AG8QIgvUl+nDJRO3DgVe4OwExghWYAFIX1lkTf8ph1nXZ3oitAwwKOdS2hxjktF5QnzqlR6J4gkCgUVn1YCtcUB1Fz6GmQhg6r5ogsls525ObBW3Wyy8YgQNjxfjz3nNWRCgEaXEHgcO56c3hDp5Caw1h4GsmBE+ff56JDOJ+JEWPjOIoKhTH0l7UgskOdZLgcTNU/OzaPweHLnOc6LRSF2yRwx4bA2DG7Pdxy4OMQbLu58vrG1YhMOW+BtvsZAZZZvGRPph3wwKZJ9kk0B73YsFM6yR8nhzObthsQLQBGql95jHuy7CRxybV0nTNnUWuTMychzC2/2+tf1RCKEgcdaeiTAlIhmRUGMyfXhQNC++w9RlIr7mAgdT8mQ6RhvMD4ldjrUzkof4xtXAtDVklST4+OyhjuAmc/erlTzNfgorph03VfUYKipxi19RsMKEMzkhCza7JbTjn+eo9kwt2mCeL2D4LhTY0V07t6iBjLonvGnLWwcxlFA7gijLdT3nkp2365vvk6ZYM7TnU1hSqCqsY5lEAIdz X-Microsoft-Antispam-Message-Info: bEBMzCNVfi4lsfHAFdD2T+9TLUijJUDPHnVtb3M2tpVkN17w0k+JG4bYDCxSSjumTDFHYirDplFoNf6E8uLbd1NQhCUXaRfywU9zgt86Zg/fsi/jWB4JN3u5z17wW8/HuvTbhUYNQtoGr/6jETIycFAyyWP59DhnGVbCeCvJx3ldvBrMAI0Ypiq8AClivMFb X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 6:j4GrhO48KTv7K/3qJAAgYCAO6LpFw0MZZgQ19mVEhhx6DdqdoJ9vowX/X+66/P5LfCjyU4ZhakM00Uo6MlJj8A9niLL21Cn1fDqo+XQN7R9LxJI+37lyDbkJZ6z4ndzIVFYTAZH0BOONOrTwDNKYK+B+qVNJp+01QkRAxxZNtELmwQ3CKJdEqMCtkYg5hzNCq4+8ea1983pMznhL+jAtCSt6w97AznMDf8PQNp85KL7xOZEtb9v/IFFtah7flKi7mLRKp90pgH3Sq5fGm210hOe47/QoXQ5HeSlpONUNrow2Ti8bVL3lBrwERybPVm2EQ+mft+/K4ClXKUJ+7G9LArSrTc7ZqkihoHzSrwsA788=; 5:a0Q/rkWAB+duEXWxytsxdk+je8dQL5W+a/HoaqNTdbRCtrl3GUSN+Dz5/ysZ7omW0Lo9GxbWyWuv/TfNcFa29sR1/YteFpRTjKiIHnzX7OHez/GkvtHFfysYlly27RKjgW+Gv4TIT6wgNStLC3yFW8O856kJm4T0e7+YXG2FO+A=; 24:CIFysQ0+HZhdmNR3PfLn6WK8dI4tW+uTfofRejPenKPu1od9k95bT8VgIcxNXeelX1hdErXYop1jZjdwdddLsTMJzWS3TmDo69buYJE1u30=; 7:PKrCOlCzamAvF5v5nnJ79jDFrpmPKsaxvcbfInoXEqylDGvXs7fD1GGwxjibRn7bbZ+sMuAkSgfDKYP4fMfgTzzzgLsz5pILVhnNiLSjXO/VoM7Jn+P9gxksRxdVm7ijmMZy3PXjkFJD1XI0fKBPFTZ5sh+EbeIDQWaIUaM5S41aAdDVKOwnLOKpVEdFGjEBB+fi+BIprpvKDKUkSv4YDa+UCodcZ7OzhedEV0DtMZ9/9gzUTf/rFgHzweEMim57 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 09:00:12.4822 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e422b055-37dc-4e91-aaf5-08d58f0a296d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3222 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 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 --- 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 21 09:01:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 888641 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="ub8n5X1i"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 405kMC5N07z9s0v for ; Wed, 21 Mar 2018 20:01:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 14F83C21DF9; Wed, 21 Mar 2018 09:01:17 +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 773D7C21DED; Wed, 21 Mar 2018 09:00:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A7FC2C21DD4; Wed, 21 Mar 2018 09:00:26 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0057.outbound.protection.outlook.com [104.47.0.57]) by lists.denx.de (Postfix) with ESMTPS id C5965C21DFF for ; Wed, 21 Mar 2018 09:00:22 +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=svJrrySoSSNaV54sqy1QTqluv8hwIefzoSFC0zL+J5Y=; b=ub8n5X1ioHySyHgU36ppUTvU9SH0kAqabSkDfJX7zU3eVYMiWMQ18I/uuNgUObhLkOe2V0ufpwO+z2L5mIioOmUQvq9QfmrbVWLZRCtu8lUC3d049T7WVD3zBrVt9+XP2cI4TUQe+1t3tGCLqlrltkZenUSO142qvmfgtxC/FwY= 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 DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 09:00:15 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 21 Mar 2018 17:01:48 +0800 Message-Id: <20180321090151.14917-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180321090151.14917-1-peng.fan@nxp.com> References: <20180321090151.14917-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::15) To DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 60800ff2-a86a-4872-9627-08d58f0a2b3e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR04MB3222; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 3:fEl43g4024DkaBjlULoaeZCNyA+7bAV08qSRwLx3k3lLpiocQ7YcZ3lDM5wlBjWK6b6sLl36K1xIz7c59mKXTp1ZwPTtILXJKllCUS24P+EjDq1pBms3CAjhXiNW6M5dTJSs1/XORJ19UPjkLfKXtKJmF6muOqi0OaSWCWhkD7GmAKyyBYa9T25YihwnJgmbu887JRt4EGxVa6hgvRVm+SV+M0c6bD+dZ8WpNXkCzYtWjDOeSrZSatCRw9XCz5Hq; 25:BDYoggifR51ydY8tzRtyV0vcUQs7/SeTPWoqDZysGkvy5kEVDWt/X3KIdrLZp1ylcwwdS04gsVvI1RX4q6JFJb0bMyCxnNnzgLv/7z+nt/WH6HgR8lzKgNRfglbdf6MI1fFv6PoCDLcwHhl88M5ESeJf10JFABirRWxakl9m7ILlsLoB9hwdH4YBTXL8RLs518I9vQvZNIdWUkRwdMSkTc2bhyZBrlRiQvHAjZoDkDCCy1U5FKGELDgQd0jAfGOLVI0FcKzI8Y/cQK9Ry/3Cozn2R3FPBkeq0bS5ldILNzNL4+YJZz2LPtIYclcriil9uqbh3hf5jGyN6Y5IPdpV+Q==; 31:Nvc7LDWWdTOA3SCVHPjs1GttxbeSRzYF2gOEPtZKxSYlzAusB1nojcJYoPqvTw3LbJ79HtD1URBuIbzdtq3JRL76s4NbtPQgXk6pqYyUQSiso4NEIaXr3vdvZSlATgNrHcLSNKDGzdJtrfCsAFxyMuJPVTgeP8RPaWxPsxY0zd2uDsvurVBpbDLiPJ2I52Y7iQzcehlrpfg0jGe7fusSVYLodXKkYadB3LlUVqltwuQ= X-MS-TrafficTypeDiagnostic: DB6PR04MB3222: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 20:CQG/S0oGsv5MrlmWHCP6Q364jPgCqtw8XFeaLz67a7CRPL/lLJ0Gx1xy4s4Iar9TYMfS8nrG2dKJ1+1JxlTEN9ecwP/8FccBXVOfQRr873Um16/bQX1hSiogsOilJaB+p92cfadSXbM9UPhX/XzwadWceo4CpF1qikXjlrJ5WIULdC6YE8czIV7JhE7ax6WDtdYtVSi92SuVd0f/JGl+eP73ahxud0/YsDtdNFq+VyxzIUuxbjsRIR4u8TddORZD1apKn1FFtBjyS0YisBqniCZ0t7vW98EUiQY4HUKSUhSIlKsB3Ebu5AhrWXZpC3ujMgOZMubTH2FeyUiGIa0k+/Nfy/vvjEQKNX3AQHEvluJmmdXj1xh5JVOpHMApuLGfQaQBmYXIWdrP9RoEi3/FdzMOuFwXjLr/qKNTXul4jFm7J3qXYMOyotmZ7Dv2+deOpEe6WYrm+ygd1hGuum8c4nQxLIrH9Eri1CvyqELI5sfYyvrZrsof3qYvCqEvIXVe; 4:2OrsE1WSxlRpRC6JaoXN3LposHII8mk/dmw8MlSfUABgPBXNebUJF3BDRstRESKBjDhSUZ75mVgo40q9KN6gsAO2K8q+LmmL026m6DTjZAUNE5E7/TYu+k3bHl+LcQR8SvXJXGgE9PUrni1hbVpoAeg1ULbkoGAm7iFNP7GBNRZYnu+MJpJbAbThLe9aST1vMwM51hheSQymFgX34fkeOKhenG2KIu9rLj1xXxQxZb2QZxKLTsxKhhY4d7NbJVfnduaf2NsQJo74uttJY3dXwnYyh7hEg2NRv3/vhddRdZ/wzzOsWHy0LHT1CRvnTszWwLHm+79MvmJdZwN1QQtzXQMep+D5w9gbsmCGEaZYIK4= 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)(5005006)(8121501046)(10201501046)(3231221)(944501320)(52105095)(93006095)(93001095)(3002001)(6055026)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR04MB3222; BCL:0; PCL:0; RULEID:; SRVR:DB6PR04MB3222; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39860400002)(346002)(396003)(376002)(199004)(189003)(2351001)(305945005)(81156014)(81166006)(8676002)(6666003)(7736002)(6486002)(316002)(16586007)(97736004)(68736007)(6116002)(86362001)(478600001)(6916009)(2950100002)(1076002)(2906002)(16526019)(186003)(3846002)(6506007)(2361001)(106356001)(47776003)(386003)(26005)(105586002)(48376002)(5660300001)(50226002)(6512007)(50466002)(66066001)(76176011)(51416003)(4326008)(36756003)(53936002)(25786009)(8936002)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3222; 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; DB6PR04MB3222; 23:/UOZl9jftDmgZJuXhr3VJZHRi4xLQ8GNKRwVRYtyx?= t4YdxiIbfbhpqfz08CRQjUPt6twLYdZ3eOjopMwE6Ek01Ch1rCBV6TTR7RzxmWA5G/4QUTxaOoUTfLyOSjg9vMvAfDBz4SZLh5yw7g+OC7i19QyYHT7KacyZexTNWjc5DDf1pgAYmuG4yyGNPMaxy5IHB4TWW7PXVf55g9fI9cZBwIya+wxz8jGyGjY6KZw667XVkqsXLdKMQ9yrr+LH7RWzxuCQfsBTN+Gx9o9dHjNusztZo2frR97rRDjKS0yVRgh6TOzCYdE5ccalHv8nXwDivHl2Ua8x8JSBnmHeYKTYJq7ceaYNDgBBR3BL24pI+7N/gUkbzz8hH03d9fcaw+19sUSwHNyTHZV+uPqBdOgezGXg+QguyyK23JR3pb8hOPMrDltW4xx8JEB/1erh+xfAIYFZeor/vZ9y6NeCV6s2J9wqeM+XoVzyupvP+SoEZFCEZQRRts+fPADoOrX+BYaEKNvHBs+nAPQVqjAHnUocDUvTutzbiBJ56Fs6ukiJtKDfeO/odP6hF25bHWFgBjTG8l9Q8DqXo19TlkWOfNA6AKJh2a0DHX9aZU8iCFxw+Xq5mGld8bKnBJQ8KgctjDbhCSeBFy/ObhnNKTbdVkaZB/CnSbbTvMDau1IRp+8z0Blj1v7oNLvx1IZCRo30zQJRcd5UyUc3fnMKYq/20VOtwB6zXtYUynapZS7TXamFmjmJkmfc+oelOJ7jiXTJzkc9x4N7BHJ4DIQFsPX48IwuuaZPjrPO8jj1wmlpzJpFZgWH2EGQB6Oohg6Kvy+gJ5K9arDG6kYsQLJ0teuSRYxLgAGGGZPXSSRyRVBurME6AauHSqQAxQMU6iaGpUNWlJa6xgZXxUyY9yrHc9HBIyW5OH4eEMFXsqqFQ0N2dtaxPwTZlmHB3epGnvxXyI3Zs5lK9+AzpPdO8juiuqjbVn/kTnV9Raw52DLKZRzMDxsekYMBIJCo2zuqX1UDb0dLDD5CvR9cCQ6OnM+2LZ1f93Pgs1N8dXNMgrynv5WVvuadPSMeg761/dW6t4lZWi9hzme613D4KBEJl0S/nBgH7yVPK6BTwDbo4ffko/Xg490znR6m6cNOvyiejoi+T2kFNnNNdgkfmDyn1qKXEq/Bc5ktw== X-Microsoft-Antispam-Message-Info: 87/dJExlOqOEb5MaS4pynG1JG2+gB3QACCK+XS23evQeoN8ETgclPw9hWvqTROM19iedU/hL7dXm9BrMuOYZgdyOtBbc921JbQY5BKYtKwAIf0xwiKhP0P77ol7aR5XEKbyIabpQvDFQXESTpfZl0/qTpJ8ocIibfaQ3FWf8UQ4jkWQk+k9W9AjyOqfH0hlr X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 6:Ro8OR1vgx917o8JCmunVzTUmXsrw6q45bLmjdGUjleZkC+6G4BE2EBP9Qyh4MIZHkBufpl9TLObGrEF/rPXhqSM8dosKALqU6pZLIl1uo+rWSv6DxEzjzwvBLN6NELEH053Db4Fu45oa2cLD7QVN6aNyfikdrIEnkhxeAZZzL85/5mRpBh/ZCjfFFXrU7agQjQKy7G/VBQiR+1DzjgynEJZAI2H+63rY+/Zvz+MqPEk/eZKrgJZwZANRGrWYHn8H4FX79ql3wtxGEdyZHk74LYgzwRy8+Py6CXgasd7j2B2ZsOWYEv6xuG2vCLI/hY6J4FSwpnwSC0Mo9WmEtE+nYfEpdo81h4ycDKrGAHKk8oE=; 5:fhFU5zL5eYbigKimqwN/NwXSY9kWS4iaiSMgQaRpoRD/gwcu7EPrTulNvJX1gDNEoPwyDXaPIa9EJFWV+DBx9xyu1QNP0h8uzkvU9aoUSCedidoDhKRalD0U2qdbFED88MiwXiPYD9eEWyYgwph5WsxiJzCRZ80E6cqIcumYWEI=; 24:pMCAch2qiLxdVQIIn31n9PVVWwyVU5kjCS9LxxZdCQ7ELYnxXgaUJcXixJAgGSEplgbxQd49rsolh/pvK3hJQpb05QifCV7mLXps4DNLyvw=; 7:fnX37I7UCpOY5e/BS5iUFoLsWxomXw7Fw47mUGjM5DrCWkn13Y5uBpjjtCi24rOrrb4FkGtAgg41zuJFq4ieEaoGcW7WhsU9n9gpsiSkr/BIGKmdZxKyCBeCIF/n18WfZBSLB2z86NakJU3j/gafVv/XyHHBuMdtGnOO0E5ExtPyRYQNF0REVzE9KCtmqBJOWEPPHR8eVih9f/AVefP0mhuZzl7iTSsUPOa0rF4zCn+lD3nMdsbqrID0Azz9O7dx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 09:00:15.9041 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60800ff2-a86a-4872-9627-08d58f0a2b3e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3222 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 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 --- 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 21 09:01:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 888644 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="SGYCed2Q"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 405kPB31psz9s12 for ; Wed, 21 Mar 2018 20:03:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0C7E3C21E42; Wed, 21 Mar 2018 09:00:59 +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 7EA91C21DF8; Wed, 21 Mar 2018 09:00:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 90E40C21DED; Wed, 21 Mar 2018 09:00:26 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0057.outbound.protection.outlook.com [104.47.0.57]) by lists.denx.de (Postfix) with ESMTPS id 30FE9C21DE8 for ; Wed, 21 Mar 2018 09:00:23 +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=hvihB8PtdmxjsN/hYwgBWXqhPl4d62+T2TJTXYEknNo=; b=SGYCed2Qsy7s7JH/Wh+E3wb1wxkV/KEX4/IQb42US8rEZLho0kzf9SJcXtncS7ULRcktEtlOdgYdar1gM8uW1afItB2Enm+pvHhNsmnrwgfa/QbyuTtUF8ZqgaT4uoMYr7zqYY3xhJG9oDETQsOUJNcJqMrMOxRQfd8VG8csezQ= 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 DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 09:00:18 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 21 Mar 2018 17:01:49 +0800 Message-Id: <20180321090151.14917-3-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180321090151.14917-1-peng.fan@nxp.com> References: <20180321090151.14917-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::15) To DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: b2ee3163-62eb-4cb6-958e-08d58f0a2d03 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR04MB3222; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 3:dpgEmbC64Wa9t4dwznzikdCFVoKEuSRlGLsNgY77gWlqjqW3gZY9oNdKqSI7j0VtndnWLBPX+u7eGX1eMENL8gniA6ZGZqi/iommbRN2fdlaoc7h7D5gQKdLThgb3BFRhi1fVv1Tp/yI4SxB0XMQXvkjW0PNcMHFZWqdV+VaRF4E42t+j9rrxOZqhILKCh0J220ZsKcjDqhcTxB/Ncfl5eF8Lbj1BQchm2yG3/z8i4QmR7x7E0htYPNQDIJETrzo; 25:jiUtewugvQqmFtuFYxrp/J/pjgM+bpvKPuGRCN7V765AXMWHdc44f7U2ntjZnXK6Glr53/uv4PD9aQsO2sCzZAn5dAOF3MYEAHM4ftRGK2+yIBMCJYUMuE3NjO3Rxg6lB7xQ7rv6knW/+a9A7bOzUW9BoAB37Lyk8teqEOiLvY37SBoiIuFp4sd60PBPVmA3sYTsSAJJkoqmWLEh4q/S6ORVTAcXRv11JFtynX+hqnOCL3GnAoiezbr4WxbLiBgVr9ylcXbV0F9s2iO9H2wNFN1FeePFce/opwvrwGjyAneaeySguS+mGTiPtpNRHiCsPr4vFCgp4+FZfQ41wMNpmA==; 31:Yj8VBMGv41jkVPX7r2YUBpqNpOULweObghtcDgSEK7TgLi4iHl17jnWui9XuEpF2GftOtu9IhWwSZLF3YBfY64KldVwNColm/IJOU8CiGZMJP0KDmAol76X5+RETdBwqP2TN/P1ZhgIeHX/XWesv/HdRU5WB7oHiM2BxEuqpICJfxfMBFAb4FhDNYST3ntVDIaLVlt9wSL+Y5tORHRFLjxF14TELvWM4RtTNLFv40DI= X-MS-TrafficTypeDiagnostic: DB6PR04MB3222: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 20:LXf5ZEd1aGVqdwHDeRVtfVvHAZO50IcfGBG3uVICk9XzDGM+UlFaXo4V7r6c+gN9tWX6xImT5byRW5D0BgV0QXKPZNzMDAqAnMUX0VHk80Z4TX0Pkuuk5cJdd75WLQEerA6FRQ78F4eOXor0lwyDxYcn7GWFDfdm9hd5AS07GxA4nJBiIHgfEQf8acg7bhJZAdyTsNYN2DWHgLEfa1HIWksV1Z3E3iZka0lLAZdMWZfFqQEpC3dMnIspyfz+Uk95cJJSkReIDNVHaR47ZrQmBFsFDZmrdQL8XaYUbSJb1MCGTdYtIwQ7Ih0sG5fh8mDI0V0k4sfeVDlmhLEvxad48ajtHPiH3ghMhAFnUkCmuwdM5IV2XSEVcjUJytS9hHQUN/19m1RH98q14JAC1mDNboD8nfYUpGyfbYn9HBQeH6YgjPSP31QDhzYX9r/+vwEKAlMdZwdKa6XCxSUajKmwm8Ar0wMcpzPrwz0/4QkFrpWPkKJiiLWDKIB83ElufsBJ; 4:o5K3/WK3IXyljbrTDGfN8wGZR+oL4zi7Lmyr1Ug2uGRsIBxi3+D8uG2XADt8Jpue8iueXQYsHIpTBWWH3Pd+PizYYe6yn/S6sgl7u7s8fjddEw5zmIqtJ5lt+yJlO1kYVXCGpsPQxOmhdlU4lrYCjGE+uwkqC11Clg6weasEjlOP0ReQOy9uQCjjPbC68ctt5n/4FquE6n0Y7groGKxpH0Ywirlql6OHeSdJimfcNUeLKAf0XhWz3JNt9wojk6sb2yfViEuHd23Bg45jVhB96h6LxkK7f+MeCwF9fRewFx72105S5/PVnJC3puWI7t9VtRGK285qMDu0ixOTL9c3BOmCkDyB9vHY6T4fmeuadTA= 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)(5005006)(8121501046)(10201501046)(3231221)(944501320)(52105095)(93006095)(93001095)(3002001)(6055026)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR04MB3222; BCL:0; PCL:0; RULEID:; SRVR:DB6PR04MB3222; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39860400002)(346002)(396003)(376002)(199004)(189003)(2351001)(305945005)(81156014)(81166006)(8676002)(6666003)(7736002)(6486002)(316002)(16586007)(97736004)(68736007)(6116002)(86362001)(478600001)(6916009)(2950100002)(1076002)(2906002)(16526019)(186003)(3846002)(6506007)(2361001)(106356001)(47776003)(386003)(26005)(105586002)(48376002)(5660300001)(50226002)(6512007)(50466002)(66066001)(76176011)(51416003)(4326008)(36756003)(53936002)(25786009)(8936002)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3222; 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; DB6PR04MB3222; 23:c1qOoUgLzxvwNt5NY8N51ncBNrDMNcE+Oj+NXLCUE?= /GdV/+YybTVheQs+DLuXvxvzDLqlKFbXv9Vu4CQxQ3GT+yi4vNp+MWOiGiPB7G7+ooUuHAGfmAO/xoUvHd+5xfutmMobRY2kLrW4Rs/C2l5Dq1ink/Xe+KVDNv1tegnlwXcFg6CC5BpLroau1yfxRqIsBLa9v9/WSWkbEdyymwxuPjsjry4j+owkUcqP3XNxk0LcRRZ18P1X+KGZFmP0zi4M0kwIf+Hwimzj8MmwPdZ0q9L2rSsk2NAgAOCIsjNIS/Lc3nj5CKUPej6sCQW16mfzFofG+YAYvS5pm5zM/rw+8jwGg9j/xWdCiyPsWwKVg1BK9MedKPGcbyg3ukEJKkws9Qmt+Yyd6NP9WLzVKxx3tzZoPiOka2nL/tdr6zhLy2+9EPUXNHxn4pIzVLHR3lSjG08T9Zbus0otMs+N0U5RUvAEQk7fe/4FpdMkOQcBm6kIva3BaI8KottQ4Q+ngeNYFQH22PRNrL74wH9mVCV11BEwcexaPVyl8jANUeantow3LMBoZ4ZfVYXjVJ7a4ZeyaFc9x9qog9YMVuTgldV5mtf7gxt5ubZmB1424drq5ChlzBhy/AE8C7a6xXaqzJDHcUU8WF6dBXOAM+7H8xKH6ocr9Tm1LpEDHKHry0AnZ2ZN5ssnfsgdLXVI07gJLNspxyXQxGPaItLZqeCU+q7fHyZnO/x9rue23jegw+b6Lkc6IXiJcRBlbSbXaN9F/qA9LoqxUTkP3qc38r+zMFvgb2ChapEQTeEy1Rc9JCNWl8BBnMup5RJn6zwLhdkEu9U/UDLs8lzALEzNDNqwE03kukQfvsuc+pSsuIn+bOp2k5iH34o41ICs/ukYhT2ZX5MUZVn1ikuO6twulEBIYp/pUM+nQ0uJHOavt2fKVlb2l7VTLHLjAgGwvQcCz5J/lJHQUW5hHOAxtsPSW4f4rl6ZqnvCyNe/ksyzVWuFaSLs+yHFufLk/5Jk3Qtk/uzR4NObNdKlMYo2r8CnjH3z3vdFkLvVk2EFBYZBSy6GsrP1+0LsKuxcpEG1W2nWYeHMkC9synp4VDhVtbbmaYo01ChSG78NeFV1v2Fm9yCgfKHsTUzB5hn9FtrpBFE3BmQPjnvfba9V4fZPjGPqppqy26KhQ== X-Microsoft-Antispam-Message-Info: FEVTC6jI2EwWV7vrQu0v/CzKy+8ed7b1UY5d9qgFQmuHMxzE4IkvtBKHiZLTWtKRm6txsIOIH5FG1DAcetjfzxSkGTdy4c2IBeRzzh3Q04P88oYbJ7aAxV4XHMrcZU+O77q8A+6DJx4Hke6S1Mgb4kmuwcRYm9BaJ8ChmYZoZaTO9D6ksMiFFKEyfQnfA2hE X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 6:dJe+WPnIkIwRmAff8KQRjfxNlCORiHNqcb0/8+g7qn0L0qb4yLGEepKlsCTC5NUaiJDWjUXgwYokYV3grtRmgWis/Sg9BQTSxt0VjDrC9ni+6DY6JHCz2b4hl/oX6NGGT7Uju6khraFW/aLVrXBfhZpG3G8Lf7JtvG5nUzePOvOoKQEilDNcvNSGcMdxQiYpDLrYzoxSGijNzrRCH3OpYQpkhLNdQQbZ5SFkuFNrahLIOw2f4zgJkogDWDs2VKzWp5Xkp+DgUiRQT1e1fJ7r9a64DoKC6qk6Aj2TaY4y6x6xM65VhHjn931ZEB+VhbTt/XvJLsZ9LqeNQM+rpna3uS9Cf7s3GrWZZPRXR982xGQ=; 5:h8ewrRmh1f0bVqN9XZcWwYlUdkFJ17EDR762HGc/vUT4CZbvlmxQ7tYdvuYyzOpueG+l2yz5wqEYeKTRaCeLIR4fzjEhi1sPoyYeU4uhkZKZRljHfbwXnETWnpQj+vzdTiSxpbQUwaY8d/ohrMR3F4JcuFQdE16qNZr+juBw490=; 24:eY3Y8KlHSrCV3nKcQGtEPASVkpwGuWrJL8+bO+DPRHI4B1H3K2LQS3K3KfbhByuD2uX9FqkT6cdVgSlmErl1sfmc/xHwJVzIy7McDPMUKY0=; 7:APV+2Tkub1a2OPChvIKVu8G+33lsOIifIVWppTBjM1BY4fnPDwb4uyuJsL43yhxeNzd7jZhZHG3c9TTVyXLijYtvoK6BmoyK6jXLFXqkxdGSaKfvIs0GjJm59PiVg7Bca68d8qczsevzzOzpr7ud8IEkgjsZ7WGn7pX57dPYNSG0iJ58r8feObEpcIlNWRZMQWOU5zkfXc45Ze0EWM8bCJXYWeELwb57ATAN4a8DkDFCK8fZfPv0XnTKTpc8x9dS SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 09:00:18.9822 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b2ee3163-62eb-4cb6-958e-08d58f0a2d03 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3222 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 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 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 21 09:01:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 888640 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="mMhtlfXq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 405kLn5sSzz9s0v for ; Wed, 21 Mar 2018 20:01:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 669D7C21E1B; Wed, 21 Mar 2018 09:00:39 +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_H4,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 893D1C21E13; Wed, 21 Mar 2018 09:00:37 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 70DDBC21DEC; Wed, 21 Mar 2018 09:00:30 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0053.outbound.protection.outlook.com [104.47.0.53]) by lists.denx.de (Postfix) with ESMTPS id A6661C21E15 for ; Wed, 21 Mar 2018 09:00:25 +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=viPHOKiFA3eFZNPPHnQGz9xZ2Pq6ivJ63PsgAPLFb8I=; b=mMhtlfXqsyTHkfdcwhP5eiAIZBO/6bvLqSjck2sfUNYcoY2jxR+whAZUDuRF1ouZoa0+AWg3SVyHifFhHx15Ir1a1I319FwOb6TMkvfkW0fDHHIFd/g6y5Uw+/LUG1Pc956rHYHQQ5aGcyMLkn+CYatMsOtmW3eHYsfyNovuuyE= 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 DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 09:00:21 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 21 Mar 2018 17:01:50 +0800 Message-Id: <20180321090151.14917-4-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180321090151.14917-1-peng.fan@nxp.com> References: <20180321090151.14917-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::15) To DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 56685b3c-1bd3-4523-08ca-08d58f0a2efd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR04MB3222; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 3:4Jc+4XgZYys+yTZaL6ScIulItg/iBtLTDU4lZpRD+wPHNj5XfmHYNuP+a+8Mndd9w3RJS7plqaLzW5jRM6hkqdB6JbxuKUjYl9zoL9nWNIVBvZ0kxo/ZsFLpDcAaBHuOH6THvuckFvroiNb07953W9fb6IKGZg2XK9xFACXf8PWMQ44Dwe8E+E/w43aVRXOzQjy6KLEOLrsw0TROnkgubElaYJHtuL/29v/VZGbVsFr8pwg+R8JAVuq2E12uls88; 25:dcq/liAcwEFYFLHfqL2X5ogNoxxqdEfziEr8Sm02E4b8ZItlnU2I1/IBIWJYj5X9yJ2Z9mCN6ZLbPPH8MOIQHDm8TioEhpR0mD8WFMsd2A5suo8HcM85mYyNMQVVTlffQbPjnYMdK2ZpUyHLC5KwNEpT+poxuF/YG9xhhuZz/4+Nct31lbg/Crm5uyrUKLedOnctAbbI/li1OHZsKjrpx0+zZeD36JYfFk+TrAjdGeIdgMfJNF7B4GMfUzEU3ziKg1HN6WyeCyW3Ur+HN25sV1yJ/3gcSvZFUqKV2buUB4fmIpqgl05qExOIi7ZUK7bG/7uN+GIJA+KaA2wqHcXXuQ==; 31:fzngx8z5U9OZkqZVjFqshF+iTWUU8Q6JRr6B5x37aJHb0zXSGXpG8zqWT4rcJPAXGhhm4UFWQOZ/dzy3RrF7wWHnP6qWKjRNtQNacjVP9JT6fJPUHia2rKy+SQ6SzdNw3sOskjSbALBI8vqgc4RrI3NtbLTJ+De97ZwJ0X835/Y+dsWjMkwK3D8/lLuZ7hrIDC/H8+3fD6ggDd2NZozEbUpfHji3hMGHSHXV/3rsQcA= X-MS-TrafficTypeDiagnostic: DB6PR04MB3222: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 20:B+QAYLUDHsDAwHako4ndobwaK5SGB2rkTt3aYgAMqiyMZ+fiu4WWK7H4qPBjeeIblT1dH4ukFUgi9t88qFIWGOa0LIr6JSMQ5s7wji5H1inuHvjzsr9zX/rkVLKt7xzCv30beqlXVdZZHlFKMlbU6PdDXdLeD37cmHfZ/7C39y3UB115tHcPZEuRUznd8kM3QkmhHQOqFWFqGnUNikchI0oZ8YYNVOJmPhR32B7vgLiy8sV8fB67wsn27NxsHMwCsIRyj0SyLY52vxz+HvLbWrE6cjKzg5e5j4riIlKbgiUhNv6fzZcNMwuZDUAvOq4+jDKnNkd1jUYIE7ffU57+Kz+zTOn2iPTek5ifALZqwcP/ccWjSg5FPCa0W/dDFnR5mTjayggTFp8GMUN5zqwfUGEHweWJr2BmpegjgX3DKL8zP+8UQcXfaw5+3Xy+My3mcboy8TgtJyeosOy41FeU/mn1itpil/l1yLFXVTFplOlYpphvKNBcBoU1UKwBrcsY; 4:6gH4bvxR1X/oozvrnEArITlFcyCTMVL6LGiUx388ti47pJA/HKAq8WdBSQmvSz1GIgye7rmQU8qVePdhKE4ZsNk3D3Vgj4cAH3t++6qbh5fUXqaAAR94pEhIx5Ltss411NgY9ZRSk1rsnPUC0XmUrE16HBNN0NwXN7PyubD2iVak1s2A/Gg7nFjWh7P6fLmXZxTG6mbJEptKe7dCNhNO8OgSCed1L9x4RgkvUrGCjfmxIokt75eykA80dFbPopGEgBG4IxZ94RZNFdIfzPqf/FiOgUgRUXQAbUifmsv1PFEY2LKNR89btzg5IgDgavGaNDWOcHB2waCnMgIRF5UA5bmQBbVZK8PwDXO5V1hbdUc= 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)(5005006)(8121501046)(10201501046)(3231221)(944501320)(52105095)(93006095)(93001095)(3002001)(6055026)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR04MB3222; BCL:0; PCL:0; RULEID:; SRVR:DB6PR04MB3222; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39860400002)(346002)(396003)(376002)(199004)(189003)(2351001)(305945005)(81156014)(81166006)(8676002)(6666003)(7736002)(6486002)(316002)(16586007)(54906003)(97736004)(68736007)(6116002)(86362001)(478600001)(6916009)(2950100002)(1076002)(2906002)(16526019)(186003)(3846002)(6506007)(2361001)(106356001)(47776003)(386003)(26005)(59450400001)(105586002)(48376002)(5660300001)(50226002)(6512007)(50466002)(66066001)(76176011)(51416003)(4326008)(36756003)(53936002)(25786009)(8936002)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3222; 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; DB6PR04MB3222; 23:UTWoIu24/ycRTquTq4RjUeHUVz6daIsQDD2bO0guz?= atdujDI/hTb1d5VXxzk/1SOsKxB946kMLluglwgiXnYmbB594hxKEkrRh5FS+nsnO1S0iRHAnEDGEP1aX4Wk4GuCDAreatzadC/vTQNcBNN7kpYkuedmCl8x5OWwbxTn/Pkd2QdLMICTNvb+E5+qIcMDsPxD1T6iWA8jyd8J3+Jxn2e8/ZpPlmU0Db2eS67RJCS4vLIF41sG8b28cgHZaVEiRL1NfSnDN9i/aTvGcDUPpFiN9Jt5260AKOQYjZgBS2w4DVOaHqLNhCAGI/rAuOgV/f+BvpdTD4OrwBGDDftiVe7VYm77ziELRWzkjbyju0vVIJwv3rExs5wu1KHw4sCn42GQjRJpXlQ8J7TBOITpwKZX3WE6PljPYTohTAkNE1S5GhCXYa/TDvvmlM+cX0tMlju6l7K4aQd7B6hWqwTVYzfU3PS72aCaO98IWylSyKaogEurIhC9/cb0QT/NdlLrwnQ+/gbFrP2VoubI2HQYgpuayOTgODqAvX9A1mLl0yTAcdTl7yANOFv66HlR5GM8av/LfVeVx6pQrjPHDg8xOMxLu7odrPNfqqCuSHFyN9uHeqmMFHVw1LzBmlttiqX9VQU/PAQ31rObIj2b3mRpCrFsCYKzKtqdBlyCTCejFd9+a5rkeSAfRW4jcl3JNjw88IW5Mtl2MOglh8zd5i9akdbykofS6aPQNZ1Wz4CK9FGG+EpCDG3id9b+ajR0s7vJ9DJj+F17lsN4i6LWj5L900k47a/GnH/oI6u5AlZlnH0Ue02u1jcHzy7dFNLF4BGR+TVnnSfNOfFpVEI3RN/K1eEzvbTD8UO3z33evzGiTGI/RZxsw4NwvvSRrI75DbpLD3fZFFrbDcxD2AgwXZGhWtak/3+h//0bi8fDVR5hDORRCdT41KdB8UEdW4dOH+Cwo1heI3I2TokTA889dRVk4AsJ2NbPkYU0DDRtuOIb+t36HLife0EU+uQLlFRFbljweQ7O5t+CXiPxxhGhO9kUP+kpLS96abGSZdLD1pB6W2SXkMuQjHkXWTHOosYi6UdIpeRmP/4wUnB1gYJkWrUDEHVCalG5Z9TPR+Tebgmo7GJMQlwZrbYqzeqxpZOntZdehcyQ/JjzLfWbkJf29bImTpLKWPnbK8sPjDWGtYITeAGSjO7oLUq2y3BQUEvvNtP X-Microsoft-Antispam-Message-Info: j2sRhW6SztWZIu4QPlTCgkYC/u5fA1voifyOg9/YzOQryLqLcZRkdN5YncMMKoZHNixZ3Cj/yufjnTAXVXxiBvVCajAQkclS5bY/zrr9z8ZN4n51e1MfY+3dBy55umYmtJMUzWg/60t+QuzvjHw8vuEPBvcjkiO2zRA574cTV83AeCHC27QBUSTaVfHqugXk X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 6:nBJzxwGi9S8r2lR4cUc+mOGjDjMpegmJIOqJpqo3Y6yA7EbP5FqEi+eh7GibRklOMoEk1hPhhrWBsZ1IR5WvWCx68kqVXPDCl68gji/JuNR4xLrkuDEBxvnFbH2xRA7es+y+Am/rwibXjbsH7m5eSpcIahC4/pUK0HSrENu4dG3lm35u+X7nWitFevMk2JhvC4qJCgYpxaeHGwomgrjBJjdoFSx+Olf7jc4+uvWpIgrrPh6INI0xcfoSESid0mBLWnoN22KMfL1aAnBUlHU1IkECKRi0etqH6aEOU8S81TUtwRspyAtvpuXEBAKcq+kwOy237XZkr18CzKjwnZqhnV5Rw9aiD5b3L/0o79GuGJ8=; 5:cEI+ymTq3g0mr1RojUGxAifhX/RqxjQ19M2rWrVj3IVbviM0MvXX8xCBKSLw3Boe2bIOxXQdh3WhI+gY5OlxZkeHW7o7jjPCKEjpyGAL1F2v2xdyBPDm2wULt8fghNKnuIcC/0vLT+vxmhUcc4mKPnnLSC4V0JInvEtMzmiYpCE=; 24:eiSBGdI8CF3H+rAIMpPJSpwXWZ7/ZEUU3VgFK+8igSu4mTmOZth0+3l2ZtHCJzy80PGD5u5CtvUmQ4olbKJ1UkzTwTBJ8PeCug/I8jf+/k8=; 7:GEmBbOH8O8GU3WzeTlvx8qPK6+KuxQPCUINcsTBtZsvgdGC3YvKGXQ4rUwvIM4fxHdKuXfXbvNdJ4t4Fffo86mxS8Waxq+x5i2wIdQCZCPIUBTYmiKJ1SpEYiRGRDwr5UXOUXUr3+qMqRZNllBW97p9ZeXAf4QT3Nn2sE6ZPY96uihX89X2Tz4sQZ3DOt6M7qHN4GGAUXLooL6aSMLbONZ6SI3bdr303ZNe6mChHB4/qOxgZl/DJNijnfdtGx6wA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 09:00:21.8729 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 56685b3c-1bd3-4523-08ca-08d58f0a2efd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3222 Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 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. To i.MX28, adapt to use the new config Signed-off-by: Peng Fan Acked-by: Joe Hershberger Cc: Fabio Estevam --- V2: adapt mx28 to use FEC_MXC_MDIO_BASE drivers/net/Kconfig | 9 ++++++++- drivers/net/fec_mxc.c | 8 ++++++-- include/configs/mx28evk.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index de1947ccc1..c5fd6f648a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -147,9 +147,16 @@ 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 + 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 21 09:01:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 888642 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="fGDWanxe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 405kMH6YgWz9s0v for ; Wed, 21 Mar 2018 20:02:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 97765C21DF3; Wed, 21 Mar 2018 09:01:46 +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 295FCC21DEC; Wed, 21 Mar 2018 09:01:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CDEB5C21DFF; Wed, 21 Mar 2018 09:00:32 +0000 (UTC) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0045.outbound.protection.outlook.com [104.47.0.45]) by lists.denx.de (Postfix) with ESMTPS id 90F00C21DB5 for ; Wed, 21 Mar 2018 09:00:28 +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=XMbsLaTZYQLG15lViwKiEfY07jpNSKY7bqsc4/67L0Y=; b=fGDWanxe2OVTcBTmxfptJt439xt70O792dcXuWmElYiStogwH5sYO2BNTyZepkNTqjlu6c8SSQJOj06OXUmWLV3PeM9PCcU+JFkTpMy7sdg91gVEyak/mSRuxRthlg8QZcELqh2WyUOIyX5/brpkbhQS0FkQYjcc4Uij4QUIcUM= 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 DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Wed, 21 Mar 2018 09:00:25 +0000 From: Peng Fan To: joe.hershberger@ni.com Date: Wed, 21 Mar 2018 17:01:51 +0800 Message-Id: <20180321090151.14917-5-peng.fan@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180321090151.14917-1-peng.fan@nxp.com> References: <20180321090151.14917-1-peng.fan@nxp.com> MIME-Version: 1.0 X-Originating-IP: [92.121.68.129] X-ClientProxiedBy: HK2P15301CA0005.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::15) To DB6PR04MB3222.eurprd04.prod.outlook.com (2603:10a6:6:6::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 35203a31-5a35-4966-437d-08d58f0a30bd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DB6PR04MB3222; X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 3:UYoRDzs6Uztg67FthxbSxGZOQMtvwvIoi5LqNpYQP7CxPj05KmXgaOawmiIOGQQGSJbEOG3Z7Pi/IEcd14R+eKb5mFJmWNyICdtvEYvh8e/yowHeBonZ6a1KV8SiY32QNHeUIjGwpgOIgDhA49NlTQuEcrKhbApaHsL0KAsVQP8pTQrZ3pydBA3aunkk8lxq4+xPlmGyVP5EZXJaXP75r/KOsnm5kVjEnWCPYdcc5bv/Gzmclw5leUX86+gMjMs6; 25:S7dLvmA++zC4RH/vteNxwDMPYTK+Clq/aW3FPkPl4/jW1usv7z+U/+MWD+GcndgKz26Xk86uwr2Wf1ysC+a4JSgwTjEi3yENa3l+fSvKw7XN9Onep5uxuijd16qUTmEMpKjxohVFlnmNuycTi1hjACne3niZ7JoQdnyaOKtSAEjzRq+BfDOaWs0tziR6Yl5M6sjo36I/GXm4lf0Fzv/riNtNShR6Q3vzyUtNTzIZ9/FhwYzjyzSJbOcGbe8acc9AsH5eqA+CuhseBhNA+ELIndBP+xJuZxPX673sM2qiUXpu89LpwZmmC7Jxdw237G/2yqHn00TtKN0NbS+VxrcYfQ==; 31:Pg1hP3KJ7aMFKhaOJSEgYMO5tGl9l0CgtmJQGDuPydTy5J6284R7Z7QKs0t0KAAQp/7gVJA9pRIX1Em/ZvnlMKsavNXHZYLtkfWyQ8WR7CT6EQmL0Z0gOm0pVhk4BnCmZFnGBSCaTAUwXJKnlhS6W/s73YTiktuN27ds66oiTo6QU2+st4pkTxoNWAYv4yx7R6SyGzFg2ho9yPOFkXQ7NsfZwGb/UZdW93tlg4B2gA8= X-MS-TrafficTypeDiagnostic: DB6PR04MB3222: X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 20:uaxDwBJBbXzQMlU/e0qJE9l0LIlTZOlVirxPzhP0Vs/MsZayPkSVxM9yNayIwt71TrARN6REVMLl/56tYksU0xxyEpC83ztCulcHKVQ9XCk6Z1MLwLJ9lvm1qKttLokUCLBkS6Hwixz2n8T+Gw4o2+nnwZ0oZrk2BWjMHiL9PwZC1n64YIKvOHdeRRYcCgZzwZm+WzL7zd65qFianY6chsJv6X69Q+lyHb8Ht2Wx9Yfr5sVJkTe1CgT0zKPFFqzh5iR7sgm4WJIWLCIItjoyjni5NGf6PM6tXjv7yw/eVEzQLGBnxuRiwvxOXCuYQnIeprjL7PQzwCM44Crd4m8L871SeZkRC4T93U4kVKu9SAm13uxOCPZTzLrWl2jfGg2Vgo0yN56LTyZTcC2aDH2gBvEvYymeSiyB0sC1KaY0k+lT371U6PlWl3v7/0VMNuBQ1JQl5Dg6Y/sEaWC2ZKLAwSoWRda5C5h5MGnMRrNXF35d00eaCYioTMFNHir19No3; 4:jzpsmv95JfCddPJohaLOhzJeLuFVeAdCm/IiyEXX+OksDFBsC3pnp3E0yFWf9mkZIsoHq13QwZltotYf7ljYJ/nU1E4GA14FBXsakuDwd3yWqXgdsUoEyY/Xui5fv9PHMqxXIzZAAnlBRprlFH2HdPfO8YP+0ucVZ0navJkPKjnYYxxBLCJq36L2Dz8qA2aFbLcP3bSa1h7aI8kz1zBbkNMa5GlelvE9+ozWCG92VFOfQgeVeUX3PeTnzHZh6SpU7D4psF4jZ5h4YnMuA0RkTPxiVNcJ/f+6m+IKN6eAUFA429BJLYzg21ufEjG9ehdSkNNkvtEHcuIw3UWPLoqDSJpuqUFzSDmbdzXNqisBBOQ= 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)(5005006)(8121501046)(10201501046)(3231221)(944501320)(52105095)(93006095)(93001095)(3002001)(6055026)(6041310)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DB6PR04MB3222; BCL:0; PCL:0; RULEID:; SRVR:DB6PR04MB3222; X-Forefront-PRVS: 0618E4E7E1 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39860400002)(346002)(396003)(376002)(199004)(189003)(2351001)(305945005)(81156014)(81166006)(8676002)(6666003)(7736002)(6486002)(316002)(16586007)(97736004)(68736007)(6116002)(86362001)(478600001)(6916009)(2950100002)(1076002)(2906002)(16526019)(186003)(3846002)(6506007)(2361001)(106356001)(47776003)(386003)(26005)(105586002)(48376002)(5660300001)(50226002)(6512007)(50466002)(66066001)(76176011)(51416003)(4326008)(36756003)(53936002)(25786009)(8936002)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR04MB3222; 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; DB6PR04MB3222; 23:6wG7XHDisPIXYIw4/GpOMFxnjW6ttP/U0otaF5ocL?= k5BewLQ3/zPtQ8OzBkVo2QhBU0Gl5gYN7rUby2C2I7F8TQCItMi57fyXDEkZvKmoyfT/s51yh9OgHiGxjQgyknAC2X/+qV9WXzW/FTyy4VRgrZMP/gH6RzPA/HaFuP7zRokASx6Opbx69xUwBJBGiOQGYgXcAvjUzz5ugkgHp4wK6XOAOBlckr1HHlPAgEuqWlB8BpW+nQ/VOvjs1xEItN8F8F2EP71lzjswI12gIc+bnE1ZEom1sIHHffctEooULX6ivf9cwYJDFBopZwMI+NbluVcmM5QXOzPpkRc0tfQhf03jrmsAMG9N7yDu2vK7caz2b+QZWIrVpKYdxX/y+naeI0MU/o8thRk5IS533M96D2CEK8h+viGSjc50rqsWJpMensVzWW71BwqGnaq1N9aH10JPjAjXL4aSrvb8iK+7AfybP12oQVcs/AQGR8Xv9jxoHwvaaHxegxMB5/yVA+ZgJv55NC3HiJof1CmNAZ7TXKzYcmTgcmDzO+9YSGJFf6s0khbUoijCR7BO5DOT/dqJhu5STrOHhCfZSWg+ipHNv5024oLwLgk8D/qD4lhSb1Gny8IyvQBy/ytrKEKNZIkpeR7Y/55XhPCMFtsuoQ6/HU18ernSJEALrojzOGB98KacYQA+gwJ7R2X/VKbwRnk0yyLPgkVzpTk+kIvZO9C5nlt14ay6hyL8mEiGry4wud9wg5dOLLlPT4YuKY4KQadnp5e97Vbh7jlEw5QI5pJ6mhQUJ1dqwTQrUNMte6F6jIXPsU1OKNehB3cpK8sbnzCmBPNa+woYDXO0lyLMBtxkByh/0JOwH87rc9WyXysPU1WSwwpn0Kp31oiwId+DXNSNCZON85I5acBXUPx54aogNtkuQqRMCQmeEk6m6kiH301mGW+92jjZMgJDUKGwLcL8JfExohoM8DqjGmNk4pDVwnyi2zZFaeyi/VEFTV6GWiELk33af07Z4NHiOW0KK+y7Rgp45bKKs88b9ZOJZPK4x4Ud9Glv7+vyRT6X8v+mEQGYsfu9KzRqAm4OGX1W0jmb14IGDB01IsnbnB2kTr+xlHCDlyW+pHK6BGx7fXl6DNQ3MfzVfDZU/d5kbN4cfwSRlXNTHCTHHSYH8wcQ+WkVQ== X-Microsoft-Antispam-Message-Info: Ou5cNw/cuOgdoZ7Uiu8txwSnSHr41oYX6Hp61I0t/iITDlRKnby6gY1ypUmf62+3zF2YYfBk7bB28PsPKlmFJYfQHyb8qLlvKNQ4+sajmyJPMW2l+GjhX9INqRblWiIo2TVjZ5emyOHZ5tboDPdcROHRDHEjJxjkFZ9NLlTQPdlsKmpQHiiGHYCdjO6OTahU X-Microsoft-Exchange-Diagnostics: 1; DB6PR04MB3222; 6:HqPQ25eWZ2S/E/+glxLBEy2giKvzxVpefAgEud62+FpAN/1P01nNWwBL97neeYHvRzaaMHu8sGOIisxaFdkx2iyYRcfMatKw35tJK7bJx82CLymv//rYofuyhLZAY6vaaw+LTfmLS4JEyQzgF6ojKzf+v2ZUhyAFSKaHphKFmpqLruetbfst716Mec3nxBccOTgdM8ZB3dMgr+eu6z608th95b1clilxik+f3VG7vu3YKSo6BGqJppkTZhyI6LIHVUBUXbdcroeGERpLrxGrFdISYqKN5sU2yaw+OYrCOrsGtevzgU/MUTt/19xiuhWI6tYsbbSRLlcjDIWuthcN371ZrRkE4tmU64F+cTj4j5Q=; 5:hN4ksA3lzbrVHPY8OGkzePhFNw0/AgmwogAdWKz8HyegIKHVet9bb+hZxFwgV3upnLRhDfahVN/yDiKijP4Nker+wTPiXmNNEgMNOQ27kkvEN8xfPnYlhHedSVKwwAH6VKJMcjWfx3ua6GRYJiegtbLoVkNDln5j9ISoAbBHlmY=; 24:KncKHJTpIC8n/0hdrE/wNsHBzaPC2U4bOfk40vDs/8VmqwQ6qrZZGUFWgswTGwguWSHGM/WgSx4C8KqsAetlZXHXkQhMbf3zrh4rD5wPZ9g=; 7:hUAfsblYak9SXggpI7bxBmAH7KpKZH+LheU7vsOtkSwky35UYLw07zGJtXhpnMDoEOKuWoGQND1BtWYESbGfxH9T7rgjriaAaIUKZ7dYSLSjCaWd3BH000gv5oh6u8C9TfoakQUnuJuxehq3v0EcU63SMnN5X+bG4Y4lH4n7XVp99SUh97wTUbfRDVVfkbYo+4h8doX0fMGiOE0zZe58mshnlLI9uq3TUMCpLHLKIRbEV8TLk8YQlwbuc/N1ztp/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2018 09:00:25.0604 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 35203a31-5a35-4966-437d-08d58f0a30bd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3222 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V2 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 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" }, { } };