* [PATCH v2 0/3] net/octeon_ep: rename driver and add features
@ 2022-07-27 9:21 Sathesh Edara
2022-07-27 9:21 ` [PATCH v2 1/3] net: rename octeon ep PMD Sathesh Edara
` (2 more replies)
0 siblings, 3 replies; 14+ messages in thread
From: Sathesh Edara @ 2022-07-27 9:21 UTC (permalink / raw)
To: sburla, jerinj, sedara; +Cc: dev
This patch set renames the net/octeontx_ep driver to net/octeon_ep
and 2nd and 3rd patches add support for basic stats and link status.
changes in v2:
Added new features in the renamed driver.
Sathesh Edara (3):
net: rename octeon ep PMD
net/octeon_ep: support basic stats
net/octeon_ep: support link status
MAINTAINERS | 6 +-
.../{octeontx_ep.ini => octeon_ep.ini} | 4 +-
doc/guides/nics/index.rst | 2 +-
.../nics/{octeontx_ep.rst => octeon_ep.rst} | 4 +-
drivers/net/meson.build | 2 +-
.../{octeontx_ep => octeon_ep}/meson.build | 0
.../{octeontx_ep => octeon_ep}/otx2_ep_vf.c | 0
.../{octeontx_ep => octeon_ep}/otx2_ep_vf.h | 0
.../otx_ep_common.h | 0
.../otx_ep_ethdev.c | 69 +++++++++++++++++++
.../{octeontx_ep => octeon_ep}/otx_ep_rxtx.c | 0
.../{octeontx_ep => octeon_ep}/otx_ep_rxtx.h | 0
.../{octeontx_ep => octeon_ep}/otx_ep_vf.c | 0
.../{octeontx_ep => octeon_ep}/otx_ep_vf.h | 0
.../{octeontx_ep => octeon_ep}/version.map | 0
15 files changed, 79 insertions(+), 8 deletions(-)
rename doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} (64%)
rename doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} (87%)
rename drivers/net/{octeontx_ep => octeon_ep}/meson.build (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c (86%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/version.map (100%)
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 1/3] net: rename octeon ep PMD
2022-07-27 9:21 [PATCH v2 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
@ 2022-07-27 9:21 ` Sathesh Edara
2022-08-16 5:32 ` Veerasenareddy Burru
2022-08-22 9:10 ` [PATCH v3 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
2022-07-27 9:21 ` [PATCH v2 2/3] net/octeon_ep: support basic stats Sathesh Edara
2022-07-27 9:21 ` [PATCH v2 3/3] net/octeon_ep: support link status Sathesh Edara
2 siblings, 2 replies; 14+ messages in thread
From: Sathesh Edara @ 2022-07-27 9:21 UTC (permalink / raw)
To: sburla, jerinj, sedara, Thomas Monjalon,
Radha Mohan Chintakuntla, Veerasenareddy Burru, Ray Kinsella
Cc: dev
This patch renames octeon end point driver from octeontx_ep to
octeon_ep to enable single unified driver to support current
OcteonTx and future Octeon PCI endpoint NICs to reflect common
driver for all Octeon based PCI endpoint NICs.
Signed-off-by: Sathesh Edara <sedara@marvell.com>
---
MAINTAINERS | 6 +++---
doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} | 2 +-
doc/guides/nics/index.rst | 2 +-
doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} | 4 ++--
drivers/net/meson.build | 2 +-
drivers/net/{octeontx_ep => octeon_ep}/meson.build | 0
drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h | 0
drivers/net/{octeontx_ep => octeon_ep}/version.map | 0
15 files changed, 8 insertions(+), 8 deletions(-)
rename doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} (75%)
rename doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} (87%)
rename drivers/net/{octeontx_ep => octeon_ep}/meson.build (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/version.map (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 32ffdd1a61..d7c7fa4cdf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -812,9 +812,9 @@ M: Radha Mohan Chintakuntla <radhac@marvell.com>
M: Veerasenareddy Burru <vburru@marvell.com>
M: Sathesh Edara <sedara@marvell.com>
T: git://dpdk.org/next/dpdk-next-net-mrvl
-F: drivers/net/octeontx_ep/
-F: doc/guides/nics/features/octeontx_ep.ini
-F: doc/guides/nics/octeontx_ep.rst
+F: drivers/net/octeon_ep/
+F: doc/guides/nics/features/octeon_ep.ini
+F: doc/guides/nics/octeon_ep.rst
Mellanox mlx4
M: Matan Azrad <matan@nvidia.com>
diff --git a/doc/guides/nics/features/octeontx_ep.ini b/doc/guides/nics/features/octeon_ep.ini
similarity index 75%
rename from doc/guides/nics/features/octeontx_ep.ini
rename to doc/guides/nics/features/octeon_ep.ini
index d1453f5bee..141d918466 100644
--- a/doc/guides/nics/features/octeontx_ep.ini
+++ b/doc/guides/nics/features/octeon_ep.ini
@@ -1,5 +1,5 @@
;
-; Supported features of the 'octeontx_ep' network poll mode driver.
+; Supported features of the 'octeon_ep' network poll mode driver.
;
; Refer to default.ini for the full list of available PMD features.
;
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index f48e9f815c..f80906a97d 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -52,7 +52,7 @@ Network Interface Controller Drivers
ngbe
null
octeontx
- octeontx_ep
+ octeon_ep
pfe
qede
sfc_efx
diff --git a/doc/guides/nics/octeontx_ep.rst b/doc/guides/nics/octeon_ep.rst
similarity index 87%
rename from doc/guides/nics/octeontx_ep.rst
rename to doc/guides/nics/octeon_ep.rst
index 2ec8a034b5..b5040aeee2 100644
--- a/doc/guides/nics/octeontx_ep.rst
+++ b/doc/guides/nics/octeon_ep.rst
@@ -4,9 +4,9 @@
OCTEON TX EP Poll Mode driver
=============================
-The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeontx_ep**) provides poll mode
+The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeon_ep**) provides poll mode
ethdev driver support for the virtual functions (VF) of **Marvell OCTEON 9**
-and **Cavium OCTEON TX** families of adapters in SR-IOV context.
+and **Cavium OCTEON** families of adapters in SR-IOV context.
More information can be found at `Marvell Official Website
<https://www.marvell.com/content/dam/marvell/en/public-collateral/embedded-processors/marvell-liquidio-III-solutions-brief.pdf>`_.
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index e35652fe63..37919eaf8b 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -45,7 +45,7 @@ drivers = [
'ngbe',
'null',
'octeontx',
- 'octeontx_ep',
+ 'octeon_ep',
'pcap',
'pfe',
'qede',
diff --git a/drivers/net/octeontx_ep/meson.build b/drivers/net/octeon_ep/meson.build
similarity index 100%
rename from drivers/net/octeontx_ep/meson.build
rename to drivers/net/octeon_ep/meson.build
diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.c b/drivers/net/octeon_ep/otx2_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.c
rename to drivers/net/octeon_ep/otx2_ep_vf.c
diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.h b/drivers/net/octeon_ep/otx2_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.h
rename to drivers/net/octeon_ep/otx2_ep_vf.h
diff --git a/drivers/net/octeontx_ep/otx_ep_common.h b/drivers/net/octeon_ep/otx_ep_common.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_common.h
rename to drivers/net/octeon_ep/otx_ep_common.h
diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_ethdev.c
rename to drivers/net/octeon_ep/otx_ep_ethdev.c
diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.c b/drivers/net/octeon_ep/otx_ep_rxtx.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.c
rename to drivers/net/octeon_ep/otx_ep_rxtx.c
diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.h b/drivers/net/octeon_ep/otx_ep_rxtx.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.h
rename to drivers/net/octeon_ep/otx_ep_rxtx.h
diff --git a/drivers/net/octeontx_ep/otx_ep_vf.c b/drivers/net/octeon_ep/otx_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.c
rename to drivers/net/octeon_ep/otx_ep_vf.c
diff --git a/drivers/net/octeontx_ep/otx_ep_vf.h b/drivers/net/octeon_ep/otx_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.h
rename to drivers/net/octeon_ep/otx_ep_vf.h
diff --git a/drivers/net/octeontx_ep/version.map b/drivers/net/octeon_ep/version.map
similarity index 100%
rename from drivers/net/octeontx_ep/version.map
rename to drivers/net/octeon_ep/version.map
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 2/3] net/octeon_ep: support basic stats
2022-07-27 9:21 [PATCH v2 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
2022-07-27 9:21 ` [PATCH v2 1/3] net: rename octeon ep PMD Sathesh Edara
@ 2022-07-27 9:21 ` Sathesh Edara
2022-08-16 5:34 ` Veerasenareddy Burru
2022-07-27 9:21 ` [PATCH v2 3/3] net/octeon_ep: support link status Sathesh Edara
2 siblings, 1 reply; 14+ messages in thread
From: Sathesh Edara @ 2022-07-27 9:21 UTC (permalink / raw)
To: sburla, jerinj, sedara, Radha Mohan Chintakuntla, Veerasenareddy Burru
Cc: dev
Added functionality to fetch and reset ethdev stats.
Signed-off-by: Sathesh Edara <sedara@marvell.com>
---
doc/guides/nics/features/octeon_ep.ini | 1 +
drivers/net/octeon_ep/otx_ep_ethdev.c | 52 ++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/doc/guides/nics/features/octeon_ep.ini b/doc/guides/nics/features/octeon_ep.ini
index 141d918466..b304ff8877 100644
--- a/doc/guides/nics/features/octeon_ep.ini
+++ b/doc/guides/nics/features/octeon_ep.ini
@@ -8,4 +8,5 @@ Speed capabilities = P
SR-IOV = Y
Linux = Y
x86-64 = Y
+Basic stats = Y
Usage doc = Y
diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
index 806add246b..cb45bd7a8a 100644
--- a/drivers/net/octeon_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
@@ -337,6 +337,56 @@ otx_ep_tx_queue_release(struct rte_eth_dev *dev, uint16_t q_no)
otx_ep_delete_iqs(tq->otx_ep_dev, tq->q_no);
}
+static int
+otx_ep_dev_stats_reset(struct rte_eth_dev *dev)
+{
+ struct otx_ep_device *otx_epvf = OTX_EP_DEV(dev);
+ uint32_t i;
+
+ for (i = 0; i < otx_epvf->nb_tx_queues; i++)
+ memset(&otx_epvf->instr_queue[i]->stats, 0,
+ sizeof(struct otx_ep_iq_stats));
+
+ for (i = 0; i < otx_epvf->nb_rx_queues; i++)
+ memset(&otx_epvf->droq[i]->stats, 0,
+ sizeof(struct otx_ep_droq_stats));
+
+ return 0;
+}
+
+static int
+otx_ep_dev_stats_get(struct rte_eth_dev *eth_dev,
+ struct rte_eth_stats *stats)
+{
+ struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
+ struct otx_ep_iq_stats *ostats;
+ struct otx_ep_droq_stats *istats;
+ uint32_t i;
+
+ memset(stats, 0, sizeof(struct rte_eth_stats));
+
+ for (i = 0; i < otx_epvf->nb_tx_queues; i++) {
+ ostats = &otx_epvf->instr_queue[i]->stats;
+ stats->q_opackets[i] = ostats->tx_pkts;
+ stats->q_obytes[i] = ostats->tx_bytes;
+ stats->opackets += ostats->tx_pkts;
+ stats->obytes += ostats->tx_bytes;
+ stats->oerrors += ostats->instr_dropped;
+ }
+ for (i = 0; i < otx_epvf->nb_rx_queues; i++) {
+ istats = &otx_epvf->droq[i]->stats;
+ stats->q_ipackets[i] = istats->pkts_received;
+ stats->q_ibytes[i] = istats->bytes_received;
+ stats->q_errors[i] = istats->rx_err;
+ stats->ipackets += istats->pkts_received;
+ stats->ibytes += istats->bytes_received;
+ stats->imissed += istats->rx_alloc_failure;
+ stats->ierrors += istats->rx_err;
+ stats->rx_nombuf += istats->rx_alloc_failure;
+ }
+ return 0;
+}
+
/* Define our ethernet definitions */
static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.dev_configure = otx_ep_dev_configure,
@@ -347,6 +397,8 @@ static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.tx_queue_setup = otx_ep_tx_queue_setup,
.tx_queue_release = otx_ep_tx_queue_release,
.dev_infos_get = otx_ep_dev_info_get,
+ .stats_get = otx_ep_dev_stats_get,
+ .stats_reset = otx_ep_dev_stats_reset,
};
static int
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 3/3] net/octeon_ep: support link status
2022-07-27 9:21 [PATCH v2 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
2022-07-27 9:21 ` [PATCH v2 1/3] net: rename octeon ep PMD Sathesh Edara
2022-07-27 9:21 ` [PATCH v2 2/3] net/octeon_ep: support basic stats Sathesh Edara
@ 2022-07-27 9:21 ` Sathesh Edara
2022-08-16 5:34 ` Veerasenareddy Burru
2 siblings, 1 reply; 14+ messages in thread
From: Sathesh Edara @ 2022-07-27 9:21 UTC (permalink / raw)
To: sburla, jerinj, sedara, Radha Mohan Chintakuntla, Veerasenareddy Burru
Cc: dev
Added functionality to update link speed, duplex mode and link state.
Signed-off-by: Sathesh Edara <sedara@marvell.com>
---
doc/guides/nics/features/octeon_ep.ini | 1 +
drivers/net/octeon_ep/otx_ep_ethdev.c | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/doc/guides/nics/features/octeon_ep.ini b/doc/guides/nics/features/octeon_ep.ini
index b304ff8877..305e219262 100644
--- a/doc/guides/nics/features/octeon_ep.ini
+++ b/doc/guides/nics/features/octeon_ep.ini
@@ -9,4 +9,5 @@ SR-IOV = Y
Linux = Y
x86-64 = Y
Basic stats = Y
+Link status = Y
Usage doc = Y
diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
index cb45bd7a8a..77def6daa1 100644
--- a/drivers/net/octeon_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
@@ -387,6 +387,22 @@ otx_ep_dev_stats_get(struct rte_eth_dev *eth_dev,
return 0;
}
+static int
+otx_ep_dev_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)
+{
+ RTE_SET_USED(wait_to_complete);
+
+ if (!eth_dev->data->dev_started)
+ return 0;
+ struct rte_eth_link link;
+
+ memset(&link, 0, sizeof(link));
+ link.link_status = RTE_ETH_LINK_UP;
+ link.link_speed = RTE_ETH_SPEED_NUM_10G;
+ link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
+ return rte_eth_linkstatus_set(eth_dev, &link);
+}
+
/* Define our ethernet definitions */
static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.dev_configure = otx_ep_dev_configure,
@@ -399,6 +415,7 @@ static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.dev_infos_get = otx_ep_dev_info_get,
.stats_get = otx_ep_dev_stats_get,
.stats_reset = otx_ep_dev_stats_reset,
+ .link_update = otx_ep_dev_link_update,
};
static int
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH v2 1/3] net: rename octeon ep PMD
2022-07-27 9:21 ` [PATCH v2 1/3] net: rename octeon ep PMD Sathesh Edara
@ 2022-08-16 5:32 ` Veerasenareddy Burru
2022-08-19 12:18 ` Jerin Jacob
2022-08-22 9:10 ` [PATCH v3 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
1 sibling, 1 reply; 14+ messages in thread
From: Veerasenareddy Burru @ 2022-08-16 5:32 UTC (permalink / raw)
To: Sathesh B Edara, Satananda Burla, Jerin Jacob Kollanukkaran,
Sathesh B Edara, Thomas Monjalon, Radha Chintakuntla,
Ray Kinsella
Cc: dev
> -----Original Message-----
> From: Sathesh Edara <sedara@marvell.com>
> Sent: Wednesday, July 27, 2022 2:22 AM
> To: Satananda Burla <sburla@marvell.com>; Jerin Jacob Kollanukkaran
> <jerinj@marvell.com>; Sathesh B Edara <sedara@marvell.com>; Thomas
> Monjalon <thomas@monjalon.net>; Radha Chintakuntla
> <radhac@marvell.com>; Veerasenareddy Burru <vburru@marvell.com>; Ray
> Kinsella <mdr@ashroe.eu>
> Cc: dev@dpdk.org
> Subject: [PATCH v2 1/3] net: rename octeon ep PMD
>
> This patch renames octeon end point driver from octeontx_ep to octeon_ep
> to enable single unified driver to support current OcteonTx and future
> Octeon PCI endpoint NICs to reflect common driver for all Octeon based PCI
> endpoint NICs.
>
> Signed-off-by: Sathesh Edara <sedara@marvell.com>
> ---
> MAINTAINERS | 6 +++---
> doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} | 2 +-
> doc/guides/nics/index.rst | 2 +-
> doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} | 4 ++--
> drivers/net/meson.build | 2 +-
> drivers/net/{octeontx_ep => octeon_ep}/meson.build | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c | 0
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h | 0
> drivers/net/{octeontx_ep => octeon_ep}/version.map | 0
> 15 files changed, 8 insertions(+), 8 deletions(-) rename
> doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} (75%) rename
> doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} (87%) rename
> drivers/net/{octeontx_ep => octeon_ep}/meson.build (100%) rename
> drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c (100%) rename
> drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h (100%) rename
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/version.map (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 32ffdd1a61..d7c7fa4cdf 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -812,9 +812,9 @@ M: Radha Mohan Chintakuntla
> <radhac@marvell.com>
> M: Veerasenareddy Burru <vburru@marvell.com>
> M: Sathesh Edara <sedara@marvell.com>
> T: git://dpdk.org/next/dpdk-next-net-mrvl
> -F: drivers/net/octeontx_ep/
> -F: doc/guides/nics/features/octeontx_ep.ini
> -F: doc/guides/nics/octeontx_ep.rst
> +F: drivers/net/octeon_ep/
> +F: doc/guides/nics/features/octeon_ep.ini
> +F: doc/guides/nics/octeon_ep.rst
>
> Mellanox mlx4
> M: Matan Azrad <matan@nvidia.com>
> diff --git a/doc/guides/nics/features/octeontx_ep.ini
> b/doc/guides/nics/features/octeon_ep.ini
> similarity index 75%
> rename from doc/guides/nics/features/octeontx_ep.ini
> rename to doc/guides/nics/features/octeon_ep.ini
> index d1453f5bee..141d918466 100644
> --- a/doc/guides/nics/features/octeontx_ep.ini
> +++ b/doc/guides/nics/features/octeon_ep.ini
> @@ -1,5 +1,5 @@
> ;
> -; Supported features of the 'octeontx_ep' network poll mode driver.
> +; Supported features of the 'octeon_ep' network poll mode driver.
> ;
> ; Refer to default.ini for the full list of available PMD features.
> ;
> diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst index
> f48e9f815c..f80906a97d 100644
> --- a/doc/guides/nics/index.rst
> +++ b/doc/guides/nics/index.rst
> @@ -52,7 +52,7 @@ Network Interface Controller Drivers
> ngbe
> null
> octeontx
> - octeontx_ep
> + octeon_ep
> pfe
> qede
> sfc_efx
> diff --git a/doc/guides/nics/octeontx_ep.rst
> b/doc/guides/nics/octeon_ep.rst similarity index 87% rename from
> doc/guides/nics/octeontx_ep.rst rename to doc/guides/nics/octeon_ep.rst
> index 2ec8a034b5..b5040aeee2 100644
> --- a/doc/guides/nics/octeontx_ep.rst
> +++ b/doc/guides/nics/octeon_ep.rst
> @@ -4,9 +4,9 @@
> OCTEON TX EP Poll Mode driver
> =============================
>
> -The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeontx_ep**) provides
> poll mode
> +The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeon_ep**) provides
> poll
> +mode
> ethdev driver support for the virtual functions (VF) of **Marvell OCTEON
> 9** -and **Cavium OCTEON TX** families of adapters in SR-IOV context.
> +and **Cavium OCTEON** families of adapters in SR-IOV context.
>
> More information can be found at `Marvell Official Website
> <https://www.marvell.com/content/dam/marvell/en/public-
> collateral/embedded-processors/marvell-liquidio-III-solutions-brief.pdf>`_.
> diff --git a/drivers/net/meson.build b/drivers/net/meson.build index
> e35652fe63..37919eaf8b 100644
> --- a/drivers/net/meson.build
> +++ b/drivers/net/meson.build
> @@ -45,7 +45,7 @@ drivers = [
> 'ngbe',
> 'null',
> 'octeontx',
> - 'octeontx_ep',
> + 'octeon_ep',
> 'pcap',
> 'pfe',
> 'qede',
> diff --git a/drivers/net/octeontx_ep/meson.build
> b/drivers/net/octeon_ep/meson.build
> similarity index 100%
> rename from drivers/net/octeontx_ep/meson.build
> rename to drivers/net/octeon_ep/meson.build diff --git
> a/drivers/net/octeontx_ep/otx2_ep_vf.c
> b/drivers/net/octeon_ep/otx2_ep_vf.c
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx2_ep_vf.c
> rename to drivers/net/octeon_ep/otx2_ep_vf.c
> diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.h
> b/drivers/net/octeon_ep/otx2_ep_vf.h
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx2_ep_vf.h
> rename to drivers/net/octeon_ep/otx2_ep_vf.h
> diff --git a/drivers/net/octeontx_ep/otx_ep_common.h
> b/drivers/net/octeon_ep/otx_ep_common.h
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx_ep_common.h
> rename to drivers/net/octeon_ep/otx_ep_common.h
> diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c
> b/drivers/net/octeon_ep/otx_ep_ethdev.c
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx_ep_ethdev.c
> rename to drivers/net/octeon_ep/otx_ep_ethdev.c
> diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.c
> b/drivers/net/octeon_ep/otx_ep_rxtx.c
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx_ep_rxtx.c
> rename to drivers/net/octeon_ep/otx_ep_rxtx.c
> diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.h
> b/drivers/net/octeon_ep/otx_ep_rxtx.h
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx_ep_rxtx.h
> rename to drivers/net/octeon_ep/otx_ep_rxtx.h
> diff --git a/drivers/net/octeontx_ep/otx_ep_vf.c
> b/drivers/net/octeon_ep/otx_ep_vf.c
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx_ep_vf.c
> rename to drivers/net/octeon_ep/otx_ep_vf.c diff --git
> a/drivers/net/octeontx_ep/otx_ep_vf.h
> b/drivers/net/octeon_ep/otx_ep_vf.h
> similarity index 100%
> rename from drivers/net/octeontx_ep/otx_ep_vf.h
> rename to drivers/net/octeon_ep/otx_ep_vf.h diff --git
> a/drivers/net/octeontx_ep/version.map
> b/drivers/net/octeon_ep/version.map
> similarity index 100%
> rename from drivers/net/octeontx_ep/version.map
> rename to drivers/net/octeon_ep/version.map
Ack
> --
> 2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH v2 2/3] net/octeon_ep: support basic stats
2022-07-27 9:21 ` [PATCH v2 2/3] net/octeon_ep: support basic stats Sathesh Edara
@ 2022-08-16 5:34 ` Veerasenareddy Burru
0 siblings, 0 replies; 14+ messages in thread
From: Veerasenareddy Burru @ 2022-08-16 5:34 UTC (permalink / raw)
To: Sathesh B Edara, Satananda Burla, Jerin Jacob Kollanukkaran,
Sathesh B Edara, Radha Chintakuntla
Cc: dev
> -----Original Message-----
> From: Sathesh Edara <sedara@marvell.com>
> Sent: Wednesday, July 27, 2022 2:22 AM
> To: Satananda Burla <sburla@marvell.com>; Jerin Jacob Kollanukkaran
> <jerinj@marvell.com>; Sathesh B Edara <sedara@marvell.com>; Radha
> Chintakuntla <radhac@marvell.com>; Veerasenareddy Burru
> <vburru@marvell.com>
> Cc: dev@dpdk.org
> Subject: [PATCH v2 2/3] net/octeon_ep: support basic stats
>
> Added functionality to fetch and reset ethdev stats.
>
> Signed-off-by: Sathesh Edara <sedara@marvell.com>
> ---
> doc/guides/nics/features/octeon_ep.ini | 1 +
> drivers/net/octeon_ep/otx_ep_ethdev.c | 52
> ++++++++++++++++++++++++++
> 2 files changed, 53 insertions(+)
>
> diff --git a/doc/guides/nics/features/octeon_ep.ini
> b/doc/guides/nics/features/octeon_ep.ini
> index 141d918466..b304ff8877 100644
> --- a/doc/guides/nics/features/octeon_ep.ini
> +++ b/doc/guides/nics/features/octeon_ep.ini
> @@ -8,4 +8,5 @@ Speed capabilities = P
> SR-IOV = Y
> Linux = Y
> x86-64 = Y
> +Basic stats = Y
> Usage doc = Y
> diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c
> b/drivers/net/octeon_ep/otx_ep_ethdev.c
> index 806add246b..cb45bd7a8a 100644
> --- a/drivers/net/octeon_ep/otx_ep_ethdev.c
> +++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
> @@ -337,6 +337,56 @@ otx_ep_tx_queue_release(struct rte_eth_dev
> *dev, uint16_t q_no)
> otx_ep_delete_iqs(tq->otx_ep_dev, tq->q_no); }
>
> +static int
> +otx_ep_dev_stats_reset(struct rte_eth_dev *dev) {
> + struct otx_ep_device *otx_epvf = OTX_EP_DEV(dev);
> + uint32_t i;
> +
> + for (i = 0; i < otx_epvf->nb_tx_queues; i++)
> + memset(&otx_epvf->instr_queue[i]->stats, 0,
> + sizeof(struct otx_ep_iq_stats));
> +
> + for (i = 0; i < otx_epvf->nb_rx_queues; i++)
> + memset(&otx_epvf->droq[i]->stats, 0,
> + sizeof(struct otx_ep_droq_stats));
> +
> + return 0;
> +}
> +
> +static int
> +otx_ep_dev_stats_get(struct rte_eth_dev *eth_dev,
> + struct rte_eth_stats *stats)
> +{
> + struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
> + struct otx_ep_iq_stats *ostats;
> + struct otx_ep_droq_stats *istats;
> + uint32_t i;
> +
> + memset(stats, 0, sizeof(struct rte_eth_stats));
> +
> + for (i = 0; i < otx_epvf->nb_tx_queues; i++) {
> + ostats = &otx_epvf->instr_queue[i]->stats;
> + stats->q_opackets[i] = ostats->tx_pkts;
> + stats->q_obytes[i] = ostats->tx_bytes;
> + stats->opackets += ostats->tx_pkts;
> + stats->obytes += ostats->tx_bytes;
> + stats->oerrors += ostats->instr_dropped;
> + }
> + for (i = 0; i < otx_epvf->nb_rx_queues; i++) {
> + istats = &otx_epvf->droq[i]->stats;
> + stats->q_ipackets[i] = istats->pkts_received;
> + stats->q_ibytes[i] = istats->bytes_received;
> + stats->q_errors[i] = istats->rx_err;
> + stats->ipackets += istats->pkts_received;
> + stats->ibytes += istats->bytes_received;
> + stats->imissed += istats->rx_alloc_failure;
> + stats->ierrors += istats->rx_err;
> + stats->rx_nombuf += istats->rx_alloc_failure;
> + }
> + return 0;
> +}
> +
> /* Define our ethernet definitions */
> static const struct eth_dev_ops otx_ep_eth_dev_ops = {
> .dev_configure = otx_ep_dev_configure,
> @@ -347,6 +397,8 @@ static const struct eth_dev_ops otx_ep_eth_dev_ops
> = {
> .tx_queue_setup = otx_ep_tx_queue_setup,
> .tx_queue_release = otx_ep_tx_queue_release,
> .dev_infos_get = otx_ep_dev_info_get,
> + .stats_get = otx_ep_dev_stats_get,
> + .stats_reset = otx_ep_dev_stats_reset,
> };
>
Ack
> static int
> --
> 2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH v2 3/3] net/octeon_ep: support link status
2022-07-27 9:21 ` [PATCH v2 3/3] net/octeon_ep: support link status Sathesh Edara
@ 2022-08-16 5:34 ` Veerasenareddy Burru
0 siblings, 0 replies; 14+ messages in thread
From: Veerasenareddy Burru @ 2022-08-16 5:34 UTC (permalink / raw)
To: Sathesh B Edara, Satananda Burla, Jerin Jacob Kollanukkaran,
Sathesh B Edara, Radha Chintakuntla
Cc: dev
> -----Original Message-----
> From: Sathesh Edara <sedara@marvell.com>
> Sent: Wednesday, July 27, 2022 2:22 AM
> To: Satananda Burla <sburla@marvell.com>; Jerin Jacob Kollanukkaran
> <jerinj@marvell.com>; Sathesh B Edara <sedara@marvell.com>; Radha
> Chintakuntla <radhac@marvell.com>; Veerasenareddy Burru
> <vburru@marvell.com>
> Cc: dev@dpdk.org
> Subject: [PATCH v2 3/3] net/octeon_ep: support link status
>
> Added functionality to update link speed, duplex mode and link state.
>
> Signed-off-by: Sathesh Edara <sedara@marvell.com>
> ---
> doc/guides/nics/features/octeon_ep.ini | 1 +
> drivers/net/octeon_ep/otx_ep_ethdev.c | 17 +++++++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/doc/guides/nics/features/octeon_ep.ini
> b/doc/guides/nics/features/octeon_ep.ini
> index b304ff8877..305e219262 100644
> --- a/doc/guides/nics/features/octeon_ep.ini
> +++ b/doc/guides/nics/features/octeon_ep.ini
> @@ -9,4 +9,5 @@ SR-IOV = Y
> Linux = Y
> x86-64 = Y
> Basic stats = Y
> +Link status = Y
> Usage doc = Y
> diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c
> b/drivers/net/octeon_ep/otx_ep_ethdev.c
> index cb45bd7a8a..77def6daa1 100644
> --- a/drivers/net/octeon_ep/otx_ep_ethdev.c
> +++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
> @@ -387,6 +387,22 @@ otx_ep_dev_stats_get(struct rte_eth_dev
> *eth_dev,
> return 0;
> }
>
> +static int
> +otx_ep_dev_link_update(struct rte_eth_dev *eth_dev, int
> +wait_to_complete) {
> + RTE_SET_USED(wait_to_complete);
> +
> + if (!eth_dev->data->dev_started)
> + return 0;
> + struct rte_eth_link link;
> +
> + memset(&link, 0, sizeof(link));
> + link.link_status = RTE_ETH_LINK_UP;
> + link.link_speed = RTE_ETH_SPEED_NUM_10G;
> + link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
> + return rte_eth_linkstatus_set(eth_dev, &link); }
> +
> /* Define our ethernet definitions */
> static const struct eth_dev_ops otx_ep_eth_dev_ops = {
> .dev_configure = otx_ep_dev_configure,
> @@ -399,6 +415,7 @@ static const struct eth_dev_ops otx_ep_eth_dev_ops
> = {
> .dev_infos_get = otx_ep_dev_info_get,
> .stats_get = otx_ep_dev_stats_get,
> .stats_reset = otx_ep_dev_stats_reset,
> + .link_update = otx_ep_dev_link_update,
Ack
> };
>
> static int
> --
> 2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/3] net: rename octeon ep PMD
2022-08-16 5:32 ` Veerasenareddy Burru
@ 2022-08-19 12:18 ` Jerin Jacob
0 siblings, 0 replies; 14+ messages in thread
From: Jerin Jacob @ 2022-08-19 12:18 UTC (permalink / raw)
To: Veerasenareddy Burru
Cc: Sathesh B Edara, Satananda Burla, Jerin Jacob Kollanukkaran,
Thomas Monjalon, Radha Chintakuntla, Ray Kinsella, dev
On Tue, Aug 16, 2022 at 11:05 AM Veerasenareddy Burru
<vburru@marvell.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Sathesh Edara <sedara@marvell.com>
> > Sent: Wednesday, July 27, 2022 2:22 AM
> > To: Satananda Burla <sburla@marvell.com>; Jerin Jacob Kollanukkaran
> > <jerinj@marvell.com>; Sathesh B Edara <sedara@marvell.com>; Thomas
> > Monjalon <thomas@monjalon.net>; Radha Chintakuntla
> > <radhac@marvell.com>; Veerasenareddy Burru <vburru@marvell.com>; Ray
> > Kinsella <mdr@ashroe.eu>
> > Cc: dev@dpdk.org
> > Subject: [PATCH v2 1/3] net: rename octeon ep PMD
Suggestion:
net/octeontx_ep: rename as octeon_ep
Also missed to update doc/guides/rel_notes/deprecation.rst
[for-next-net][dpdk-next-net-mrvl] $ git grep octeontx_ep
doc/guides/rel_notes/deprecation.rst:* net/octeontx_ep: The driver
``octeontx_ep`` was to support OCTEON TX
> >
> > This patch renames octeon end point driver from octeontx_ep to octeon_ep
> > to enable single unified driver to support current OcteonTx and future
> > Octeon PCI endpoint NICs to reflect common driver for all Octeon based PCI
> > endpoint NICs.
> >
> > Signed-off-by: Sathesh Edara <sedara@marvell.com>
> > rename from drivers/net/octeontx_ep/version.map
> > rename to drivers/net/octeon_ep/version.map
> Ack
When Acking please use full syntax: Acked-by: ...
Rest looks good to me.
> > --
> > 2.36.1
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 0/3] net/octeon_ep: rename driver and add features
2022-07-27 9:21 ` [PATCH v2 1/3] net: rename octeon ep PMD Sathesh Edara
2022-08-16 5:32 ` Veerasenareddy Burru
@ 2022-08-22 9:10 ` Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 1/3] net/octeontx_ep: rename as octeon_ep Sathesh Edara
` (3 more replies)
1 sibling, 4 replies; 14+ messages in thread
From: Sathesh Edara @ 2022-08-22 9:10 UTC (permalink / raw)
To: sburla, jerinj, sedara; +Cc: dev
This patch set renames the net/octeontx_ep driver to net/octeon_ep
and 2nd and 3rd patches add support for basic stats and link status.
Changes in v3:
- Updated commit messaage.
- Updated deprecation.rst.
Changes in v2:
Added new features in the renamed driver.
Sathesh Edara (3):
net/octeontx_ep: rename as octeon_ep
net/octeon_ep: support basic stats
net/octeon_ep: support link status
MAINTAINERS | 6 +-
.../{octeontx_ep.ini => octeon_ep.ini} | 4 +-
doc/guides/nics/index.rst | 2 +-
.../nics/{octeontx_ep.rst => octeon_ep.rst} | 4 +-
doc/guides/rel_notes/deprecation.rst | 5 --
drivers/net/meson.build | 2 +-
.../{octeontx_ep => octeon_ep}/meson.build | 0
.../{octeontx_ep => octeon_ep}/otx2_ep_vf.c | 0
.../{octeontx_ep => octeon_ep}/otx2_ep_vf.h | 0
.../otx_ep_common.h | 0
.../otx_ep_ethdev.c | 69 +++++++++++++++++++
.../{octeontx_ep => octeon_ep}/otx_ep_rxtx.c | 0
.../{octeontx_ep => octeon_ep}/otx_ep_rxtx.h | 0
.../{octeontx_ep => octeon_ep}/otx_ep_vf.c | 0
.../{octeontx_ep => octeon_ep}/otx_ep_vf.h | 0
.../{octeontx_ep => octeon_ep}/version.map | 0
16 files changed, 79 insertions(+), 13 deletions(-)
rename doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} (64%)
rename doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} (87%)
rename drivers/net/{octeontx_ep => octeon_ep}/meson.build (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c (86%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/version.map (100%)
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 1/3] net/octeontx_ep: rename as octeon_ep
2022-08-22 9:10 ` [PATCH v3 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
@ 2022-08-22 9:10 ` Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 2/3] net/octeon_ep: support basic stats Sathesh Edara
` (2 subsequent siblings)
3 siblings, 0 replies; 14+ messages in thread
From: Sathesh Edara @ 2022-08-22 9:10 UTC (permalink / raw)
To: sburla, jerinj, sedara, Thomas Monjalon,
Radha Mohan Chintakuntla, Veerasenareddy Burru, Ray Kinsella
Cc: dev
This patch renames octeon end point driver from octeontx_ep to
octeon_ep to enable single unified driver to support current
OcteonTx and future Octeon PCI endpoint NICs to reflect common
driver for all Octeon based PCI endpoint NICs.
Signed-off-by: Sathesh Edara <sedara@marvell.com>
---
MAINTAINERS | 6 +++---
doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} | 2 +-
doc/guides/nics/index.rst | 2 +-
doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} | 4 ++--
doc/guides/rel_notes/deprecation.rst | 5 -----
drivers/net/meson.build | 2 +-
drivers/net/{octeontx_ep => octeon_ep}/meson.build | 0
drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c | 0
drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h | 0
drivers/net/{octeontx_ep => octeon_ep}/version.map | 0
16 files changed, 8 insertions(+), 13 deletions(-)
rename doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} (75%)
rename doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} (87%)
rename drivers/net/{octeontx_ep => octeon_ep}/meson.build (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h (100%)
rename drivers/net/{octeontx_ep => octeon_ep}/version.map (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 32ffdd1a61..d7c7fa4cdf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -812,9 +812,9 @@ M: Radha Mohan Chintakuntla <radhac@marvell.com>
M: Veerasenareddy Burru <vburru@marvell.com>
M: Sathesh Edara <sedara@marvell.com>
T: git://dpdk.org/next/dpdk-next-net-mrvl
-F: drivers/net/octeontx_ep/
-F: doc/guides/nics/features/octeontx_ep.ini
-F: doc/guides/nics/octeontx_ep.rst
+F: drivers/net/octeon_ep/
+F: doc/guides/nics/features/octeon_ep.ini
+F: doc/guides/nics/octeon_ep.rst
Mellanox mlx4
M: Matan Azrad <matan@nvidia.com>
diff --git a/doc/guides/nics/features/octeontx_ep.ini b/doc/guides/nics/features/octeon_ep.ini
similarity index 75%
rename from doc/guides/nics/features/octeontx_ep.ini
rename to doc/guides/nics/features/octeon_ep.ini
index d1453f5bee..141d918466 100644
--- a/doc/guides/nics/features/octeontx_ep.ini
+++ b/doc/guides/nics/features/octeon_ep.ini
@@ -1,5 +1,5 @@
;
-; Supported features of the 'octeontx_ep' network poll mode driver.
+; Supported features of the 'octeon_ep' network poll mode driver.
;
; Refer to default.ini for the full list of available PMD features.
;
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index f48e9f815c..f80906a97d 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -52,7 +52,7 @@ Network Interface Controller Drivers
ngbe
null
octeontx
- octeontx_ep
+ octeon_ep
pfe
qede
sfc_efx
diff --git a/doc/guides/nics/octeontx_ep.rst b/doc/guides/nics/octeon_ep.rst
similarity index 87%
rename from doc/guides/nics/octeontx_ep.rst
rename to doc/guides/nics/octeon_ep.rst
index 2ec8a034b5..b5040aeee2 100644
--- a/doc/guides/nics/octeontx_ep.rst
+++ b/doc/guides/nics/octeon_ep.rst
@@ -4,9 +4,9 @@
OCTEON TX EP Poll Mode driver
=============================
-The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeontx_ep**) provides poll mode
+The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeon_ep**) provides poll mode
ethdev driver support for the virtual functions (VF) of **Marvell OCTEON 9**
-and **Cavium OCTEON TX** families of adapters in SR-IOV context.
+and **Cavium OCTEON** families of adapters in SR-IOV context.
More information can be found at `Marvell Official Website
<https://www.marvell.com/content/dam/marvell/en/public-collateral/embedded-processors/marvell-liquidio-III-solutions-brief.pdf>`_.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index e7583cae4c..6558bd7003 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -220,11 +220,6 @@ Deprecation Notices
Names for the telemetry commands will be similarly limited.
The parameters for telemetry commands are unaffected by this change.
-* net/octeontx_ep: The driver ``octeontx_ep`` was to support OCTEON TX
- line of products.
- It will be renamed to ``octeon_ep`` in DPDK 22.11 to apply for
- all OCTEON EP products: OCTEON TX and future OCTEON chipsets.
-
* raw/dpaa2_cmdif: The ``dpaa2_cmdif`` rawdev driver will be deprecated
in DPDK 22.11, as it is no longer in use, no active user known.
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index e35652fe63..37919eaf8b 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -45,7 +45,7 @@ drivers = [
'ngbe',
'null',
'octeontx',
- 'octeontx_ep',
+ 'octeon_ep',
'pcap',
'pfe',
'qede',
diff --git a/drivers/net/octeontx_ep/meson.build b/drivers/net/octeon_ep/meson.build
similarity index 100%
rename from drivers/net/octeontx_ep/meson.build
rename to drivers/net/octeon_ep/meson.build
diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.c b/drivers/net/octeon_ep/otx2_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.c
rename to drivers/net/octeon_ep/otx2_ep_vf.c
diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.h b/drivers/net/octeon_ep/otx2_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.h
rename to drivers/net/octeon_ep/otx2_ep_vf.h
diff --git a/drivers/net/octeontx_ep/otx_ep_common.h b/drivers/net/octeon_ep/otx_ep_common.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_common.h
rename to drivers/net/octeon_ep/otx_ep_common.h
diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_ethdev.c
rename to drivers/net/octeon_ep/otx_ep_ethdev.c
diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.c b/drivers/net/octeon_ep/otx_ep_rxtx.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.c
rename to drivers/net/octeon_ep/otx_ep_rxtx.c
diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.h b/drivers/net/octeon_ep/otx_ep_rxtx.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.h
rename to drivers/net/octeon_ep/otx_ep_rxtx.h
diff --git a/drivers/net/octeontx_ep/otx_ep_vf.c b/drivers/net/octeon_ep/otx_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.c
rename to drivers/net/octeon_ep/otx_ep_vf.c
diff --git a/drivers/net/octeontx_ep/otx_ep_vf.h b/drivers/net/octeon_ep/otx_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.h
rename to drivers/net/octeon_ep/otx_ep_vf.h
diff --git a/drivers/net/octeontx_ep/version.map b/drivers/net/octeon_ep/version.map
similarity index 100%
rename from drivers/net/octeontx_ep/version.map
rename to drivers/net/octeon_ep/version.map
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 2/3] net/octeon_ep: support basic stats
2022-08-22 9:10 ` [PATCH v3 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 1/3] net/octeontx_ep: rename as octeon_ep Sathesh Edara
@ 2022-08-22 9:10 ` Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 3/3] net/octeon_ep: support link status Sathesh Edara
2022-08-23 5:50 ` [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add features Veerasenareddy Burru
3 siblings, 0 replies; 14+ messages in thread
From: Sathesh Edara @ 2022-08-22 9:10 UTC (permalink / raw)
To: sburla, jerinj, sedara, Radha Mohan Chintakuntla, Veerasenareddy Burru
Cc: dev
Added functionality to fetch and reset ethdev stats.
Signed-off-by: Sathesh Edara <sedara@marvell.com>
---
doc/guides/nics/features/octeon_ep.ini | 1 +
drivers/net/octeon_ep/otx_ep_ethdev.c | 52 ++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/doc/guides/nics/features/octeon_ep.ini b/doc/guides/nics/features/octeon_ep.ini
index 141d918466..b304ff8877 100644
--- a/doc/guides/nics/features/octeon_ep.ini
+++ b/doc/guides/nics/features/octeon_ep.ini
@@ -8,4 +8,5 @@ Speed capabilities = P
SR-IOV = Y
Linux = Y
x86-64 = Y
+Basic stats = Y
Usage doc = Y
diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
index 806add246b..cb45bd7a8a 100644
--- a/drivers/net/octeon_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
@@ -337,6 +337,56 @@ otx_ep_tx_queue_release(struct rte_eth_dev *dev, uint16_t q_no)
otx_ep_delete_iqs(tq->otx_ep_dev, tq->q_no);
}
+static int
+otx_ep_dev_stats_reset(struct rte_eth_dev *dev)
+{
+ struct otx_ep_device *otx_epvf = OTX_EP_DEV(dev);
+ uint32_t i;
+
+ for (i = 0; i < otx_epvf->nb_tx_queues; i++)
+ memset(&otx_epvf->instr_queue[i]->stats, 0,
+ sizeof(struct otx_ep_iq_stats));
+
+ for (i = 0; i < otx_epvf->nb_rx_queues; i++)
+ memset(&otx_epvf->droq[i]->stats, 0,
+ sizeof(struct otx_ep_droq_stats));
+
+ return 0;
+}
+
+static int
+otx_ep_dev_stats_get(struct rte_eth_dev *eth_dev,
+ struct rte_eth_stats *stats)
+{
+ struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev);
+ struct otx_ep_iq_stats *ostats;
+ struct otx_ep_droq_stats *istats;
+ uint32_t i;
+
+ memset(stats, 0, sizeof(struct rte_eth_stats));
+
+ for (i = 0; i < otx_epvf->nb_tx_queues; i++) {
+ ostats = &otx_epvf->instr_queue[i]->stats;
+ stats->q_opackets[i] = ostats->tx_pkts;
+ stats->q_obytes[i] = ostats->tx_bytes;
+ stats->opackets += ostats->tx_pkts;
+ stats->obytes += ostats->tx_bytes;
+ stats->oerrors += ostats->instr_dropped;
+ }
+ for (i = 0; i < otx_epvf->nb_rx_queues; i++) {
+ istats = &otx_epvf->droq[i]->stats;
+ stats->q_ipackets[i] = istats->pkts_received;
+ stats->q_ibytes[i] = istats->bytes_received;
+ stats->q_errors[i] = istats->rx_err;
+ stats->ipackets += istats->pkts_received;
+ stats->ibytes += istats->bytes_received;
+ stats->imissed += istats->rx_alloc_failure;
+ stats->ierrors += istats->rx_err;
+ stats->rx_nombuf += istats->rx_alloc_failure;
+ }
+ return 0;
+}
+
/* Define our ethernet definitions */
static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.dev_configure = otx_ep_dev_configure,
@@ -347,6 +397,8 @@ static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.tx_queue_setup = otx_ep_tx_queue_setup,
.tx_queue_release = otx_ep_tx_queue_release,
.dev_infos_get = otx_ep_dev_info_get,
+ .stats_get = otx_ep_dev_stats_get,
+ .stats_reset = otx_ep_dev_stats_reset,
};
static int
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 3/3] net/octeon_ep: support link status
2022-08-22 9:10 ` [PATCH v3 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 1/3] net/octeontx_ep: rename as octeon_ep Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 2/3] net/octeon_ep: support basic stats Sathesh Edara
@ 2022-08-22 9:10 ` Sathesh Edara
2022-08-23 5:50 ` [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add features Veerasenareddy Burru
3 siblings, 0 replies; 14+ messages in thread
From: Sathesh Edara @ 2022-08-22 9:10 UTC (permalink / raw)
To: sburla, jerinj, sedara, Radha Mohan Chintakuntla, Veerasenareddy Burru
Cc: dev
Added functionality to update link speed, duplex mode and link state.
Signed-off-by: Sathesh Edara <sedara@marvell.com>
---
doc/guides/nics/features/octeon_ep.ini | 1 +
drivers/net/octeon_ep/otx_ep_ethdev.c | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/doc/guides/nics/features/octeon_ep.ini b/doc/guides/nics/features/octeon_ep.ini
index b304ff8877..305e219262 100644
--- a/doc/guides/nics/features/octeon_ep.ini
+++ b/doc/guides/nics/features/octeon_ep.ini
@@ -9,4 +9,5 @@ SR-IOV = Y
Linux = Y
x86-64 = Y
Basic stats = Y
+Link status = Y
Usage doc = Y
diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c
index cb45bd7a8a..77def6daa1 100644
--- a/drivers/net/octeon_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c
@@ -387,6 +387,22 @@ otx_ep_dev_stats_get(struct rte_eth_dev *eth_dev,
return 0;
}
+static int
+otx_ep_dev_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)
+{
+ RTE_SET_USED(wait_to_complete);
+
+ if (!eth_dev->data->dev_started)
+ return 0;
+ struct rte_eth_link link;
+
+ memset(&link, 0, sizeof(link));
+ link.link_status = RTE_ETH_LINK_UP;
+ link.link_speed = RTE_ETH_SPEED_NUM_10G;
+ link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
+ return rte_eth_linkstatus_set(eth_dev, &link);
+}
+
/* Define our ethernet definitions */
static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.dev_configure = otx_ep_dev_configure,
@@ -399,6 +415,7 @@ static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.dev_infos_get = otx_ep_dev_info_get,
.stats_get = otx_ep_dev_stats_get,
.stats_reset = otx_ep_dev_stats_reset,
+ .link_update = otx_ep_dev_link_update,
};
static int
--
2.36.1
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add features
2022-08-22 9:10 ` [PATCH v3 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
` (2 preceding siblings ...)
2022-08-22 9:10 ` [PATCH v3 3/3] net/octeon_ep: support link status Sathesh Edara
@ 2022-08-23 5:50 ` Veerasenareddy Burru
2022-08-27 12:24 ` Jerin Jacob
3 siblings, 1 reply; 14+ messages in thread
From: Veerasenareddy Burru @ 2022-08-23 5:50 UTC (permalink / raw)
To: Sathesh B Edara, Satananda Burla, Jerin Jacob Kollanukkaran,
Sathesh B Edara
Cc: dev
[-- Attachment #1: Type: text/plain, Size: 2793 bytes --]
> -----Original Message-----
> From: Sathesh Edara <sedara@marvell.com>
> Sent: Monday, August 22, 2022 2:10 AM
> To: Satananda Burla <sburla@marvell.com>; Jerin Jacob Kollanukkaran
> <jerinj@marvell.com>; Sathesh B Edara <sedara@marvell.com>
> Cc: dev@dpdk.org
> Subject: [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add
> features
>
> External Email
>
> ----------------------------------------------------------------------
> This patch set renames the net/octeontx_ep driver to net/octeon_ep and
> 2nd and 3rd patches add support for basic stats and link status.
>
> Changes in v3:
> - Updated commit messaage.
> - Updated deprecation.rst.
>
> Changes in v2:
> Added new features in the renamed driver.
>
> Sathesh Edara (3):
> net/octeontx_ep: rename as octeon_ep
> net/octeon_ep: support basic stats
> net/octeon_ep: support link status
>
> MAINTAINERS | 6 +-
> .../{octeontx_ep.ini => octeon_ep.ini} | 4 +-
> doc/guides/nics/index.rst | 2 +-
> .../nics/{octeontx_ep.rst => octeon_ep.rst} | 4 +-
> doc/guides/rel_notes/deprecation.rst | 5 --
> drivers/net/meson.build | 2 +-
> .../{octeontx_ep => octeon_ep}/meson.build | 0
> .../{octeontx_ep => octeon_ep}/otx2_ep_vf.c | 0
> .../{octeontx_ep => octeon_ep}/otx2_ep_vf.h | 0
> .../otx_ep_common.h | 0
> .../otx_ep_ethdev.c | 69 +++++++++++++++++++
> .../{octeontx_ep => octeon_ep}/otx_ep_rxtx.c | 0 .../{octeontx_ep =>
> octeon_ep}/otx_ep_rxtx.h | 0
> .../{octeontx_ep => octeon_ep}/otx_ep_vf.c | 0
> .../{octeontx_ep => octeon_ep}/otx_ep_vf.h | 0
> .../{octeontx_ep => octeon_ep}/version.map | 0
> 16 files changed, 79 insertions(+), 13 deletions(-) rename
> doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} (64%) rename
> doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} (87%) rename
> drivers/net/{octeontx_ep => octeon_ep}/meson.build (100%) rename
> drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.c (100%) rename
> drivers/net/{octeontx_ep => octeon_ep}/otx2_ep_vf.h (100%) rename
> drivers/net/{octeontx_ep => octeon_ep}/otx_ep_common.h (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_ethdev.c (86%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.c (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_rxtx.h (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.c (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/otx_ep_vf.h (100%)
> rename drivers/net/{octeontx_ep => octeon_ep}/version.map (100%)
>
> --
> 2.36.1
Series-acked-by: Veerasenareddy Burru <vburru@marvell.com>
[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 14683 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add features
2022-08-23 5:50 ` [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add features Veerasenareddy Burru
@ 2022-08-27 12:24 ` Jerin Jacob
0 siblings, 0 replies; 14+ messages in thread
From: Jerin Jacob @ 2022-08-27 12:24 UTC (permalink / raw)
To: Veerasenareddy Burru
Cc: Sathesh B Edara, Satananda Burla, Jerin Jacob Kollanukkaran, dev
On Tue, Aug 23, 2022 at 11:20 AM Veerasenareddy Burru
<vburru@marvell.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Sathesh Edara <sedara@marvell.com>
> > Sent: Monday, August 22, 2022 2:10 AM
> > To: Satananda Burla <sburla@marvell.com>; Jerin Jacob Kollanukkaran
> > <jerinj@marvell.com>; Sathesh B Edara <sedara@marvell.com>
> > Cc: dev@dpdk.org
> > Subject: [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add
> > features
> >
> > 2.36.1
> Series-acked-by: Veerasenareddy Burru <vburru@marvell.com>
Series applied to dpdk-next-net-mrvl/for-next-net. Thanks
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2022-08-27 12:24 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-27 9:21 [PATCH v2 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
2022-07-27 9:21 ` [PATCH v2 1/3] net: rename octeon ep PMD Sathesh Edara
2022-08-16 5:32 ` Veerasenareddy Burru
2022-08-19 12:18 ` Jerin Jacob
2022-08-22 9:10 ` [PATCH v3 0/3] net/octeon_ep: rename driver and add features Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 1/3] net/octeontx_ep: rename as octeon_ep Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 2/3] net/octeon_ep: support basic stats Sathesh Edara
2022-08-22 9:10 ` [PATCH v3 3/3] net/octeon_ep: support link status Sathesh Edara
2022-08-23 5:50 ` [EXT] [PATCH v3 0/3] net/octeon_ep: rename driver and add features Veerasenareddy Burru
2022-08-27 12:24 ` Jerin Jacob
2022-07-27 9:21 ` [PATCH v2 2/3] net/octeon_ep: support basic stats Sathesh Edara
2022-08-16 5:34 ` Veerasenareddy Burru
2022-07-27 9:21 ` [PATCH v2 3/3] net/octeon_ep: support link status Sathesh Edara
2022-08-16 5:34 ` Veerasenareddy Burru
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).