From patchwork Thu Feb 7 17:30:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Meunier X-Patchwork-Id: 50237 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DC8F11B70B; Thu, 7 Feb 2019 18:30:32 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50110.outbound.protection.outlook.com [40.107.5.110]) by dpdk.org (Postfix) with ESMTP id 5223F1B6F1 for ; Thu, 7 Feb 2019 18:30:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=//YKDbQvKqjT/89I59L56ugSgmrlOlaJIgswWgpYu6U=; b=kLNuZVpB9TNzXmwpeNpa2Q1fzthd/gakKFIzRptiLn7AwDWTxcFj9/HZP1WC6gi97HVuO+dWHs5QZ76CrU59EYo8nSp3wfcPTNIn8y9XMvmQo2dBct0XT8R2iy56oJYtnPaB8I+mrobA2x716rgBAvNx6A+k32NDzgFVR5xElhc= Received: from AM3PR07CA0070.eurprd07.prod.outlook.com (2603:10a6:207:4::28) by DB6PR0701MB2774.eurprd07.prod.outlook.com (2603:10a6:4:24::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.9; Thu, 7 Feb 2019 17:30:30 +0000 Received: from DB5EUR03FT056.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e0a::204) by AM3PR07CA0070.outlook.office365.com (2603:10a6:207:4::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.11 via Frontend Transport; Thu, 7 Feb 2019 17:30:29 +0000 Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.241 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.241; helo=fihe3nok0735.emea.nsn-net.net; Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.241) by DB5EUR03FT056.mail.protection.outlook.com (10.152.21.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17 via Frontend Transport; Thu, 7 Feb 2019 17:30:29 +0000 Received: from lfs-up-04.localdomain ([10.157.84.234]) by fihe3nok0735.emea.nsn-net.net (GMO) with ESMTP id x17HUSSW003589; Thu, 7 Feb 2019 17:30:29 GMT Received: by lfs-up-04.localdomain (Postfix, from userid 62146483) id DBC75673B; Thu, 7 Feb 2019 19:30:28 +0200 (EET) From: Julien Meunier To: , , , CC: Date: Thu, 7 Feb 2019 19:30:04 +0200 Message-ID: <20190207173005.38372-1-julien.meunier@nokia.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20190102160055.30301-1-julien.meunier@nokia.com> References: <20190102160055.30301-1-julien.meunier@nokia.com> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.241; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(346002)(39860400002)(396003)(376002)(136003)(2980300002)(3190300001)(189003)(199004)(1076003)(26005)(2906002)(6346003)(68736007)(26826003)(2616005)(11346002)(446003)(476003)(305945005)(106466001)(478600001)(126002)(336012)(486006)(356004)(6666004)(103686004)(36756003)(186003)(51416003)(76176011)(97736004)(8676002)(52956003)(50466002)(8936002)(48376002)(47776003)(316002)(53936002)(81166006)(44832011)(14444005)(110136005)(81156014)(86362001)(50226002)(42186006)(2201001)(16586007)(4326008)(6266002)(106002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0701MB2774; H:fihe3nok0735.emea.nsn-net.net; FPR:; SPF:Pass; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; DB5EUR03FT056; 1:SdXBVAH9GzHSvuLVZYUlBqIU5MwOz1ByQm0lc0Om0epD9v7ywmX4Jk+tNgAF526JAX2Ec9AksjlqxRFaCGM1mT6cax90jg/kxGXocH8kysuouhR+Lqlga+QlFR7h7OhM/g/EJWUTx0wnxBO8M6Wu+dlW66i95XlxTz6GP6BaCyI= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c002d23b-cef1-4cb3-daf4-08d68d21f4b2 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4608076)(4709027)(2017052603328); SRVR:DB6PR0701MB2774; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2774; 3:/jWSyTx5FYnam9/rDcKRWzgHg63MT+U9PLt0ZG6x49USOl6QqZoUdxBukaJEe0pOvTEPbdoRtYeTC3bttCBJCLFnwmvxUP9mLJgsT7LbRV2y9cFV2Z33ucOZbcfLSn8wYiQMu6oejS+/ZJZHoIeOyvtjIgR9NZphsdFJkXDLilJ87EJN01DE30xXqqc3MbrYMd6TV7AFJhe5QkHR5HDMVOrwd1R3X3qxkjdBUJvBQMFj9ilYsSbBF4K2s0ae6MNmwRqtZOIczK4W3yogyLxge5odqzs+dZl0PorCMr/3y8nDOypQz4L0vBa3w8nJnF6fv5Z2pOnFq3EpCvSAQr0nlf/y5r6J1jTxovRS+L4akSRl/cdrcmNe7SfXcnllfCIA; 25:u4czXukjIVveV03+JjG+jmgCoXUKvRjjxFZFWJqrJY04OMEo8y3trylw2o15VwwG9fRkdGHy2zXm8CsGvpHEmL3sCXHHsBMyOJhrSPrET8diZvk3vSy82tenEgPQdQI5NUuJna9tm0w7mdBpAZU2gSoZCD3qfrUvscCSuC7wUG5H3ldNuHgW8dHcgsbu+FXstC1KTkywolSR6mFth3PcddgwBNARZJSasCr18+gLeg1b1iDSp5Tm9ps4I6wneZRj2J/hb95vVFgEnY80TTgvZnhkBMoFs/5OJEoDaZq+i3Or4YzOTxCgdFWQJm3LSj+ar/rTdTSIxbE9aclLoeTnQw== X-MS-TrafficTypeDiagnostic: DB6PR0701MB2774: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2774; 31:7uDHE3UpRVKMxygbHLoIl8icGCcHqF5S9swl2wTmTZnAA3RZeSS7w3TZW9BLnTWVTO/2+kp9sppNv32kPtl9Ip8tSE68ZMeUFm1BRNzlsYpRvuAYL7ml4XjsH6DHtDsUBvZgPafqyrxJth/BfFFE9iTEnob6Xa4l2+zPE33IhFtm8e9PpSBdiVdZv2s+pseGHNcornjgSjkY3ezwESfGlTXu6dp+UhN/wudU6V8VFCY=; 20:EITIdyqjzKjQEUXjRtNO72zN8oUkTC2P9r0F4N5eUL4VyvBxk4o+bCBnTCTL18J8zc0jW3LF4c+4KodPf+jDyzHgpLlxklBOxmyq9d4bOw4b9MzIIRm0WJj1q4hl3I2LVnn+sIpv62R3ChclBx9VRFlFsN9LfiRaEgGvoFFDc/34B+s76E0Ke4WqYRCIikBROw3sjQuEqmRxh/GkkC8n+MJ3AFFondEmNSR1YUsLQ+VGMjKYby+n9tHfoPRlctAnnVPDVlsR/3Kn5O0sZHeiwyDjLZCIRl6WCZpGLBf4byYeik7fGHWaSFgk/6y3uDJcgdrAE7DqynX9C5EzPfwrqpbPwQC/tai+EtBHeJu4p+5suQkqhN/oaRzO/vO6pCGZxLJlH+a4UzGe2FKCqvFH7/a3BkEDFqmDTchUGw+rUpa3Lo8gfm4ozYD3JZXTheyl6YM3OPJa3cB1BG9j3mViR40zIlA5j1jmw7Rd+Iv153a7CnWlPKCKuTgaZD6fl5hyjkH8mBZGAO3ycScUBdCpb6904KxsAFAhGzwPFTVi2QcpCXuPd3S3L8KeP/IiElJIkAHc/OnxE0BuCxhA94241ubRIXekKpHnIQpgOuaowu0= X-Microsoft-Antispam-PRVS: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2774; 4:pv4HNKnMoVKUSLB1RdI4SaVcAG1RzCgJY2CAS8wjYIWWOah676trGqQqlv4P94i1FOUtLhYsssU6UslnksOy+124KGgLullWtN/5OqnG6Obq+O6rpLaHaLFvh9YRJLQcgMV8e4q6u9dwMBmv+zGiFL57E9IS2NkvcQ5tRV2bzu0nJNI6iHzhzcU6VOArFVDBhObgAzVvP2jYKc+otv2Y2hrv3h2Gs5ADmfqqBIAhOuoXksiBKCAuAtjdEg8dpi/DHIEGS+FQTj15pFfuapwpHFQ+hdpzeL+wYmusy0L/FfA= X-Forefront-PRVS: 0941B96580 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0701MB2774; 23:YDYF8a3OpNdspwMjPzuekHryJhyJm2zgNHNRSjz?= gb8smgpy9GI+v0aIN0ehasjacDBbvZHHYJNl+uT2X58/PmEfbrOwrutKsJG66Df4DtSFWwGGrh4rZKi6UxIcD+xi5t39cB9V7IT/XqjSXWE9Ir8G1fx+mXCoskRED8ue/X016JYbEiK2EYTudg7EHo5Wprpl5W+kmH0+gNHB99Mq8qDRW271xC9mIeK/X3xATsv+m9DTeNRO16/FjUjj6L1ubIvrHjbYJ9IqB+1wD8RtQdG4gx2fuzPCBbYlwkvzBoGb3BFNw9s+ciwr/orBzpvh6FBs7rsYOvAmwfIBhEDe9Rk3uRaPSMFMInFrAdMhYtDInfjql/3Nm+PeodSHmkNLz5z3Rg4t5EvwzIOJXYJD86U2lnVFc8X+m1ywn/3wWM374+Lu+S/dMFZTCFUJZQmzQ0dObmx2oRFCYQkGqz4RfuBj0oieaCkKqXBykYNfVMp9K7+ZrlqUwBuPIajEcI2M3z7rnM/3J/pXtwndnQx3MHOpfst1YWD9QybAcFQCLQRYregNtemh64QWUZQDhf6/8QIEkZ5IunWLxAC0YfYVwK3TLOBI9tzqgREp0LWJzlBtmXlGOYEm7en/NAeRXVxNI3o34f4vlxexwp2YBTxY0qSKruGDdeCHqbzCX9tlumwfVnm28yOeslYjtrU+CYI1cfNoiBOtwiovZftTzLYgZ0JVVfQFgkPsJ0uyg5M+qHpSAYKtrJtn5q1vKbc5CXT2Wpa+8oan06qStzvPZEdecBK1cYwIq1oaXXEPcehvgFO4jStARVzBSOTTvRDDtPDKyO6D0onLXNgsMjs5ndZRO38nTvI+WhiOw35LQE8akd/wGK7jgNYDV5hILooVP2xS/3KgOn4wBON9cRLws4axkThW52Z5bxQhMHd06WyyXwDS5FZBZ96Tt7uFrnFCF6HER0kAxQWQnWKCnAYrZNl7k5zEWQ3LX7sLdmFkk1/94gYk4oXAeXMMwbA2MIINFunuSGnNFCe7tgSiYhG0tkIY0Rm110QqbKtYIkZGpCvui5r+I0xNh4uziXQbcsVGjHCFnRblQtgZ6FeY0N2PEiI5YiFwP3IEVpWD4wPHbBWuqckICVDQcITuuoLe0Ctlbx+gmbm+1O8H4hqOisyW66LS6pzNziYhCTpiCzcuOeAqJ/II= X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: uTFDZJJfFmct2wc4o/laUCl9oNkGrS8dvcA+C+Nu68YtpRfTcpgBA+LCLqXUd7Ks0e1OT/RKQH/S6z1C5hvkDAC8HRZszFeBZct8x7d8WZPxGfSsEZshPOpNlGwLCwCvtLlrDXoHzyw4xQJng0V337R7cDmDoxnRLLNxcDX+XLmtNoaHsU03X7+iITSiyM7s2KGXwApPCK4vbYSH82o7u6lN2drcu23G8frdUqNzeHvn5mkQQg2vKKE8zr5PFDIyAjYTOYQT7T4na57nO4hi59Wjo3wiLckg5UwL1af7MkDNSkorUxbXkFdFs7aonufqUlpuK8KxZOYv44lTUIIk3ZNVs/hFncldifBvUMXOGQ/6SxkmNQO1H70/wc0bsUJT7ogFSlOvzb/lWQkzTbNHUdnHC6MZfA25WnkYm52wHVQ= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2774; 6:Eg9px46T5Ah5+zNumE1QlhAgvBW+7z/8yM0NUGo/QkpK/MQ4HPZkFh5mziO+4Gr7Fw6dIDuwaBKOhEHLhnoMI7KIf5t7RYGwidah+TvxusV0z11OpVBcrAJXHA1rUPqehfkipK8PRU7o0PEbn45WrRVEOEylFFDt0aeVNZMPOZ09MDUSHTit1B9lfD9zdHXBAvJDV9YIJB34E2t3czrpSbVYriPaXAY2pU224gsR7kFX4S/j8g7Bsgf/fC6KZw1x0Qemy6+0swdwe4vi/g1xOUXOZIIgUCovBxruyuwYIlXvGTajOMUQn8umA6/DsEQnCRo+AR+l00NRWSdc2OE+XNXqemApyKJYBlDbq4sEMVC3CZEe11H87+b6VYja+3EPSSTcHKxo5w7M4QJP+YuUDZy35CM5tllEAQM6O4ZIK/TgTtZO7f64FAxUjC3XhJaX0TEXcIO1DLREc9bI465BAw==; 5:BCJwu7WbS6ZojUNWe2YlWJ3YfXC3I+o+0WMxnFt9nnVcosclADOlgr0x2TvJcApgYcfmRrhFQA47c6rc9MDPpZLjjsXEgQeQFErjalykZcEPRR4iPmWvAInofZsfa+GEXaC686y8CXICEKWB4xTMi4STBM/lBVqANIkRMZZ6wn1Ojrc7k17273vwixKJC3Q5tpxh+4N6foOmNi54hEsOCQ==; 7:gNih6Y8xxWSqlAa51SU54l744OyVEpwRgc5DPEDKJVI53XMhjeWd2Lt9G/lpbPY/7Fy8GecxCL6TrCPNCPQarVn50KC4ICukcg8RYx3jtZTJcCTUKrQSl1im30l808zABjFkMpBILrigM3mjtRvJFA== X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2019 17:30:29.6461 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c002d23b-cef1-4cb3-daf4-08d68d21f4b2 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.241]; Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2774 Subject: [dpdk-dev] [PATCH 1/2] net/ixgbe: do not start on unsupported loopback mode X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Only TX->RX loopback is supported currently on 82599EB. If a user wants to apply an another loopback configuration (!= IXGBE_LPBK_82599_TX_RX), ixgbe PMD ignores it and continues the configuration without raising any error. Let's robustify this part by checking if the requested loopback mode is correct for the current device, before starting it. If it is not valid, PMD will refuse to start. Signed-off-by: Julien Meunier Acked-by: Wei Zhao --- v2: - factorize code - check if loopback is really supported --- drivers/net/ixgbe/ixgbe_ethdev.c | 13 +++++++++---- drivers/net/ixgbe/ixgbe_rxtx.c | 37 +++++++++++++++++++++++++++++-------- drivers/net/ixgbe/ixgbe_rxtx.h | 2 ++ 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 7493110..558f60b 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2652,10 +2652,15 @@ ixgbe_dev_start(struct rte_eth_dev *dev) goto error; } - /* Skip link setup if loopback mode is enabled for 82599. */ - if (hw->mac.type == ixgbe_mac_82599EB && - dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX) - goto skip_link_setup; + /* Skip link setup if loopback mode is enabled. */ + if (dev->data->dev_conf.lpbk_mode != 0) { + err = ixgbe_check_supported_loopback_mode(dev); + if (err < 0) { + PMD_INIT_LOG(ERR, "Unsupported loopback mode"); + goto error; + } else + goto skip_link_setup; + } if (ixgbe_is_sfp(hw) && hw->phy.multispeed_fiber) { err = hw->mac.ops.setup_sfp(hw); diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index 9a79d18..c9a70a8 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -4879,13 +4879,18 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev) hlreg0 &= ~IXGBE_HLREG0_JUMBOEN; /* - * If loopback mode is configured for 82599, set LPBK bit. + * If loopback mode is configured, set LPBK bit. */ - if (hw->mac.type == ixgbe_mac_82599EB && - dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX) + if (dev->data->dev_conf.lpbk_mode != 0) { + rc = ixgbe_check_supported_loopback_mode(dev); + if (rc < 0) { + PMD_INIT_LOG(ERR, "Unsupported loopback mode"); + return rc; + } hlreg0 |= IXGBE_HLREG0_LPBK; - else + } else { hlreg0 &= ~IXGBE_HLREG0_LPBK; + } IXGBE_WRITE_REG(hw, IXGBE_HLREG0, hlreg0); @@ -5062,6 +5067,21 @@ ixgbe_dev_tx_init(struct rte_eth_dev *dev) } /* + * Check if requested loopback mode is supported + */ +int +ixgbe_check_supported_loopback_mode(struct rte_eth_dev *dev) +{ + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); + + if (dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX) + if (hw->mac.type == ixgbe_mac_82599EB) + return 0; + + return -ENOTSUP; +} + +/* * Set up link for 82599 loopback mode Tx->Rx. */ static inline void __attribute__((cold)) @@ -5148,10 +5168,11 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev) rxctrl |= IXGBE_RXCTRL_RXEN; hw->mac.ops.enable_rx_dma(hw, rxctrl); - /* If loopback mode is enabled for 82599, set up the link accordingly */ - if (hw->mac.type == ixgbe_mac_82599EB && - dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX) - ixgbe_setup_loopback_link_82599(hw); + /* If loopback mode is enabled, set up the link accordingly */ + if (dev->data->dev_conf.lpbk_mode != 0) { + if (hw->mac.type == ixgbe_mac_82599EB) + ixgbe_setup_loopback_link_82599(hw); + } #ifdef RTE_LIBRTE_SECURITY if ((dev->data->dev_conf.rxmode.offloads & diff --git a/drivers/net/ixgbe/ixgbe_rxtx.h b/drivers/net/ixgbe/ixgbe_rxtx.h index 39378f7..2d8011d 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.h +++ b/drivers/net/ixgbe/ixgbe_rxtx.h @@ -276,6 +276,8 @@ void ixgbe_set_tx_function(struct rte_eth_dev *dev, struct ixgbe_tx_queue *txq); */ void ixgbe_set_rx_function(struct rte_eth_dev *dev); +int ixgbe_check_supported_loopback_mode(struct rte_eth_dev *dev); + uint16_t ixgbe_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); uint16_t ixgbe_recv_scattered_pkts_vec(void *rx_queue, From patchwork Thu Feb 7 17:30:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Meunier X-Patchwork-Id: 50238 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A4D9B1B752; Thu, 7 Feb 2019 18:30:41 +0100 (CET) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150123.outbound.protection.outlook.com [40.107.15.123]) by dpdk.org (Postfix) with ESMTP id 448E51B736 for ; Thu, 7 Feb 2019 18:30:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ykIW7hk8qt4VnwHl3y4Jxceh0CobbAfuKXMp+TvVyZI=; b=mFBjCoDAgM8U9MLEAWbx5F71tADP3itc0nHf4zdt83pa0H/mVDxggCj28pdcBKiu7Ayi5oovnYgojKlHP4ztSU+AM5aI8duU1hNy50qdMvl4+9NblbZKENlJ7YMCSvkP1m3fwsNjIfzhF7pa+Lo4VCBgujv/2GKbWn5zPEA07H0= Received: from DB6PR07CA0009.eurprd07.prod.outlook.com (2603:10a6:6:2d::19) by DB6PR0701MB2840.eurprd07.prod.outlook.com (2603:10a6:4:70::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.14; Thu, 7 Feb 2019 17:30:38 +0000 Received: from AM5EUR03FT058.eop-EUR03.prod.protection.outlook.com (2a01:111:f400:7e08::204) by DB6PR07CA0009.outlook.office365.com (2603:10a6:6:2d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.11 via Frontend Transport; Thu, 7 Feb 2019 17:30:38 +0000 Authentication-Results: spf=pass (sender IP is 131.228.2.240) smtp.mailfrom=nokia.com; intel.com; dkim=none (message not signed) header.d=none; intel.com; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.240 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.240; helo=fihe3nok0734.emea.nsn-net.net; Received: from fihe3nok0734.emea.nsn-net.net (131.228.2.240) by AM5EUR03FT058.mail.protection.outlook.com (10.152.17.48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1580.17 via Frontend Transport; Thu, 7 Feb 2019 17:30:37 +0000 Received: from lfs-up-04.localdomain ([10.157.84.234]) by fihe3nok0734.emea.nsn-net.net (GMO) with ESMTP id x17HUbKp008870; Thu, 7 Feb 2019 17:30:37 GMT Received: by lfs-up-04.localdomain (Postfix, from userid 62146483) id 22051673B; Thu, 7 Feb 2019 19:30:37 +0200 (EET) From: Julien Meunier To: , , , CC: Date: Thu, 7 Feb 2019 19:30:05 +0200 Message-ID: <20190207173005.38372-2-julien.meunier@nokia.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20190207173005.38372-1-julien.meunier@nokia.com> References: <20190102160055.30301-1-julien.meunier@nokia.com> <20190207173005.38372-1-julien.meunier@nokia.com> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:131.228.2.240; IPV:CAL; SCL:-1; CTRY:FI; EFV:NLI; SFV:NSPM; SFS:(10019020)(136003)(376002)(396003)(346002)(39860400002)(2980300002)(3190300001)(189003)(199004)(14444005)(26005)(68736007)(186003)(106002)(53936002)(336012)(47776003)(8936002)(42186006)(51416003)(86362001)(6266002)(1076003)(52956003)(478600001)(26826003)(76176011)(48376002)(4326008)(6666004)(356004)(2201001)(50466002)(305945005)(110136005)(8676002)(316002)(106466001)(81166006)(36756003)(486006)(16586007)(81156014)(103686004)(50226002)(2616005)(476003)(126002)(44832011)(446003)(97736004)(2906002)(11346002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0701MB2840; H:fihe3nok0734.emea.nsn-net.net; FPR:; SPF:Pass; LANG:en; PTR:InfoDomainNonexistent; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; AM5EUR03FT058; 1:Smdh1kwDh7cLuS0bPCinZYuPYFzMHPQ/89ZJL+kZVrFUhPZNVQaFSsnDRO/ye+7B3W1A++buGJ696lbwhWcgsFT8KABhj+pL+9L6YZr9wi7ieUGFXtdmZwXYKKlQZgZpsalBjE60BXwCMVRiaqoXIJn4J9Fd20JHXut1v+i1lik= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77cf376a-e993-4f34-d467-08d68d21f9a2 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4608076)(4709027)(2017052603328); SRVR:DB6PR0701MB2840; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2840; 3:zoEsMUOZDjTwi21/OpP4O7/MtllTR6+SLnBX9QQYOpehlQrPIkIg9SQIJF2mGRfDIEt9poQ6etZREvkLJhJ3by2ZqZvttdWh4iIjrDfAL9A2t2fazVW9dMkTnUFR6Fd1QwbwhmBvSzd2jx00XUT2D2szNaO74qCI/8AOKoTVCHFXqM2PREZhxQJ+o9i4W+bcKWmpxty2MsvUMv0x2DaaJaEgb+Mv5XqYCGiUTMRPovaVtFQ6MR8sLTYl9/Y4vsc2qBrsu3v0fBpVktsvG0rNAUqvhbrkb4TxqdSEhIxvqN5dDsBhuyAYfOiFZJ8zR3FsS9jp11iBezgJvK2stSUgoPBGmMI57eWh9JI2FKLNUe/koCqO+K5hEKXerBaye4l7; 25:l5qHSqiMxErLIiU690Ncxf1VqmwmXuQQDJeWu8N8/pO9us/2XxEgAqwyoeQzMlXFauOS9LztDieA1UaL8nIgW4b1emxuh7U35dqSSi42tmwCS0DcFdO751A+qjK+2yzPRhQCz89kSM1EOe1DiY0D8pcw1EO0UsfW+8n0Bbl86JNfCXCEc3ivM1++s48oSr/HSf4phH/ZwuWo1JHSCQqDkpxkJS5doigP7k8vwl/ntrqcTvdayAQbIW/tWoQAvpYumDfYl0WHYRwTnJW9mu5rF4blhByJTtBJX368afZV2gu/MwqI7MLJtTXnI7MSTauEY9gIhPsYDstPtglDRCtwew== X-MS-TrafficTypeDiagnostic: DB6PR0701MB2840: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2840; 31:VE96waZoWj4wXYVt0ZSnvMjEzaHETNACueRAZBXpUQakT+c+BOdMik22FQ+r9TaKqJnSanZKuZie1Zbw4IFJyqahaAuoxDYl4Wc3/vnxmu/GBZ9WALHH9z9p04gtcFUq7+FcOihFpTFnMU0zYIwuFjRt/ILE5mF8I9GfzJKR0zCuJeyC6ebJ50B9ovvsuemvFYyfUjm2bKQ2pPUeYen1onq8ulyzeKOwRG3djCB8vdY=; 20:30Kh6Cie/cmtprk6K5urb4xZUOQQZpHYimkuD/fGK8XB1DXQl6rloBxs4lROGySP+ROamgfuNo4+oxkMqvMj0IMDmfeftywZJeiAABHtzEw/H0I473AD9KIzQx6hmUV98BZoUK5QQ70+O78Qpw27C8M6tvsmMLQ2HIrhwXc9oEJ4ePofmO/JOaQWFJxxH4vilWHDMK2OVAUOMHL2pW6o505IaGKGCYHn1sT8BHplOF3gUZgUgSY8r5wcIokSoWJtS6sKFNXv4rXsOuJ22WEp/YOUxloGx8T99xwBGPRUesxlKaZFNxpjanUQkEh4WOFTQY8jbV6+Dpmw1VtrO4d27WQ4SOPPyWIgpVspsqk9YDfSA6UtNx8kejzebFXP2e3/QP0E1Lb4esPkYVOqqzPEAJAYU2LMzb069kIBHCCv62VLUuW5AMQryVgRgPDIB/XgxG4V1RlrqBih2oUXUiePzzRKxCb3KgrJJuNGwXL8fxu7b3fDZreMC1XYaHm/SBJ868pgiDXW00JCOZBmj84SnxswB6a/BhLg307rTMnmAQEHqzU9tYMWJ6re7s//0ojbNh18/yRl5Lm74erkq9mgghPStySeXPZeFBWmO9VFrw0= X-Microsoft-Antispam-PRVS: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2840; 4:I3CWXAtqozAsT1zppdq25O1ve0dP08uevTui2hThzfkqEAz4fsTxgXnU/VeK49N+tgt8oR+QjF8M5qHPLS4z21LsDQ0lJSyJmDCs5PSA0WPavmBaYQ0MIKMlcpmyd9vIGrsSot3e+WjW5YeDlNdEmn1bEuvdRNzfuZ5YGcgV5eZzPJCijbDVm6Z0Lb57/3zSmlvaH4EvN3lg92xZ1uPAY7+k86yP9LyZ170mwecii+g9Ah0O09HyyejCPL/pfDj8AUotBNxukRNeAGtnfjb5tqZKYnO/2745fJ3DX0nKJac= X-Forefront-PRVS: 0941B96580 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0701MB2840; 23:zfwi6qn6O8PPXeX1P7Z8WyntfYs06pnSrC+Tfgp?= XmNWeCHSTU8+hlW48jOBQFuZKYBOtM3MJ5IrXqlLFKNjuGjY4iBxOJGNoavPR1H5KEoR36aC+MjUYyTljATd3ToiLa3iO4c7CJ2yRkMd7cZqD8zUBcG/wx6hENZTzD3SMv/jGgGug6gRBwu1pB5W/ZJ+qd+O6/iZ/NvY1XWIyvz8x14fEIg78AJQkbYKbd/SLqKT2nhSQY4C9iSpzTY+WDXnj+QLRZGq1VHh1avkf5fb3j/7jBMmwMwxCmg6clTLRgdvPt9VUvx31i5SLa9N/F2axODcFv6ZDMPp3WDtuKdJAkNB5CXsrZthBiJ6zDppXQHHb3wg4aZihevd4IDv6hSqw9/PsUXK49W+ZLFmZip/jMdGZfXtfe/5kMrvNDHKM6KQNlOiU7aErl3yTqq/XeM5xKAojdALZWj/32Cvx0uizOwayfitRXfxXJ9phBQH40oBW4qLota0vI5k9SJxtCFojRKa2quCKXJOTrqId3pGFm6cOLc8Stsm9jhDk85Sba6bFhnfyh9uSQ9xGrT1YIZEtZo2ZUndQ7sndzn34VJ9wQMS2xZYWRpT6jsjCyClCkfLGZiev4oDA5Mou2eypIe8iGUmwLI8wGuzeaDN79TKhEXTZ2q8gTSk3R0ExGY7RkTJSFEZWMivPE+g0OqcsqB32Bu6U2Ie/ywfO22QM6ZkLZ+Dt80h5LLacF8Gr39JQYIuriGb6Njn1pbVSMPIyPQ1aIsww+89obdJaEVjbMY9d3MO8fgExr2FKeE2+Cmh3jSsIIFNZNs6pYW5RDREpIXDbjbrGa+s0Rj2Ei4Pduo8fO94OOK4N/ImBSwM+ppXFARSO3nuvjruiUphvIBdh8inD9bWnFf0A8V05YmHqpufCqLbOy+jM9WiXjt1TGZZgXP9ZX4VdQnCIWiokvE1EGzddOlV90CWRlME3d92dwaCSIWFupRduA9HBUX6C188Mr0E7xsy/P3YwKlCi1FaGAMxZRGwDz5Ps2XSN8pCsXqvlZ4Kw2bbNZNM4H+sn5/OpDCodjwplJ5+BXyJF8MB02heCevd3zMfi7xp3pe5gU8L6qVRcGG8LHh4RrO7l0af+oYTVx0UWTqsXUnQ28/or+EEdyosw1E4CvGY+RqDRfIuhlA== X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 5swnXQPeMApk1CxnOJrPl5ZOoTWindWG5N9V0eyXdoYHUqDpz2zWQ3Kumov79IC1ad0xKadTJCP6CpWnFKHHAZOAXsyO0UevyuH4qVr6OzLZtBnmBJFBarALDBLrSHI8TOxd2XSEm5e8XGaZsGsFVX++YuTtKH8t0j53WlR/34A6QDEf4G28htCaiaByZvWHIRR/4fJh18soVH0gp11Bzf3EpADCcntXXdxUH3l6bObVyvGirURgwD8RzczSkofrxI6sbBa48ThJtg1pmLt19UO9MOS4VmfIr4sn3TiqheiKBOydS8G9ymY6l73e8ITvmihg5I3zMmPfCSUks9RDHzxNdr0WAXhBV7xG8DCYNSKt0UNfvdPzx1n+CQxHHL9aGOsTLmXE/20CyszLuMMSCgiNOne9lUlnIBGWBjCx80Y= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0701MB2840; 6:CXvvKQ7CPjJzwKs8S32bWEdP+TXNUkBXarzXWfZVZFk9X9Bwo+0q3Z+xBc9Ldqj6Zy6XJ2PV0TNeq4SrjnDdNSe6/CiUswGEJa7rTE8QEq/p4DHL/W9X8VnQYtPXCrZCc8JrC8RbEGyivRxBkhGnBMiOyxuHwTIcOyaFvk5Ba5ZZzoZpfSpafEaEmufKIU9PjqRVWt1hYt90hKLz3/71zuuWIAqqwEXY5DzZOkQA1oae8eTOJCV2qIUxDzOlQHftv4ffsM48Fe9OpChbvjQaaPpQnkUoT0zrw5vn0jBIDTbZUOLk2POLEYWjBHZjPRMxUl778Z6U6P6aV37GGiK/ly49jMs/SNKPBgcLdGhANInXhihe47IdBM6a0RtFW0ltvQm8meYQYzOnBh0cuU5Zx5luKDdZoPClCmwH7bc0PCjBK92zfA8df4u0717GA4ae/6Pn/GmRneMPStjYHmyvcA==; 5:TZdj2qA2nunmsevM2nqGCLXrGtGGVWcnkVfNk74pTn7zC6vU4m2dEW5/ustBTKAh3Cq3sXD99F6+LKb2KVnjVbmxX9ZizJ2DWyWs4QRr/gUU2MCRwV6hJJKA3Jlmeqn2yz82Ov9ysuoGNKEGZC9rzFhVxIZOdum14obto9gvuM3VJ5zza4/Np1g4MLKKBg3LyC/1WYD97/oX7WyEqvoulA==; 7:OUgc+pfUyJIfeUdZGBR3ArAHq6ZAD/OwFICSaPaScuMlUAfsvAC8n5yb0MIcSxSCC2s6mzRvPH+WxUJQH0dAL7UYL2HIIiRTkWPq14YAXfqSdepMOqTaoONbv/Rb2Fc5ewqjaTHPySFefplsrgtdhg== X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2019 17:30:37.9337 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 77cf376a-e993-4f34-d467-08d68d21f9a2 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.240]; Helo=[fihe3nok0734.emea.nsn-net.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0701MB2840 Subject: [dpdk-dev] [PATCH 2/2] net/ixgbe: add support of loopback for X540/X550 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Loopback mode is also supported on X540 and X550 NICs, according to their datasheet (section 15.2). The way to set it up is a little different of the 82599. Signed-off-by: Julien Meunier --- v2: - disable / enable autoneg when loopback is requested for X540 / X550 --- drivers/net/ixgbe/base/ixgbe_type.h | 1 + drivers/net/ixgbe/base/ixgbe_x540.c | 26 ++++++++++++++++ drivers/net/ixgbe/base/ixgbe_x540.h | 2 ++ drivers/net/ixgbe/base/ixgbe_x550.c | 26 ++++++++++++++++ drivers/net/ixgbe/base/ixgbe_x550.h | 1 + drivers/net/ixgbe/ixgbe_ethdev.h | 5 ++- drivers/net/ixgbe/ixgbe_rxtx.c | 61 +++++++++++++++++++++++++++++++++++-- 7 files changed, 117 insertions(+), 5 deletions(-) diff --git a/drivers/net/ixgbe/base/ixgbe_type.h b/drivers/net/ixgbe/base/ixgbe_type.h index 077b8f0..c4af31e 100644 --- a/drivers/net/ixgbe/base/ixgbe_type.h +++ b/drivers/net/ixgbe/base/ixgbe_type.h @@ -1649,6 +1649,7 @@ struct ixgbe_dmac_config { #define IXGBE_MII_5GBASE_T_ADVERTISE 0x0800 #define IXGBE_MII_100BASE_T_ADVERTISE 0x0100 /* full duplex, bit:8 */ #define IXGBE_MII_100BASE_T_ADVERTISE_HALF 0x0080 /* half duplex, bit:7 */ +#define IXGBE_MII_AUTONEG_ENABLE 0x1000 #define IXGBE_MII_RESTART 0x200 #define IXGBE_MII_AUTONEG_COMPLETE 0x20 #define IXGBE_MII_AUTONEG_LINK_UP 0x04 diff --git a/drivers/net/ixgbe/base/ixgbe_x540.c b/drivers/net/ixgbe/base/ixgbe_x540.c index f00f0ea..a241d41 100644 --- a/drivers/net/ixgbe/base/ixgbe_x540.c +++ b/drivers/net/ixgbe/base/ixgbe_x540.c @@ -1032,3 +1032,29 @@ s32 ixgbe_blink_led_stop_X540(struct ixgbe_hw *hw, u32 index) return IXGBE_SUCCESS; } + +/* + * ixgbe_setup_phy_link_x540 - Enable/disable the autoneg + * @hw: pointer to hardware structure + * enable: enable/disable the autoneg + **/ +s32 ixgbe_setup_phy_autoneg_x540(struct ixgbe_hw *hw, bool enable) +{ + s32 status = IXGBE_SUCCESS; + u16 autoneg_reg = IXGBE_MII_AUTONEG_REG; + + DEBUGFUNC("ixgbe_setup_phy_autoneg_x540"); + + hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL, + IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_reg); + + if (enable) + autoneg_reg |= IXGBE_MII_AUTONEG_ENABLE; + else + autoneg_reg &= ~IXGBE_MII_AUTONEG_ENABLE; + + hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL, + IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_reg); + + return status; +} diff --git a/drivers/net/ixgbe/base/ixgbe_x540.h b/drivers/net/ixgbe/base/ixgbe_x540.h index 231dfe5..ef939ce 100644 --- a/drivers/net/ixgbe/base/ixgbe_x540.h +++ b/drivers/net/ixgbe/base/ixgbe_x540.h @@ -34,5 +34,7 @@ void ixgbe_init_swfw_sync_X540(struct ixgbe_hw *hw); s32 ixgbe_blink_led_start_X540(struct ixgbe_hw *hw, u32 index); s32 ixgbe_blink_led_stop_X540(struct ixgbe_hw *hw, u32 index); + +s32 ixgbe_setup_phy_autoneg_x540(struct ixgbe_hw *hw, bool enable); #endif /* _IXGBE_X540_H_ */ diff --git a/drivers/net/ixgbe/base/ixgbe_x550.c b/drivers/net/ixgbe/base/ixgbe_x550.c index a920a14..f4ee188 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.c +++ b/drivers/net/ixgbe/base/ixgbe_x550.c @@ -4652,3 +4652,29 @@ bool ixgbe_fw_recovery_mode_X550(struct ixgbe_hw *hw) return !!(fwsm & IXGBE_FWSM_FW_NVM_RECOVERY_MODE); } + +/* + * ixgbe_setup_phy_link_x550 - Enable/disable the autoneg + * @hw: pointer to hardware structure + * enable: enable/disable the autoneg + **/ +s32 ixgbe_setup_phy_autoneg_x550(struct ixgbe_hw *hw, bool enable) +{ + s32 status = IXGBE_SUCCESS; + u16 autoneg_reg = IXGBE_MII_AUTONEG_REG; + + DEBUGFUNC("ixgbe_setup_phy_autoneg_x550"); + + hw->phy.ops.read_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL, + IXGBE_MDIO_AUTO_NEG_DEV_TYPE, &autoneg_reg); + + if (enable) + autoneg_reg |= IXGBE_MII_AUTONEG_ENABLE; + else + autoneg_reg &= ~IXGBE_MII_AUTONEG_ENABLE; + + hw->phy.ops.write_reg(hw, IXGBE_MDIO_AUTO_NEG_CONTROL, + IXGBE_MDIO_AUTO_NEG_DEV_TYPE, autoneg_reg); + + return status; +} diff --git a/drivers/net/ixgbe/base/ixgbe_x550.h b/drivers/net/ixgbe/base/ixgbe_x550.h index 3bd98f2..dd4fa18 100644 --- a/drivers/net/ixgbe/base/ixgbe_x550.h +++ b/drivers/net/ixgbe/base/ixgbe_x550.h @@ -93,4 +93,5 @@ s32 ixgbe_identify_sfp_module_X550em(struct ixgbe_hw *hw); s32 ixgbe_led_on_t_X550em(struct ixgbe_hw *hw, u32 led_idx); s32 ixgbe_led_off_t_X550em(struct ixgbe_hw *hw, u32 led_idx); bool ixgbe_fw_recovery_mode_X550(struct ixgbe_hw *hw); +s32 ixgbe_setup_phy_autoneg_x550(struct ixgbe_hw *hw, bool enable); #endif /* _IXGBE_X550_H_ */ diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index 565c69c..c60a697 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -65,9 +65,8 @@ #define IXGBE_QUEUE_ITR_INTERVAL_DEFAULT 500 /* 500us */ /* Loopback operation modes */ -/* 82599 specific loopback operation types */ -#define IXGBE_LPBK_82599_NONE 0x0 /* Default value. Loopback is disabled. */ -#define IXGBE_LPBK_82599_TX_RX 0x1 /* Tx->Rx loopback operation is enabled. */ +#define IXGBE_LPBK_NONE 0x0 /* Default value. Loopback is disabled. */ +#define IXGBE_LPBK_TX_RX 0x1 /* Tx->Rx loopback operation is enabled. */ #define IXGBE_MAX_JUMBO_FRAME_SIZE 0x2600 /* Maximum Jumbo frame size. */ diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index c9a70a8..1472d13 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -49,6 +49,8 @@ #include "ixgbe_ethdev.h" #include "base/ixgbe_dcb.h" #include "base/ixgbe_common.h" +#include "base/ixgbe_x540.h" +#include "base/ixgbe_x550.h" #include "ixgbe_rxtx.h" #ifdef RTE_LIBRTE_IEEE1588 @@ -3174,6 +3176,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) unsigned i; struct ixgbe_adapter *adapter = (struct ixgbe_adapter *)dev->data->dev_private; + struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); PMD_INIT_FUNC_TRACE(); @@ -3194,6 +3197,15 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) ixgbe_reset_rx_queue(adapter, rxq); } } + /* If loopback mode was enabled, reconfigure the link accordingly */ + if (dev->data->dev_conf.lpbk_mode != 0) { + if (hw->mac.type == ixgbe_mac_X540) + ixgbe_setup_phy_autoneg_x540(hw, true); + else if (hw->mac.type == ixgbe_mac_X550 || + hw->mac.type == ixgbe_mac_X550EM_x || + hw->mac.type == ixgbe_mac_X550EM_a) + ixgbe_setup_phy_autoneg_x550(hw, true); + } } void @@ -5074,8 +5086,12 @@ ixgbe_check_supported_loopback_mode(struct rte_eth_dev *dev) { struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - if (dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_82599_TX_RX) - if (hw->mac.type == ixgbe_mac_82599EB) + if (dev->data->dev_conf.lpbk_mode == IXGBE_LPBK_TX_RX) + if (hw->mac.type == ixgbe_mac_82599EB || + hw->mac.type == ixgbe_mac_X540 || + hw->mac.type == ixgbe_mac_X550 || + hw->mac.type == ixgbe_mac_X550EM_x || + hw->mac.type == ixgbe_mac_X550EM_a) return 0; return -ENOTSUP; @@ -5108,6 +5124,41 @@ ixgbe_setup_loopback_link_82599(struct ixgbe_hw *hw) msec_delay(50); } +/* + * Set up link loopback for X540 mode Tx->Rx. + */ +static inline void __attribute__((cold)) +ixgbe_setup_loopback_link_x540(struct ixgbe_hw *hw) +{ + uint32_t macc; + PMD_INIT_FUNC_TRACE(); + + /* datasheet 15.2.1: disable AUTONEG (PHY Bit 7.0.C) */ + ixgbe_setup_phy_autoneg_x540(hw, false); + + /* datasheet 15.2.1: MACC.FLU = 1 (force link up) */ + macc = IXGBE_READ_REG(hw, IXGBE_MACC); + macc |= IXGBE_MACC_FLU; + IXGBE_WRITE_REG(hw, IXGBE_MACC, macc); +} + +/* + * Set up link loopback for X550 mode Tx->Rx. + */ +static inline void __attribute__((cold)) +ixgbe_setup_loopback_link_x550(struct ixgbe_hw *hw) +{ + uint32_t macc; + PMD_INIT_FUNC_TRACE(); + + /* datasheet 15.2.1: disable AUTONEG (PHY Bit 7.0.C) */ + ixgbe_setup_phy_autoneg_x550(hw, false); + + /* datasheet 15.2.1: MACC.FLU = 1 (force link up) */ + macc = IXGBE_READ_REG(hw, IXGBE_MACC); + macc |= IXGBE_MACC_FLU; + IXGBE_WRITE_REG(hw, IXGBE_MACC, macc); +} /* * Start Transmit and Receive Units. @@ -5172,6 +5223,12 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev) if (dev->data->dev_conf.lpbk_mode != 0) { if (hw->mac.type == ixgbe_mac_82599EB) ixgbe_setup_loopback_link_82599(hw); + else if (hw->mac.type == ixgbe_mac_X540) + ixgbe_setup_loopback_link_x540(hw); + else if (hw->mac.type == ixgbe_mac_X550 || + hw->mac.type == ixgbe_mac_X550EM_x || + hw->mac.type == ixgbe_mac_X550EM_a) + ixgbe_setup_loopback_link_x550(hw); } #ifdef RTE_LIBRTE_SECURITY