drivers: rename octeon ep PMD
Checks
Commit Message
This patch renames octeon end point driver from
octeontx_ep to octeon_ep
Signed-off-by: Sathesh B Edara <sedara@marvell.com>
---
MAINTAINERS | 6 +-
.../{octeontx_ep.ini => octeon_ep.ini} | 2 +-
doc/guides/nics/index.rst | 2 +-
.../nics/{octeontx_ep.rst => octeon_ep.rst} | 2 +-
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 | 67 +++++++++++++++++++
.../{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, 74 insertions(+), 7 deletions(-)
rename doc/guides/nics/features/{octeontx_ep.ini => octeon_ep.ini} (75%)
rename doc/guides/nics/{octeontx_ep.rst => octeon_ep.rst} (93%)
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%)
Comments
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Tuesday, June 7, 2022 8:06 AM
> To: Sathesh B Edara <sedara@marvell.com>
> Cc: Ray Kinsella <mdr@ashroe.eu>; Satananda Burla <sburla@marvell.com>;
> Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Pradeep Kumar Nalla
> <pnalla@marvell.com>; Radha Chintakuntla <radhac@marvell.com>;
> Veerasenareddy Burru <vburru@marvell.com>; dev@dpdk.org
> Subject: [EXT] Re: [PATCH] drivers: rename octeon ep PMD
>
> External Email
>
> ----------------------------------------------------------------------
> 07/06/2022 16:38, Ray Kinsella:
> > Sathesh B Edara <sedara@marvell.com> writes:
> >
> > > This patch renames octeon end point driver from octeontx_ep to
> > > octeon_ep
> > >
> > > Signed-off-by: Sathesh B Edara <sedara@marvell.com>
> >
> > Straight forward rename,
> >
> > Acked-by: Ray Kinsella <mdr@ashroe.eu>
>
> The name change was not announced.
> Why is it required?
Thomas,
we acknowledge, missed to announce before submitting the change.
Current driver name "octeontx_ep" was to support OcteonTX line of products. We are renaming it to apply for all Octeon EP products (OcteonTX + future Octeon chipsets).
>
>
> -----Original Message-----
> From: Thomas Monjalon <thomas@monjalon.net>
> Sent: Tuesday, June 7, 2022 9:56 AM
> To: Sathesh B Edara <sedara@marvell.com>; Veerasenareddy Burru
> <vburru@marvell.com>
> Cc: Ray Kinsella <mdr@ashroe.eu>; Satananda Burla <sburla@marvell.com>;
> Jerin Jacob Kollanukkaran <jerinj@marvell.com>; Pradeep Kumar Nalla
> <pnalla@marvell.com>; Radha Chintakuntla <radhac@marvell.com>;
> dev@dpdk.org; david.marchand@redhat.com
> Subject: Re: [EXT] Re: [PATCH] drivers: rename octeon ep PMD
>
> 07/06/2022 18:18, Veerasenareddy Burru:
> > From: Thomas Monjalon <thomas@monjalon.net>
> > > 07/06/2022 16:38, Ray Kinsella:
> > > > Sathesh B Edara <sedara@marvell.com> writes:
> > > >
> > > > > This patch renames octeon end point driver from octeontx_ep to
> > > > > octeon_ep
> > > > >
> > > > > Signed-off-by: Sathesh B Edara <sedara@marvell.com>
> > > >
> > > > Straight forward rename,
> > > >
> > > > Acked-by: Ray Kinsella <mdr@ashroe.eu>
> > >
> > > The name change was not announced.
> > > Why is it required?
> > Thomas,
> > we acknowledge, missed to announce before submitting the change.
> > Current driver name "octeontx_ep" was to support OcteonTX line of
> products. We are renaming it to apply for all Octeon EP products (OcteonTX +
> future Octeon chipsets).
>
> Do you want to announce it first and do the change in 22.11?
Sure. We will do that. Will resubmit the patch after announcement.
> It would allow users to be prepared for the change.
>
@@ -798,9 +798,9 @@ M: Nalla Pradeep <pnalla@marvell.com>
M: Radha Mohan Chintakuntla <radhac@marvell.com>
M: Veerasenareddy Burru <vburru@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>
similarity index 75%
rename from doc/guides/nics/features/octeontx_ep.ini
rename to 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.
;
@@ -52,7 +52,7 @@ Network Interface Controller Drivers
ngbe
null
octeontx
- octeontx_ep
+ octeon_ep
pfe
qede
sfc_efx
similarity index 93%
rename from doc/guides/nics/octeontx_ep.rst
rename to doc/guides/nics/octeon_ep.rst
@@ -4,7 +4,7 @@
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.
@@ -45,7 +45,7 @@ drivers = [
'ngbe',
'null',
'octeontx',
- 'octeontx_ep',
+ 'octeon_ep',
'pcap',
'pfe',
'qede',
similarity index 100%
rename from drivers/net/octeontx_ep/meson.build
rename to drivers/net/octeon_ep/meson.build
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.c
rename to drivers/net/octeon_ep/otx2_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx2_ep_vf.h
rename to drivers/net/octeon_ep/otx2_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_common.h
rename to drivers/net/octeon_ep/otx_ep_common.h
similarity index 86%
rename from drivers/net/octeontx_ep/otx_ep_ethdev.c
rename to drivers/net/octeon_ep/otx_ep_ethdev.c
@@ -337,6 +337,70 @@ 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_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);
+}
+
+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;
+}
+
+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;
+}
+
/* Define our ethernet definitions */
static const struct eth_dev_ops otx_ep_eth_dev_ops = {
.dev_configure = otx_ep_dev_configure,
@@ -347,6 +411,9 @@ 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,
+ .link_update = otx_ep_link_update,
+ .stats_get = otx_ep_dev_stats_get,
+ .stats_reset = otx_ep_dev_stats_reset,
};
static int
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.c
rename to drivers/net/octeon_ep/otx_ep_rxtx.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_rxtx.h
rename to drivers/net/octeon_ep/otx_ep_rxtx.h
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.c
rename to drivers/net/octeon_ep/otx_ep_vf.c
similarity index 100%
rename from drivers/net/octeontx_ep/otx_ep_vf.h
rename to drivers/net/octeon_ep/otx_ep_vf.h
similarity index 100%
rename from drivers/net/octeontx_ep/version.map
rename to drivers/net/octeon_ep/version.map