[dpdk-dev,1/2] net/sfc: support loopback mode configuration
Checks
Commit Message
All loopback modes are listed in efx_loopback_type_t.
Available loopback modes are listed per link speed in
the enc_loopback_types member of the efx_nic_cfg_t.
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@solarflare.com>
Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
---
doc/guides/nics/sfc_efx.rst | 4 ++--
drivers/net/sfc/efsys.h | 2 +-
drivers/net/sfc/sfc.c | 2 ++
drivers/net/sfc/sfc_port.c | 40 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 45 insertions(+), 3 deletions(-)
Comments
On 4/4/2018 12:10 PM, Andrew Rybchenko wrote:
> All loopback modes are listed in efx_loopback_type_t.
> Available loopback modes are listed per link speed in
> the enc_loopback_types member of the efx_nic_cfg_t.
>
> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
> Reviewed-by: Andy Moreton <amoreton@solarflare.com>
> Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Getting following build error with clang, can you please check?
.../dpdk/drivers/net/sfc/base/efx_port.c:122:6: error: comparison of constant 64
with expression of type 'efx_loopback_type_t' (aka 'enum efx_loopback_type_e')
is always true [-Werror,-Wtautological-constant-out-of-range-compare]
if (EFX_TEST_QWORD_BIT(encp->enc_loopback_types[link_mode],
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.../dpdk/drivers/net/sfc/base/efx_types.h:1590:28: note: expanded from macro
'EFX_TEST_QWORD_BIT'
#define EFX_TEST_QWORD_BIT EFX_TEST_QWORD_BIT64
^
.../dpdk/drivers/net/sfc/base/efx_types.h:1412:22: note: expanded from macro
'EFX_TEST_QWORD_BIT64'
__CPU_TO_LE_64(EFX_SHIFT64(_bit, FIX_LINT(0)))) != 0)
~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.../dpdk/drivers/net/sfc/base/efx_types.h:1290:32: note: expanded from macro
'EFX_SHIFT64'
(((_bit) >= (_base) && (_bit) < (_base) + 64) ? \
^
.../dpdk/drivers/net/sfc/base/efx_types.h:269:50: note: expanded from macro
'__CPU_TO_LE_64'
#define __CPU_TO_LE_64(_x) ((uint64_t)__NOSWAP64(_x))
~~~~~~~~~~~^~~
.../dpdk/drivers/net/sfc/base/efx_types.h:238:26: note: expanded from macro
'__NOSWAP64'
#define __NOSWAP64(_x) (_x)
^~
1 error generated.
v1 -> v2:
- add patch to fix clang build error
Andrew Rybchenko (3):
net/sfc/base: fix comparison always true warning
net/sfc: support loopback mode configuration
app/testpmd: add commands to set loopback mode
app/test-pmd/cmdline.c | 121 ++++++++++++++++++++++++++++++++++++++++
doc/guides/nics/sfc_efx.rst | 4 +-
drivers/net/sfc/base/efx_port.c | 2 +-
drivers/net/sfc/efsys.h | 2 +-
drivers/net/sfc/sfc.c | 2 +
drivers/net/sfc/sfc_port.c | 40 +++++++++++++
6 files changed, 167 insertions(+), 4 deletions(-)
On 04/06/2018 03:09 PM, Ferruh Yigit wrote:
> On 4/4/2018 12:10 PM, Andrew Rybchenko wrote:
>> All loopback modes are listed in efx_loopback_type_t.
>> Available loopback modes are listed per link speed in
>> the enc_loopback_types member of the efx_nic_cfg_t.
>>
>> Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
>> Reviewed-by: Andy Moreton <amoreton@solarflare.com>
>> Reviewed-by: Ivan Malov <ivan.malov@oktetlabs.ru>
> Getting following build error with clang, can you please check?
>
>
> .../dpdk/drivers/net/sfc/base/efx_port.c:122:6: error: comparison of constant 64
> with expression of type 'efx_loopback_type_t' (aka 'enum efx_loopback_type_e')
> is always true [-Werror,-Wtautological-constant-out-of-range-compare]
> if (EFX_TEST_QWORD_BIT(encp->enc_loopback_types[link_mode],
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> .../dpdk/drivers/net/sfc/base/efx_types.h:1590:28: note: expanded from macro
> 'EFX_TEST_QWORD_BIT'
> #define EFX_TEST_QWORD_BIT EFX_TEST_QWORD_BIT64
> ^
> .../dpdk/drivers/net/sfc/base/efx_types.h:1412:22: note: expanded from macro
> 'EFX_TEST_QWORD_BIT64'
> __CPU_TO_LE_64(EFX_SHIFT64(_bit, FIX_LINT(0)))) != 0)
> ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> .../dpdk/drivers/net/sfc/base/efx_types.h:1290:32: note: expanded from macro
> 'EFX_SHIFT64'
> (((_bit) >= (_base) && (_bit) < (_base) + 64) ? \
> ^
> .../dpdk/drivers/net/sfc/base/efx_types.h:269:50: note: expanded from macro
> '__CPU_TO_LE_64'
> #define __CPU_TO_LE_64(_x) ((uint64_t)__NOSWAP64(_x))
> ~~~~~~~~~~~^~~
> .../dpdk/drivers/net/sfc/base/efx_types.h:238:26: note: expanded from macro
> '__NOSWAP64'
> #define __NOSWAP64(_x) (_x)
> ^~
> 1 error generated.
Thanks, I've added patch to fix the problem.
Andrew.
On 4/9/2018 12:58 PM, Andrew Rybchenko wrote:
> v1 -> v2:
> - add patch to fix clang build error
>
> Andrew Rybchenko (3):
> net/sfc/base: fix comparison always true warning
> net/sfc: support loopback mode configuration
> app/testpmd: add commands to set loopback mode
Series applied to dpdk-next-net/master, thanks.
@@ -88,6 +88,8 @@ SFC EFX PMD has support for:
- Flow API
+- Loopback
+
Non-supported Features
----------------------
@@ -98,8 +100,6 @@ The features not yet supported include:
- Priority-based flow control
-- Loopback
-
- Configurable RX CRC stripping (always stripped)
- Header split on receive
@@ -166,7 +166,7 @@ prefetch_read_once(const volatile void *addr)
#define EFSYS_OPT_MAC_STATS 1
-#define EFSYS_OPT_LOOPBACK 0
+#define EFSYS_OPT_LOOPBACK 1
#define EFSYS_OPT_MON_MCDI 0
#define EFSYS_OPT_MON_STATS 0
@@ -123,10 +123,12 @@ sfc_check_conf(struct sfc_adapter *sa)
rc = EINVAL;
}
+#if !EFSYS_OPT_LOOPBACK
if (conf->lpbk_mode != 0) {
sfc_err(sa, "Loopback not supported");
rc = EINVAL;
}
+#endif
if (conf->dcb_capability_en != 0) {
sfc_err(sa, "Priority-based flow control not supported");
@@ -121,6 +121,28 @@ sfc_port_init_dev_link(struct sfc_adapter *sa)
return 0;
}
+#if EFSYS_OPT_LOOPBACK
+
+static efx_link_mode_t
+sfc_port_phy_caps_to_max_link_speed(uint32_t phy_caps)
+{
+ if (phy_caps & (1u << EFX_PHY_CAP_100000FDX))
+ return EFX_LINK_100000FDX;
+ if (phy_caps & (1u << EFX_PHY_CAP_50000FDX))
+ return EFX_LINK_50000FDX;
+ if (phy_caps & (1u << EFX_PHY_CAP_40000FDX))
+ return EFX_LINK_40000FDX;
+ if (phy_caps & (1u << EFX_PHY_CAP_25000FDX))
+ return EFX_LINK_25000FDX;
+ if (phy_caps & (1u << EFX_PHY_CAP_10000FDX))
+ return EFX_LINK_10000FDX;
+ if (phy_caps & (1u << EFX_PHY_CAP_1000FDX))
+ return EFX_LINK_1000FDX;
+ return EFX_LINK_UNKNOWN;
+}
+
+#endif
+
int
sfc_port_start(struct sfc_adapter *sa)
{
@@ -143,6 +165,21 @@ sfc_port_start(struct sfc_adapter *sa)
if (rc != 0)
goto fail_port_init;
+#if EFSYS_OPT_LOOPBACK
+ if (sa->eth_dev->data->dev_conf.lpbk_mode != 0) {
+ efx_link_mode_t link_mode;
+
+ link_mode =
+ sfc_port_phy_caps_to_max_link_speed(port->phy_adv_cap);
+ sfc_log_init(sa, "set loopback link_mode=%u type=%u", link_mode,
+ sa->eth_dev->data->dev_conf.lpbk_mode);
+ rc = efx_port_loopback_set(sa->nic, link_mode,
+ sa->eth_dev->data->dev_conf.lpbk_mode);
+ if (rc != 0)
+ goto fail_loopback_set;
+ }
+#endif
+
sfc_log_init(sa, "set flow control to %#x autoneg=%u",
port->flow_ctrl, port->flow_ctrl_autoneg);
rc = efx_mac_fcntl_set(sa->nic, port->flow_ctrl,
@@ -268,6 +305,9 @@ sfc_port_start(struct sfc_adapter *sa)
fail_mac_pdu_set:
fail_phy_adv_cap_set:
fail_mac_fcntl_set:
+#if EFSYS_OPT_LOOPBACK
+fail_loopback_set:
+#endif
efx_port_fini(sa->nic);
fail_port_init: