From patchwork Wed Nov 22 06:31:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 840315 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yhXZc4NQpz9s7F for ; Wed, 22 Nov 2017 17:28:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3902EC21D6A; Wed, 22 Nov 2017 06:27:08 +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 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 74662C21F92; Wed, 22 Nov 2017 06:26:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A6617C21E66; Wed, 22 Nov 2017 06:26:27 +0000 (UTC) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0068.outbound.protection.outlook.com [104.47.32.68]) by lists.denx.de (Postfix) with ESMTPS id 86C7DC21F9A for ; Wed, 22 Nov 2017 06:26:23 +0000 (UTC) Received: from MWHPR03CA0015.namprd03.prod.outlook.com (10.175.133.153) by CO2PR03MB2357.namprd03.prod.outlook.com (10.166.93.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Wed, 22 Nov 2017 06:26:21 +0000 Received: from BN1AFFO11FD030.protection.gbl (2a01:111:f400:7c10::147) by MWHPR03CA0015.outlook.office365.com (2603:10b6:300:117::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.260.4 via Frontend Transport; Wed, 22 Nov 2017 06:26:21 +0000 Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD030.mail.protection.outlook.com (10.58.52.168) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.218.12 via Frontend Transport; Wed, 22 Nov 2017 06:26:20 +0000 Received: from ab-OptiPlex-7010.ap.freescale.net (ab-OptiPlex-7010.ap.freescale.net [10.207.242.203]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAM6QAc0027976; Tue, 21 Nov 2017 23:26:18 -0700 From: Calvin Johnson To: Date: Wed, 22 Nov 2017 12:01:30 +0530 Message-ID: <1511332292-18186-2-git-send-email-calvin.johnson@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511332292-18186-1-git-send-email-calvin.johnson@nxp.com> References: <1511332292-18186-1-git-send-email-calvin.johnson@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131558055810665301; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(376002)(39380400002)(39860400002)(346002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(77096006)(68736007)(189998001)(8936002)(8656006)(2906002)(97736004)(54906003)(5003940100001)(2351001)(50226002)(105606002)(106466001)(104016004)(33646002)(86362001)(47776003)(36756003)(50986999)(76176999)(4326008)(5660300001)(2950100002)(6916009)(498600001)(6666003)(8676002)(305945005)(50466002)(81156014)(16586007)(356003)(316002)(48376002)(53936002)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2357; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD030; 1:FMtRUxKPu5fL66YCSNJQNGgHopICUlFKmGfG009Un4WZlqpU1/3JKZUP9S8bhJ4jXMRabCfcCvcYAgNMvx5WxOla4rgmgLlungPA6mOmPnjkb3GeZSXzekcjMQJQMMY6 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b35bd690-43b8-462a-29f6-08d53171f264 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600022)(4604075)(2017052603258); SRVR:CO2PR03MB2357; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2357; 3:JmBCa4r43T32eAItzrfjgt2H+2WYuu16OASfQE3fvQO/6oxOiH3pquMQmqRPts86sZRrP6Rf6HUrTG88+SCHMS9xaaCUkgNAnmmo6jRdleWZJeASrTaFuSJ80u4fzBaM7W2W0k4YslRHIOU+iVvRqGkctlI1lNNS5Q98WRPLSGAXurnRFtj9x1GiV1aE5WVNnT+dsMd0CeM/Eb6PzI39P1j4S8f7hH2EhQ+R/GWRzssE00BibT8++sCwwjzlqixt5hghzVCmOAp6yC4N452aixACE+uDpE4Jw5FAbr4/c/Ll200JmKB5i9IoS01TCsRePfcKvDRWYfm2qRD6qHpIlUyO3/b9Fp3w3NpIvsmrU0E=; 25:707Rj5azP1JkZuFau+SvGpSQmzJyKAhH1vzuRJK+t/evUhOGeMNUYROm1034DPcg1mBrUo1ctiU938Sc35w96OZEMOHn3vtU+W/zu0t/r34WMrQsFtDE/6RktJv6Cxb1klqpZ97Jy/h7KbHRfXK4NdDeYiHiADC9IL8XSTJmXE+QdmTVqgpxjXF5X8/8cR3AQvSHTu8UEEVVHDZZ365epAqrx1+VNKUXWfmDbNNmsg3uSNTWmLedQZqrqczhraeR/QaRkioFTBZF1XAfcU+8H/taHBhGKTuOJGJe1EtO8z4VuGLCfb/t4tD+s6p1oIGSxYtV7q0BVkIlPjbCJCSZXA== X-MS-TrafficTypeDiagnostic: CO2PR03MB2357: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2357; 31:GbqJDB8VmBpDkh+Jkyc9xC4XgHKIvE6qo+GsX7dreV/D/WnosBQhgpjNuwfDBLaH2MTbka+QsGvKtvhAwLre4ex4+gCenKM8HOyEGlzSwE5o1yx8odQBGkI5jtQjKcfHSgk6posjwQHi+U5RRUM2Mkpa4J1m4fHh6dYfDLQDpSK4YAtAvzzhdSZAfFiRGOv2zogavXZ7zLYgTJ3YwmP0cbnJt+ZcgtJ6uVapr8BTzoI=; 4:oiDvdgdj9GR6+Oq4XNGRq0kRFvQMcG76PXaWYXryuSYl1qgp7TX1IIO9eMomHPduu7DIcS/U4Z2/rmfZuqGLZ+T9NA0jfFzXln1xWeFvt3KQAWEbFbVCMmfBYtXKKdarELCmqKgWRBItTtB0JNJzJVRpyIwNaDa+sxzWrlL/FiomLXWiqKee1anQMd8BHJ8qhTO17eOgxJDtZbj7iucNmN5UuP5zi1EEcjNLgVG2UvXMKTR/7jqQDnwo1LgsluqfLefpCFWoy5ppGPd7mPsxU9W5LSh9JK5ic7KEgnRyhZGJD1yTumxKaKnopPUeVCIR X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3002001)(3231022)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123559100)(20161123561025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123565025)(20161123556025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2357; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2357; X-Forefront-PRVS: 0499DAF22A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2357; 23:xOjUmUFhwSvWgPiQNpaZqkOa5h6f5xwv+MnB3ydKt?= VP4i1badiMm20s7DNpjp3H4YLf/Bm2kXNJQT45TzodvuxKuZvSRw7o51+SI6ub/VAHn5/B84Dnl8HGUH9VBleC03YLJdluuZZ34a/4yKHncJP2DMzUxQejI+PaoF2iLaLzJqoB02B7pWiI1sS7MrEJChmajeZYc8lX1+t6V7AJ/FaOerZmNEjI2BcXb1nj0uAHeZbclpHinUXCPG5yJEWs6YZtLvoZju+sUktponaawo7FLFT2HyopVY5xrUiSIZ5XRnYAcfNu9/IAfG/8JooOdRkeigYhhEAV80tQ1Fii3/+ZbylGBV08Wk0S8gzlNR1HOWnR3o31llDpGEGAqDYXTX4gFUnr65kTpWBCb65Jxm4gjz0txMrbjQmuPwaDTvpNeyIBZ3PHQlpmLwPOCBQ49nBkdKfST4ZunpDadecmn89X1FM9oe1prZ3ufLBJPOFHNEwUJqkJqxW4rEQtg0L+6L61vKpos/gIzxMDzXRZzA1AOvtW52JYPoBFMW7REssQKpJ1xhh3C/ekvcr14bo9FCA+bIc3i02bz0bb+kPVJ8liJOUrmKKJ/yk0eh2gdI/XINL0VnW7C320DeRi1DPYF4/FAukN5QhUT7pZPvj0mgGBRJqoBo5XNTflmnoAORknQGe/TAKN5Vjumj8lPDBgHc6avQmP+4FF+mwN6mO8OY7v4U6dZVz2dvTOGQrEohL3KGr1DwRo9KN/jkNhC4n+tvKeqkZqXTqCiTdWvaNwkK7PoxynHg4jJS8mTXTFsNnu3cOIhRbK1FKswJQcMmYTfDmexnr4XEXPdMbDwxIgZch+blwpwJBGkByyl957fZQNVwMiULpnlwGkXen6gHTGLzb/MGRVMOW2/jSafUUixZsZcr/+m6dlGYa5y8AxUO/61AGldjaj7bIAPru6L3rGHSGaXHQsycHErC2tmXWiBJNeVGiF3aCXST+vK7c9cojn13AsZ5yWlqTsdpwvK38kp1LBeVih9B+4lASky8qV0CdeAy6RnDd/bs9rES/lA3zVijeH+bAQBri+1RtWTHPhu9dQ8+pQ1ELV4PnUAwmqkdGUZKMlGYpF2e8i+42uCpUz4LEwT171NQq/46F13JJEN X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2357; 6:w8TBAcCErkUuj0MDAEW86iqOAZ92okXLSgMH7GEirel5RtIZ3hTRwp2AsBIRETNrwA6T8oABGClQR/yDjfBCzRY9TXtAnB2g3phvbItn+Tl31uj071eN8o6r/69u+sFCb9IEB3Lj9dkfbAr6dtu4urDsUShv/CpQ3TPT8XQwm5LS1yHTDU/9GhGBP7eMddDq2rGLIB8PokOVrWX1OR5lVnDMEJ83hEkFg544xDkXtHfeJcNVgIx2m/3Ef5k1jqsvzGsPSrYfS5a40sDMGwG+/Iu1tQYUCi4lwoHxxvceucPJ0Efu9+5kUbehiL2Abyi7DR9h2T1QwzkZV1jgLq+gILAggSeX2p6AJrnP/xzEWok=; 5:+BtzEUMrA1oTp+HFy20xyXTw46fDlxByjyH5mUq4O1I6R4bcVGDY2BinSqF2AMNKGpEdYlG4JpWugXjAyBd57CR2adn934NqtaS4Gsx0T18zfAzLM1+k+SNV11qTDJbOi5awNInm5QePCME7sRZBx9Zx58zYlr9DLFn989qJQuM=; 24:boUHKgjf/SYXvALjlgiLxR0rvswFcVbOyp+lLIvGasyEBcIsUFE9PB/PPgeddiRbtbXg0e7PpEy1q2AfwSQCEgOZh3F7XrWRFBXSzNtBnDs=; 7:zFBG83F/JvbrayG4HvpW0nK45l1euNeHx2S47iTc0T0aAOAXthsnw1j5E8lryUE93gzDF6+G85XZkqOgtftT2P4zDfRDpMeqB9QGOAx4AOMNy9A6+b+quFyryxQdeIGjDTRl8t9ieoGXbH/ew02vrDTOQWMsDbjyHe8E+ZK4ngAVoHgBKQwAhUX1CyrUGQs2iDq+iSZYzOkrQVIONf5afLPI+OXPA3is63HTYWdVJ/IJBawE99xR+983a920st9B SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2017 06:26:20.8793 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b35bd690-43b8-462a-29f6-08d53171f264 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2357 Cc: Joe Hershberger , Anjaneyulu Jagarlmudi Subject: [U-Boot] [PATCH 1/3] drivers: net: pfe_eth: add pfe_rx_done to clear bd after packet processing 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" Create pfe_rx_done function to clear buffer descriptor after the packet is processed by the network stack. Signed-off-by: Calvin Johnson Signed-off-by: Anjaneyulu Jagarlmudi Acked-by: Joe Hershberger --- drivers/net/pfe_eth/pfe_driver.c | 35 ++++++++++++++++++++++++++++++----- drivers/net/pfe_eth/pfe_eth.c | 1 + include/pfe_eth/pfe_driver.h | 1 + 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c index 5336ba7..55fc145 100644 --- a/drivers/net/pfe_eth/pfe_driver.c +++ b/drivers/net/pfe_eth/pfe_driver.c @@ -66,22 +66,47 @@ int pfe_recv(unsigned int *pkt_ptr, int *phy_port) *phy_port = hif_header->port_no; len -= sizeof(struct hif_header_s); - rx_desc->rx_to_read = (rx_desc->rx_to_read + 1) - & (rx_desc->rx_ring_size - 1); + return len; +} + +/* + * HIF to check the Rx done + * This function will check the rx done indication of the current rx_to_read + * locations + * if success, moves the rx_to_read to next location. + * + */ +void pfe_rx_done(void) +{ + struct rx_desc_s *rx_desc = g_rx_desc; + struct buf_desc *bd; - /* reset bd control field */ + debug("%s:rx_base: %p, rx_to_read: %d\n", __func__, rx_desc->rx_base, + rx_desc->rx_to_read); + + bd = rx_desc->rx_base + rx_desc->rx_to_read; + + /* reset the control field */ bd->ctrl = (MAX_FRAME_SIZE | BD_CTRL_LIFM | BD_CTRL_DESC_EN | BD_CTRL_DIR); bd->status = 0; + debug("Rx Done : status: %08x, ctrl: %08x\n", bd->status, bd->ctrl); + /* Give START_STROBE to BDP to fetch the descriptor __NOW__, * BDP need not to wait for rx_poll_cycle time to fetch the descriptor, * In idle state (ie., no rx pkt), BDP will not fetch - * the descriptor even if strobe is given(I think) + * the descriptor even if strobe is given. */ writel((readl(HIF_RX_CTRL) | HIF_CTRL_BDP_CH_START_WSTB), HIF_RX_CTRL); - return len; + /* increment the rx_to_read index to next location */ + rx_desc->rx_to_read = (rx_desc->rx_to_read + 1) + & (rx_desc->rx_ring_size - 1); + + debug("Rx next pkt location: %d\n", rx_desc->rx_to_read); + + return 0; } /* diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c index 4db823f..6d2906f 100644 --- a/drivers/net/pfe_eth/pfe_eth.c +++ b/drivers/net/pfe_eth/pfe_eth.c @@ -198,6 +198,7 @@ static int ls1012a_eth_recv(struct eth_device *dev) /* Pass the packet up to the protocol layers. */ net_process_received_packet((void *)(long int)pkt_buf, len); + pfe_rx_done(); return 0; } diff --git a/include/pfe_eth/pfe_driver.h b/include/pfe_eth/pfe_driver.h index 28997b4..2a539e2 100644 --- a/include/pfe_eth/pfe_driver.h +++ b/include/pfe_eth/pfe_driver.h @@ -51,5 +51,6 @@ struct tx_desc_s { int pfe_send(int phy_port, void *data, int length); int pfe_recv(unsigned int *pkt_ptr, int *phy_port); int pfe_tx_done(void); +void pfe_rx_done(void); #endif From patchwork Wed Nov 22 06:31:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 840314 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yhXYC14NYz9s7F for ; Wed, 22 Nov 2017 17:26:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DAB8BC21FA9; Wed, 22 Nov 2017 06:26:47 +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_H2, SPF_HELO_PASS 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 834AAC21FAE; Wed, 22 Nov 2017 06:26:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5E021C21FB1; Wed, 22 Nov 2017 06:26:33 +0000 (UTC) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0065.outbound.protection.outlook.com [104.47.38.65]) by lists.denx.de (Postfix) with ESMTPS id 76054C21F98 for ; Wed, 22 Nov 2017 06:26:27 +0000 (UTC) Received: from BN6PR03CA0068.namprd03.prod.outlook.com (2603:10b6:404:4c::30) by SN2PR03MB2368.namprd03.prod.outlook.com (2603:10b6:804:e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Wed, 22 Nov 2017 06:26:25 +0000 Received: from BN1AFFO11FD020.protection.gbl (2a01:111:f400:7c10::144) by BN6PR03CA0068.outlook.office365.com (2603:10b6:404:4c::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.239.5 via Frontend Transport; Wed, 22 Nov 2017 06:26:25 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD020.mail.protection.outlook.com (10.58.52.80) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.218.12 via Frontend Transport; Wed, 22 Nov 2017 06:26:24 +0000 Received: from ab-OptiPlex-7010.ap.freescale.net (ab-OptiPlex-7010.ap.freescale.net [10.207.242.203]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAM6QAc1027976; Tue, 21 Nov 2017 23:26:22 -0700 From: Calvin Johnson To: Date: Wed, 22 Nov 2017 12:01:31 +0530 Message-ID: <1511332292-18186-3-git-send-email-calvin.johnson@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511332292-18186-1-git-send-email-calvin.johnson@nxp.com> References: <1511332292-18186-1-git-send-email-calvin.johnson@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131558055852749296; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(7966004)(336005)(346002)(376002)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(4326008)(8656006)(50466002)(48376002)(189998001)(53936002)(104016004)(77096006)(97736004)(8936002)(50226002)(50986999)(54906003)(5003940100001)(36756003)(47776003)(85426001)(86362001)(76176999)(316002)(16586007)(8676002)(81156014)(105606002)(106466001)(33646002)(305945005)(6916009)(2950100002)(6666003)(2351001)(68736007)(356003)(5660300001)(2906002)(81166006)(498600001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2368; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD020; 1:wShF29iOdt0FQdb2P1GC0jnwjasxloUN9dXGtxYK9OYgWsSE7dTFRRd/MlTS05jpx2Mu7ndHj/0IiBCbv1YaH/cdTWdHtqdiB+8HClw0RmZ6aM7Dq4mzlc0nHauml78I MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b0a5c8f8-48fa-4eb6-a6f0-08d53171f4d5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600022)(4604075)(2017052603258); SRVR:SN2PR03MB2368; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 3:B2e9Iydteg2xaYihUkR4GNEUHIvGtNtil74BgKrW4Iww41+jyglnHvk4S5eXgkc7TLabmoEr/ugm7sfLu7y8cODyufTck9EI5AWBwMV3Pxnvxqz8oBGQ6vhU6aS+Lx1P5cqGcJxRcrnZ7CV/O3AW33aWf57zvSk59yuwhudeMhJWnreULiw1mGAe4OeQeliaQ/azfNM8lAd3UJs1lowV/t/u9/8Gap4jKNo5DYI8Kx0Pl1Ot65y537jwFLHkZfRNgFffyq+9uVHU+/n5G2A2A6oZEk4RQLzSntNP6OeIGq/tVGfvDMuwuejmww3OaFsz2Mpv8pcZk5YhRvJHUz6wo///XUVeY4Z5WtedP3DIiTE=; 25:fIITOvHMJqzl2ORNg0ar5Y3gadCDw7FrzZPFwAy4LNqAeQjwXHi1pKKMS7J8i7C4wZraM8h932Ft42vyGIVQjJtfdxsZmnIuXdnTME/9Khy+91xyyVVr/IArNaNqvjVY4DgoVcJfYGRsDY1OOoiXURsLXRcQp8RSZOXUabBY96oF6FgyYlFwEChvKtVkTcdhkrrzlEBP9KWc1JMJ7a/N+Hn1AZ2YN6fqHvk12ALYf8FjlpxsTeV78/aUU6I+mV+pdjq1jdH1aEihVNpU7uJYLUev8n7MbCO+Z4plpIwiFsfMemXIcCd4f0vqyg8jNpy+0yokghAiTzqq3IfZ51VjEw== X-MS-TrafficTypeDiagnostic: SN2PR03MB2368: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 31:Hz2hB6x6WZ+MbR8gFGc7liFi2cyn72LOyLokmvnMV/U10WziTChY+JS7Sv0cz1eitFlpmFfYIQDXdW+ZrnX0KLQJIF2edFXZWEGx79dCAu7xSuLml0NAZwnFjfsL+QhY5+hoF3xwKU0qAkQC89THtZxlVke5wCEuo7vo3Ucr2FeAio/9YDFUJufjptHk7CHqJSxc+qoL4Ljs/jMuiu48vazm4UKOe2DgWudo59YlIys=; 4:kE94mYnJzp0G+TdiC9JscxCeBg5vL+OM/Vq+SCh6Txe3kvVlt1HWH/qqWH/t/xk/wHeNpUE7SgurrnUktcN2zaGVtrDyvjid9nt/Qh6FvCzeGZlhQ+8HsdWkdgravpbggX0BiFzcwqqONJ1NWhjvRkJQp2TRTJMh2gxOqysnjPwQ17exkEF4FrADRHgjbnvxv23u2kgWN2M1I4i4jTXigT2jxXyvmgP0VP/8Psi2UI9Lk0Ae4Tq9OAgG7ctE9O6/JwRCBr9oIvbBKPuiCqkWtb3b0K7+uFZXOFH/6b7jHYVdQ5NFMFtfNOD4w00q9+TE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(3002001)(3231022)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123563025)(20161123565025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123556025)(20161123559100)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR03MB2368; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR03MB2368; X-Forefront-PRVS: 0499DAF22A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2368; 23:OwWl8RgjWhPSKgfUIYXOFcPqQkSeeaGeu6sm+GSAl?= HpXPNzC5QeJ70WO/w74MVu/EI7FuRc4SrD9pZ/8QNdd8p9gSL2cQph8NJ93CY2uArhouQe+qfHxIwTb66EzarN0OXaxilvcRQKpFAFK3dp2S5kmWygG4LkAhxU00vZUsoT4r1uv5xSS5aiwuO4sjvsNWI/e3ursUJXMcJ6hc3RBzC2LOUm47Z43a1G3SnAPhUb3iHiirVB3aszinfSyu4/wkm1wJZg9zs/4dl5lOMTQwus8vns+FXC8K/gY6LRYOf14ySFg3bQt1F9ECiOwxchmmqhMPYt37e+wp8UBgCXDVsVF09I0FyziIiu/Wtt9+9V3KD/eJspgv2PFJGM9i1Von43u4mmlPZ90+uZeNEI+hj4SsceJNf0wiFSQ5On622kpPO4OJwUlCH18t49mB0T0MUxOWUOAXWBHAL9pVfWuxPQYt1OSd15EyJZQe7JKSOU8EfPmOJd7ArzcNX5BzDUHJYss8RMNe/X1Sq9y3Ol7jGw64BKB31aZ27pbSM1G6+ThRQybyKdJsAbSiSkYMCH7ek/xs+iG26W4zBOYvp669kkorNkHLVTJfuBQ9i3QbtZfmelKRR0EhC5BvDrD2AongQzdhFluoLpc6tofsmhCtUshTbjhMX6do/RPIcpb9YqZmj0WMcimAjbTECsndqCsIe7HF2Nkq8BvYlFs+ejMczNf9E7jhVyK+LYsr9rNqc/bAJfsP2bvFutNMG71ZWNq+ghxpG4fm27LDrP8+oNtQHoQvW7M6FszADg7djgABbXH7rpeF3a2w1prmxY+G3mFuOhYT5C9CNzyCS6YMOFb3LVVXlIZOGCVDQDcSwxaeY6F4ohAyZY9ArVM5vufkZMPJAy1rsdGslj6wvw0Ykyvc17ubIHdG1DUIpS0v0+2ZDU40qLVloTX3hG9gD9/Sl5Fw4aJcwHMBRO+xwrJKo6YHPidVkU6L0O5O/bHAcN/mS5agmT+x8qxv3g7sK4pvvx1+MfHuhp3joiJCyjhlSw187dgU1VNYyHafbGz+aQ7hFy+lmkq/XhFpdtaPe0gykZguXFYzr4wUjhSGgr5DP7HPb6S+Zp9tzqSWnT4J31p1ErXqDSmr2Lr3L59ZenOmKbu5JAbzZZdsJ9KFZ/s7VoyLA3AH7w+iHdOcvdG0yC1IvjWCIIilzngNSww7/VPrfiMmHYSJsVROHpEHapt/6V3tZQjPXVKkOOS4uTuFTOlcU1hkGm82wHWRw7CreNNU0wx X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 6:+Y+5/B5kQFCkgCjytCU+J9aN2lPHp/sR3o7ExYTi0VIjXZ0dtzBGh/BURUnbtAyGFkUkcccccLKFfSmQ11UPQ/UAWjU3S0tdg72yOTtEFBsMwcB0tDDVBPw3Ty1hOhBKlfFzDUDc8sYjjUKVzK1IcbVealJ8Y6rE8qw0ylJB3ys2TagR5baSymAL10cx8Djc+Lgo2LT+DywE36enPlWwq4X1516LuvYi3B7L3O9SKRRAONKdQrLpP64VVjeD0dCeGXxFghJszAkG1YeiMR6FZUyNAHgATHfm1BGwCW2yHth1ae4Wt67L5lbh1KT017DnOnrrdZeJmrB4hjNqA6YwH13uyBmfMeqZMcLVLcZKMVA=; 5:QUZehSmInBS9KDY4jmwUyREn8grh1d/5fXrHU/6d46S5yJL9Cct4obLbSD3j3iLVHKWjX64JbFKSX6VHoGfXwub00JblkBLMlUJSKQwDDfXki/TA6hp5GXlVTyZw9W8TDXzy8w55vakoSymSN0f5bGSGilOJd7slpKOJlDR1kR4=; 24:Reju0Boqyf3z9HM/QqliGrPpBOGWBkTgQBCBn3YcMtfVKjnmKORxGvm4TBDIm7QWGNHRrBEKQUITb6X+tzzReL5fTau3UwVa8nVStAoYDSs=; 7:pA1lIQ+5uNg+WfpMhOh2BoHth5m0JNJ24ylQTYBp7lADo0bSXavYLZRxsHg9mTgw5saBQ3PioyymCQbxQ0IyOrvlzrvC4iDbvjyz/ANWQ5PtrRaIwOIcTaiDXtSbqvu65DJGe0R1hLXDAfW8VYMWe84diOaF4FDeFWGr9AXfvT2WQkYFQvPalyhJlyVVHRxqKNBggB74yEbHUs+uof7dffZimH8CiDxVAKZRpKyTRb/puBrIPWREhVJAjMbKgIU0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2017 06:26:24.9941 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0a5c8f8-48fa-4eb6-a6f0-08d53171f4d5 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2368 Cc: Joe Hershberger , Anjaneyulu Jagarlmudi Subject: [U-Boot] [PATCH 2/3] drivers: net: pfe_eth: use writel/readl to access hw bds 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" writel/readl accessors should be used to access hardware buffer descriptors. Signed-off-by: Calvin Johnson Signed-off-by: Anjaneyulu Jagarlmudi Acked-by: Joe Hershberger --- drivers/net/pfe_eth/pfe_driver.c | 70 ++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c index 55fc145..730aca2 100644 --- a/drivers/net/pfe_eth/pfe_driver.c +++ b/drivers/net/pfe_eth/pfe_driver.c @@ -35,18 +35,18 @@ int pfe_recv(unsigned int *pkt_ptr, int *phy_port) bd = rx_desc->rx_base + rx_desc->rx_to_read; - if (bd->ctrl & BD_CTRL_DESC_EN) + if (readl(&bd->ctrl) & BD_CTRL_DESC_EN) return len; /* No pending Rx packet */ - /* this len include hif_header(8bytes) */ - len = bd->ctrl & 0xFFFF; + /* this len include hif_header(8 bytes) */ + len = readl(&bd->ctrl) & 0xFFFF; - hif_header = (struct hif_header_s *)DDR_PFE_TO_VIRT(bd->data); + hif_header = (struct hif_header_s *)DDR_PFE_TO_VIRT(readl(&bd->data)); /* Get the recive port info from the packet */ debug( "Pkt recv'd: Pkt ptr(%p), len(%d), gemac_port(%d) status(%08x)\n", - hif_header, len, hif_header->port_no, bd->status); + hif_header, len, hif_header->port_no, readl(&bd->status)); #ifdef DEBUG { @@ -87,11 +87,12 @@ void pfe_rx_done(void) bd = rx_desc->rx_base + rx_desc->rx_to_read; /* reset the control field */ - bd->ctrl = (MAX_FRAME_SIZE | BD_CTRL_LIFM | BD_CTRL_DESC_EN - | BD_CTRL_DIR); - bd->status = 0; + writel((MAX_FRAME_SIZE | BD_CTRL_LIFM | BD_CTRL_DESC_EN + | BD_CTRL_DIR), &bd->ctrl); + writel(0, &bd->status); - debug("Rx Done : status: %08x, ctrl: %08x\n", bd->status, bd->ctrl); + debug("Rx Done : status: %08x, ctrl: %08x\n", readl(&bd->status), + readl(&bd->ctrl)); /* Give START_STROBE to BDP to fetch the descriptor __NOW__, * BDP need not to wait for rx_poll_cycle time to fetch the descriptor, @@ -137,18 +138,16 @@ int pfe_send(int phy_port, void *data, int length) bd = tx_desc->tx_base + tx_desc->tx_to_send; /* check queue-full condition */ - if (bd->ctrl & BD_CTRL_DESC_EN) { - printf("Tx queue full\n"); + if (readl(&bd->ctrl) & BD_CTRL_DESC_EN) return -1; - } /* PFE checks for min pkt size */ if (length < MIN_PKT_SIZE) length = MIN_PKT_SIZE; - tx_buf_va = (void *)DDR_PFE_TO_VIRT(bd->data); + tx_buf_va = (void *)DDR_PFE_TO_VIRT(readl(&bd->data)); debug("%s: tx_buf_va: %p, tx_buf_pa: %08x\n", __func__, tx_buf_va, - bd->data); + readl(&bd->data)); /* Fill the gemac/phy port number to send this packet out */ memset(&hif_header, 0, sizeof(struct hif_header_s)); @@ -171,15 +170,13 @@ int pfe_send(int phy_port, void *data, int length) } #endif - debug("before0: Tx Done, status: %08x, ctrl: %08x\n", bd->status, - bd->ctrl); + debug("Tx Done: status: %08x, ctrl: %08x\n", readl(&bd->status), + readl(&bd->ctrl)); /* fill the tx desc */ - bd->ctrl = (u32)(BD_CTRL_DESC_EN | BD_CTRL_LIFM | (length & 0xFFFF)); - bd->status = 0; - - /* NOTE: This code can be removed after verification */ - bd->status = 0xF0; + writel((u32)(BD_CTRL_DESC_EN | BD_CTRL_LIFM | (length & 0xFFFF)), + &bd->ctrl); + writel(0, &bd->status); writel((HIF_CTRL_DMA_EN | HIF_CTRL_BDP_CH_START_WSTB), HIF_TX_CTRL); @@ -208,15 +205,15 @@ int pfe_tx_done(void) bd = tx_desc->tx_base + tx_desc->tx_to_send; /* check queue-full condition */ - if (bd->ctrl & BD_CTRL_DESC_EN) + if (readl(&bd->ctrl) & BD_CTRL_DESC_EN) return -1; /* reset the control field */ - bd->ctrl = 0; - /* bd->data = (u32)NULL; */ - bd->status = 0; + writel(0, &bd->ctrl); + writel(0, &bd->status); - debug("Tx Done : status: %08x, ctrl: %08x\n", bd->status, bd->ctrl); + debug("Tx Done : status: %08x, ctrl: %08x\n", readl(&bd->status), + readl(&bd->ctrl)); /* increment the txtosend index to next location */ tx_desc->tx_to_send = (tx_desc->tx_to_send + 1) @@ -248,7 +245,10 @@ static inline void hif_rx_desc_dump(void) rx_desc->rx_base_pa); for (i = 0; i < rx_desc->rx_ring_size; i++) { debug("status: %08x, ctrl: %08x, data: %08x, next: 0x%08x\n", - bd_va->status, bd_va->ctrl, bd_va->data, bd_va->next); + readl(&bd_va->status), + readl(&bd_va->ctrl), + readl(&bd_va->data), + readl(&bd_va->next)); bd_va++; } } @@ -271,7 +271,7 @@ void hif_rx_desc_disable(void) bd_va = rx_desc->rx_base; for (i = 0; i < rx_desc->rx_ring_size; i++) { - bd_va->ctrl |= BD_CTRL_LAST_BD; + writel(readl(&bd_va->ctrl) | BD_CTRL_LAST_BD, &bd_va->ctrl); bd_va++; } } @@ -322,14 +322,14 @@ static int hif_rx_desc_init(struct pfe *pfe) ctrl = (MAX_FRAME_SIZE | BD_CTRL_DESC_EN | BD_CTRL_DIR | BD_CTRL_LIFM); for (i = 0; i < rx_desc->rx_ring_size; i++) { - bd_va->next = (unsigned long)(bd_pa + 1); - bd_va->ctrl = ctrl; - bd_va->data = rx_buf_pa + (i * MAX_FRAME_SIZE); + writel((unsigned long)(bd_pa + 1), &bd_va->next); + writel(ctrl, &bd_va->ctrl); + writel(rx_buf_pa + (i * MAX_FRAME_SIZE), &bd_va->data); bd_va++; bd_pa++; } --bd_va; - bd_va->next = (u32)rx_desc->rx_base_pa; + writel((u32)rx_desc->rx_base_pa, &bd_va->next); writel(rx_desc->rx_base_pa, HIF_RX_BDP_ADDR); writel((readl(HIF_RX_CTRL) | HIF_CTRL_BDP_CH_START_WSTB), HIF_RX_CTRL); @@ -407,13 +407,13 @@ static int hif_tx_desc_init(struct pfe *pfe) tx_buf_pa = pfe->ddr_phys_baseaddr + HIF_TX_PKT_DDR_BASEADDR; for (i = 0; i < tx_desc->tx_ring_size; i++) { - bd_va->next = (unsigned long)(bd_pa + 1); - bd_va->data = tx_buf_pa + (i * MAX_FRAME_SIZE); + writel((unsigned long)(bd_pa + 1), &bd_va->next); + writel(tx_buf_pa + (i * MAX_FRAME_SIZE), &bd_va->data); bd_va++; bd_pa++; } --bd_va; - bd_va->next = (u32)tx_desc->tx_base_pa; + writel((u32)tx_desc->tx_base_pa, &bd_va->next); writel(tx_desc->tx_base_pa, HIF_TX_BDP_ADDR); From patchwork Wed Nov 22 06:31:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Calvin Johnson X-Patchwork-Id: 840316 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yhXZt5Dlzz9s7f for ; Wed, 22 Nov 2017 17:28:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 62FA0C21F98; Wed, 22 Nov 2017 06:27:26 +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 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 5F263C21F98; Wed, 22 Nov 2017 06:27:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 48B98C21F07; Wed, 22 Nov 2017 06:26:40 +0000 (UTC) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0040.outbound.protection.outlook.com [104.47.33.40]) by lists.denx.de (Postfix) with ESMTPS id C8657C21F6C for ; Wed, 22 Nov 2017 06:26:39 +0000 (UTC) Received: from MWHPR03CA0028.namprd03.prod.outlook.com (10.174.173.145) by BN3PR03MB2353.namprd03.prod.outlook.com (10.166.74.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.5; Wed, 22 Nov 2017 06:26:38 +0000 Received: from BL2FFO11OLC009.protection.gbl (2a01:111:f400:7c09::195) by MWHPR03CA0028.outlook.office365.com (2603:10b6:301:3b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.260.4 via Frontend Transport; Wed, 22 Nov 2017 06:26:37 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11OLC009.mail.protection.outlook.com (10.173.160.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.218.12 via Frontend Transport; Wed, 22 Nov 2017 06:26:37 +0000 Received: from ab-OptiPlex-7010.ap.freescale.net (ab-OptiPlex-7010.ap.freescale.net [10.207.242.203]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id vAM6QAc2027976; Tue, 21 Nov 2017 23:26:34 -0700 From: Calvin Johnson To: Date: Wed, 22 Nov 2017 12:01:32 +0530 Message-ID: <1511332292-18186-4-git-send-email-calvin.johnson@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511332292-18186-1-git-send-email-calvin.johnson@nxp.com> References: <1511332292-18186-1-git-send-email-calvin.johnson@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131558055975181513; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7966004)(346002)(39380400002)(39860400002)(376002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(305945005)(356003)(85426001)(4326008)(47776003)(68736007)(5003940100001)(33646002)(76176999)(50986999)(6916009)(81166006)(8676002)(81156014)(2351001)(2950100002)(498600001)(8656006)(104016004)(105606002)(97736004)(316002)(50466002)(48376002)(16586007)(50226002)(106466001)(77096006)(189998001)(36756003)(8936002)(54906003)(86362001)(5660300001)(2906002)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2353; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC009; 1:OQ7+HNRcUkRGjkbuV9ceOW+SdfCzHez98Bk7oCj/AMMs+PUnk0E/787iIPAbC0w+M9D9gDN6jlmH4KM/FpKAqnIsGB8q3U+xaub+gyKM6mmK1AV5IUZZUtXfOKJHUiDG MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b0cd254b-5568-4d7b-dcc9-08d53171fc34 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600022)(4604075)(4534020)(4628075)(201703131517081)(2017052603258); SRVR:BN3PR03MB2353; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 3:ym99rcfui5juA+n4LdUJ2kc1sWz9PQKi2vna1VISAYX9SvNwRvFT1rGS+TP91gc9vKnK10YLzZpveIyL/ZlJxST2XKW0mZTFLMqqgzsOgr5RjEHtqyW4eAMvreJILlGl8e5voiS9i6OxVVdRmKDEb/SQo77MKQa7mokp+HJeSVUHLXL28AshBrI3sUHa4J0xAFf1/+TeY+NtJT4uHVeSSFEPNM+GBJPKoMhAZ4iGgNzROd0S8UZPeHvST5CClbt+ubMu8v9jeo4ubWPRZsNvShhXCPnyF2Zi5DHzvLFKAh3PyMQW4Y/tLDV1oaJ6X6E7ubFdwR/DUVuRmVd2E2cuRFs4iSLkpQaxCfLKEHUPj50=; 25:Hlyfk2bczxkLUfO7crxU5ojZSp7fWgZ3K54tFwpq2N6HCOBfvsatRAlCLIimRP8Q7S/Kq3XNL/ctVYOjvM6QZRSMyuiXBFTrgaAFQjemTWwXC+Jbxg33jJGtrP3PVuu2aZac/EMfB4sk69XL5ZoxmFD5QHlpfih2ZFxc7W0I71eWkaBGIvkjQ1IJhakiikJQj4oqhJMiBWHwPfV8JhGCSzECuMdtaVQTlsMIox6ASMWzcMa4v0xAsrAFyU97C4N1oyF6M0Ekvr3TpUQlZjM85mtbaifWI+pwGge/mw1v506qF7xerl2WThzS8ifzBxH6Bkn/6/bm7HQWKV2vrxKswg== X-MS-TrafficTypeDiagnostic: BN3PR03MB2353: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 31:WotYZzI0se6nPUc4+cVQnsSgN75xpOZSAtuH2QPZGyR4nlNvJ8djr0D2ca72lSOk6Ei9j5kFXihDvpiIO2xlj1nj3twfW6FIb9y3RCNqwaBPfk1590hp7wwhWZB+Bl++5tRcWAfwVAS9ojyctdCEog6CWmyUYrYfXAbiYvgBNCyG3V6mTa/44/jNGPgzO9hBueI4Z0Tfp6hT58Uf2njGFl0LmmA/8VjedN/2k62A2T0=; 4:wJ7VuTMmoIPw902/ApFrlnk9MI7l/1ZUvwAo6UMWU1top/2MDNtN3IyWjywAUPjgZGhRkACrpmj6U+Gjhcgr/Q9YKHBbibJsJnHbdQdV/NBFFWVuxSPrY4RgDyoatr1cKW8dEWE8igMAUaER+4aM8AMCHhEAVxGZSKAqti7t0LJrG5uMk1ScJG3aTB8W4JIHs5pO6DadMeSRN4RgVBYgksw5KNY2iK63kOFMgghxMZSqsfzQjUuDQG9lzPKM/kXxiIQ+fed+TOk7YTu00k/bhszr4kD2KbEmq4uAEBXxsvcJL2EPHug8/JLltq5QbQyvWtGghs8QrkWI382WoFF/AZfx3qeC+/VCzE1UJZakXEU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(60795455431006)(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(3231022)(3002001)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6096035)(20161123561025)(20161123559100)(20161123563025)(20161123556025)(20161123565025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR03MB2353; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR03MB2353; X-Forefront-PRVS: 0499DAF22A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2353; 23:8R5G8IeWBwGSLBA8OW7K6h0TaUt54LpPiGBOYrrSU?= GSJK3i4KO8q/ZKQUcDyrnUBSAkyZRoY2aDuCcE8DWeAg6aDcRUJ6JQmzi4oMm0QxZzjd6SDebPp8el62d7Np2B6yzFwXWDvDgpvuTZOKqsOytSw6SqurHyUNF+xjIvZFGEjffRPPquAoODnI+epadG+2jAStNsQZlE4XpZRdGTiwlOX73g0eeSSi7TCIoZNfVunNzHXoaDOp58lRIhgXlIcUtQNp2vBe5R5ccfIzK2R5w6uQ3OnKiNOzgTr/kfcIPrVSq2lWy42AGXQU1m910tB180i0jqBLk7EQIGOz/1QuhugEU/Q7r16ZHCjAcu2uZBZhubWCok3uE6y7spxQ2OIZ48Suf/775snQ4ARaJhaZJaBGCOI/CNqrOfKKN2V9Pl4SSPiSs+1ZttCfSBwlZ/Q6YPyaFWhl/LpLyC6sNQLkUxNeNObFb3CysR9YI2W+v3gNLqNrZFQHw3t7QMZptMtNIMtZyTND2X1EOS17P2K/bYe4TC0nl5Sdo8BTu8HfIeM/FbkB/Z3uCXKBkIPJkbG3KsW0kGG+gWozbdCxMrR1ukMPDmzgNOyEI2f0aKFPxYdzna33hGZ/AqQGnLadTzcre7598xpVgcgP0apPaKtJ1f27Ks913tqlIzBgBVGshxb6cxjdVNVCPqdKeMh3axN8Ce3fLl7oMb150C84JtanWtguETt7dQHAPxekSBP8vvuBPASyrT5HgM4NDrlN9fUP88ZayUOaBRxi/qn/fVEfip2kyvsboSBfxo1pQV59b2JxU1BC1pxrk2K6ATjjM5aLGo/BkpjwvYGT7sT8mHUVl0REgDoYFI4m/Sy/I3XsGUbvNLvRD2YcPOTzPUmLQChPFGQgbXE+JgyQMTJ5T+j75sHdMLCw2GLUdW/BW5Pe1pIpeSWdBMpa5wZU++F5ac8kACUVn3yr9EDi+OucoNEEn2H0JGyf9mz7kTiILiuVMEnKwATyDmvHOTRGMj4n/R3QXqUo9gWycGWJBRrkCc06513rXUY7t2IF+zuy4m8mgIN9u5FTaAgd4Af1TfNx9+DcMTWxkbeGiw+ux8DxVBOh9ZH+/q7sfx9VR7/aoPPNkN1FbsRg6rMCBOXo6iuvmFFmlc/0/PxT7/JYhAFOnTHag== X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2353; 6:gnruh06fzafn+8CEwXEcrNiU5weviXFAq1U3obBnzSnhwIoU7rN7x1ttA/8m6nW8gWTC9wKKMtULVren+GPU63ApQ2UEhKgGu0KByVB3qAgtTkoMmaogLWHLT9VHkqHea7PDFY80ezEi0JBQZBcTekKSIER9vNy7SBXUCIrG1UHHk07INRTxccuPB/wGBpMM4jteheciLSHUXAXyrgl8Ea4c26f/Jz/kKSB21PS5ZJ8q4jT0DQS3iS1ym6n0tmsWsPUjAAHiz0vGF6p3jWlgsxrIYWpgc6bK8fDG4aCcgMsneCsc0X9NVAXULxDwPI8MMs9Q/5yC4EPWxld9BHdG6VmPqKhqQEgQLL44TDqKXPs=; 5:rYM9hIDPlWo70tkCjRzS6o0F1ukrJyKNwbO7D6PepoIBxiIhsa7OzJts8CKBIiCoTPQe27A+SqzHL/1eu8tlW9cW9aTBSgotGpdSnvgx5SNpYhprDAds8ptqC5DrIysRzaVDOoQzsoYm3CPds5G+UQ3XYm+SCR6oxBXohJr8BUo=; 24:9FTnXCaod4tnIikW+f5GQuLef5CzXhMysFNkk4u99wxljiubRhPjZIckF2IVKGrS1vXpbNYqP/o+05+Dkr0u/tFz8BHSmC30xZgRJGciFeE=; 7:7FOkhiZ+Gz0xK6BTEOkHgSdxVbxIm5pQYr0QJPuG3N2l/IhCEmPHQiZbkkji/e7O7b1X+4cHCIK+3NZCuG2mZoh1tuNTkqo0hAi/8nSvqybjgTrljlg3apR3wfDGoc6HsjW9uPkyAzamQe6bxPgtaHJUOm+gbFEjw2D4POrbXoeaHq5gjEs53fpdDBvPWURflTSChaPfRe5YefyqH0jWzUyAP5kHglBR9/vhO7iJTX6X/JYydyqRgscqDd0D0NgI SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2017 06:26:37.3465 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0cd254b-5568-4d7b-dcc9-08d53171fc34 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2353 Cc: Joe Hershberger , Anjaneyulu Jagarlmudi Subject: [U-Boot] [PATCH 3/3] drivers: net: pfe_eth: cleanup typos and indent 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" Typos are corrected. Some sentences are rephrased. Proper indentation added. Signed-off-by: Calvin Johnson Acked-by: Joe Hershberger --- drivers/net/pfe_eth/pfe_driver.c | 33 +++++++++++++++------------------ drivers/net/pfe_eth/pfe_eth.c | 12 ++++++------ 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/drivers/net/pfe_eth/pfe_driver.c b/drivers/net/pfe_eth/pfe_driver.c index 730aca2..2bb257a 100644 --- a/drivers/net/pfe_eth/pfe_driver.c +++ b/drivers/net/pfe_eth/pfe_driver.c @@ -16,14 +16,14 @@ static struct rx_desc_s *g_rx_desc; * Reads the rx descriptor from the current location (rx_to_read). * - If the descriptor has a valid data/pkt, then get the data pointer * - check for the input rx phy number - * - increments the rx data pointer by pkt_head_room_size - * - decrements the data length by pkt_head_room_size + * - increment the rx data pointer by pkt_head_room_size + * - decrement the data length by pkt_head_room_size * - handover the packet to caller. * - * @param[out] pkt_ptr Pointer to store rx packet pointer - * @param[out] phy_port Pointer to store recv phy port + * @param[out] pkt_ptr - Pointer to store rx packet + * @param[out] phy_port - Pointer to store recv phy port * - * @return -1 if no packet, else returns length of packet. + * @return -1 if no packet, else return length of packet. */ int pfe_recv(unsigned int *pkt_ptr, int *phy_port) { @@ -70,11 +70,10 @@ int pfe_recv(unsigned int *pkt_ptr, int *phy_port) } /* - * HIF to check the Rx done - * This function will check the rx done indication of the current rx_to_read + * HIF function to check the Rx done + * This function will check the rx done indication of the current rx_to_read * locations - * if success, moves the rx_to_read to next location. - * + * if success, moves the rx_to_read to next location. */ void pfe_rx_done(void) { @@ -95,7 +94,7 @@ void pfe_rx_done(void) readl(&bd->ctrl)); /* Give START_STROBE to BDP to fetch the descriptor __NOW__, - * BDP need not to wait for rx_poll_cycle time to fetch the descriptor, + * BDP need not wait for rx_poll_cycle time to fetch the descriptor, * In idle state (ie., no rx pkt), BDP will not fetch * the descriptor even if strobe is given. */ @@ -107,16 +106,14 @@ void pfe_rx_done(void) debug("Rx next pkt location: %d\n", rx_desc->rx_to_read); - return 0; } /* * HIF Tx interface function * This function sends a single packet to PFE from HIF interface. * - No interrupt indication on tx completion. - * - After tx descriptor is updated and TX DMA is enabled. - * - To support both chipit and read c2k environment, data is copied to - * tx buffers. After verification this copied can be avoided. + * - Data is copied to tx buffers before tx descriptor is updated + * and TX DMA is enabled. * * @param[in] phy_port Phy port number to send out this packet * @param[in] data Pointer to the data @@ -186,13 +183,13 @@ int pfe_send(int phy_port, void *data, int length) } /* - * HIF to check the Tx done - * This function will chceck the tx done indication of the current tx_to_send - * locations + * HIF function to check the Tx done + * This function will check the tx done indication of the current tx_to_send + * locations * if success, moves the tx_to_send to next location. * * @return -1 if TX ownership bit is not cleared by hw. - * else on success (tx done copletion) returns zero. + * else on success (tx done completion) return zero. */ int pfe_tx_done(void) { diff --git a/drivers/net/pfe_eth/pfe_eth.c b/drivers/net/pfe_eth/pfe_eth.c index 6d2906f..eccc2d6 100644 --- a/drivers/net/pfe_eth/pfe_eth.c +++ b/drivers/net/pfe_eth/pfe_eth.c @@ -157,7 +157,7 @@ static int ls1012a_eth_send(struct eth_device *dev, void *data, int length) rc = pfe_send(priv->gemac_port, data, length); if (rc < 0) { - printf("Tx Q full\n"); + printf("Tx Queue full\n"); return 0; } @@ -166,11 +166,11 @@ static int ls1012a_eth_send(struct eth_device *dev, void *data, int length) if (rc == 0) break; - udelay(100); - i++; - if (i == 30000) - printf("Tx timeout, send failed\n"); - break; + udelay(100); + i++; + if (i == 30000) + printf("Tx timeout, send failed\n"); + break; } return 0;