From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id CC0941B209 for ; Mon, 7 Jan 2019 11:05:28 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2019 02:05:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,450,1539673200"; d="scan'208";a="265015068" Received: from kmsmsx152.gar.corp.intel.com ([172.21.73.87]) by orsmga004.jf.intel.com with ESMTP; 07 Jan 2019 02:05:26 -0800 Received: from pgsmsx103.gar.corp.intel.com ([169.254.2.6]) by KMSMSX152.gar.corp.intel.com ([169.254.11.185]) with mapi id 14.03.0415.000; Mon, 7 Jan 2019 18:05:25 +0800 From: "Zhao1, Wei" To: Julien Meunier , "Ananyev, Konstantin" , "Lu, Wenzhuo" CC: "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] net/ixgbe: add support of loopback for X540/X550 Thread-Index: AQHUorR4t2DMOQjamk2U0ZFglDInCaWjmrlA Date: Mon, 7 Jan 2019 10:05:24 +0000 Message-ID: References: <20190102160055.30301-1-julien.meunier@nokia.com> In-Reply-To: <20190102160055.30301-1-julien.meunier@nokia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [172.30.20.205] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH] 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: , X-List-Received-Date: Mon, 07 Jan 2019 10:05:29 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Julien Meunier > Sent: Thursday, January 3, 2019 12:01 AM > To: Ananyev, Konstantin ; Lu, Wenzhuo > > Cc: dev@dpdk.org > Subject: [dpdk-dev] [PATCH] net/ixgbe: add support of loopback for > X540/X550 >=20 > 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 t= he 82599. >=20 > Signed-off-by: Julien Meunier > --- > drivers/net/ixgbe/ixgbe_ethdev.c | 10 ++++++--- > drivers/net/ixgbe/ixgbe_ethdev.h | 5 ++--- > drivers/net/ixgbe/ixgbe_rxtx.c | 47 > ++++++++++++++++++++++++++++++++++------ > 3 files changed, 49 insertions(+), 13 deletions(-) >=20 > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c > b/drivers/net/ixgbe/ixgbe_ethdev.c > index 7493110..7eb3303 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -2652,9 +2652,13 @@ ixgbe_dev_start(struct rte_eth_dev *dev) > goto error; > } >=20 > - /* Skip link setup if loopback mode is enabled for 82599. */ > - if (hw->mac.type =3D=3D ixgbe_mac_82599EB && > - dev->data->dev_conf.lpbk_mode =3D=3D > IXGBE_LPBK_82599_TX_RX) > + /* Skip link setup if loopback mode is enabled. */ > + if ((hw->mac.type =3D=3D ixgbe_mac_82599EB || > + hw->mac.type =3D=3D ixgbe_mac_X540 || > + hw->mac.type =3D=3D ixgbe_mac_X550 || > + hw->mac.type =3D=3D ixgbe_mac_X550EM_x || > + hw->mac.type =3D=3D ixgbe_mac_X550EM_a) && > + dev->data->dev_conf.lpbk_mode =3D=3D > IXGBE_LPBK_TX_RX) > goto skip_link_setup; >=20 > if (ixgbe_is_sfp(hw) && hw->phy.multispeed_fiber) { 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 */ >=20 > /* 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. > +*/ >=20 > #define IXGBE_MAX_JUMBO_FRAME_SIZE 0x2600 /* Maximum Jumbo > frame size. */ >=20 > diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxt= x.c > index 9a79d18..0ef7fdf 100644 > --- a/drivers/net/ixgbe/ixgbe_rxtx.c > +++ b/drivers/net/ixgbe/ixgbe_rxtx.c > @@ -4879,10 +4879,14 @@ ixgbe_dev_rx_init(struct rte_eth_dev *dev) > hlreg0 &=3D ~IXGBE_HLREG0_JUMBOEN; >=20 > /* > - * If loopback mode is configured for 82599, set LPBK bit. > + * If loopback mode is configured, set LPBK bit. > */ > - if (hw->mac.type =3D=3D ixgbe_mac_82599EB && > - dev->data->dev_conf.lpbk_mode =3D=3D > IXGBE_LPBK_82599_TX_RX) > + if ((hw->mac.type =3D=3D ixgbe_mac_82599EB || > + hw->mac.type =3D=3D ixgbe_mac_X540 || > + hw->mac.type =3D=3D ixgbe_mac_X550 || > + hw->mac.type =3D=3D ixgbe_mac_X550EM_x || > + hw->mac.type =3D=3D ixgbe_mac_X550EM_a) && > + dev->data->dev_conf.lpbk_mode =3D=3D > IXGBE_LPBK_TX_RX) > hlreg0 |=3D IXGBE_HLREG0_LPBK; > else > hlreg0 &=3D ~IXGBE_HLREG0_LPBK; > @@ -5088,6 +5092,29 @@ ixgbe_setup_loopback_link_82599(struct > ixgbe_hw *hw) > msec_delay(50); > } >=20 > +/* > + * Set up link loopback for X540 / X550 mode Tx->Rx. > + */ > +static inline void __attribute__((cold)) > +ixgbe_setup_loopback_link_x540_x550(struct ixgbe_hw *hw) { > + uint32_t macc; > + PMD_INIT_FUNC_TRACE(); > + > + /* datasheet 15.2.1: MACC.FLU =3D 1 (force link up) */ > + macc =3D IXGBE_READ_REG(hw, IXGBE_MACC); > + macc |=3D IXGBE_MACC_FLU; > + IXGBE_WRITE_REG(hw, IXGBE_MACC, macc); > + > + /* Restart link */ > + IXGBE_WRITE_REG(hw, > + IXGBE_AUTOC, > + IXGBE_AUTOC_LMS_10G_LINK_NO_AN | > IXGBE_AUTOC_FLU); > + > + hw->mac.ops.release_swfw_sync(hw, IXGBE_GSSR_MAC_CSR_SM); > + msec_delay(50); > +} > + >=20 > /* > * Start Transmit and Receive Units. > @@ -5148,10 +5175,16 @@ ixgbe_dev_rxtx_start(struct rte_eth_dev *dev) > rxctrl |=3D IXGBE_RXCTRL_RXEN; > hw->mac.ops.enable_rx_dma(hw, rxctrl); >=20 > - /* If loopback mode is enabled for 82599, set up the link accordingly > */ > - if (hw->mac.type =3D=3D ixgbe_mac_82599EB && > - dev->data->dev_conf.lpbk_mode =3D=3D > 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 =3D=3D IXGBE_LPBK_TX_RX) { > + if (hw->mac.type =3D=3D ixgbe_mac_82599EB) > + ixgbe_setup_loopback_link_82599(hw); > + else if (hw->mac.type =3D=3D ixgbe_mac_X540 || > + hw->mac.type =3D=3D ixgbe_mac_X550 || > + hw->mac.type =3D=3D ixgbe_mac_X550EM_x || > + hw->mac.type =3D=3D ixgbe_mac_X550EM_a) > + ixgbe_setup_loopback_link_x540_x550(hw); Else Return -1; SHOULD we add some branch here?=20 In case some other NIC with configuration for tx->rx loop but pmd code do n= ot support. > + } >=20 > #ifdef RTE_LIBRTE_SECURITY > if ((dev->data->dev_conf.rxmode.offloads & > -- > 2.10.2