add Dev layer related definetions
Signed-off-by: Kyo Liu <kyo....@nebula-matrix.com>
---
drivers/net/nbl/meson.build | 2 +
drivers/net/nbl/nbl_core.c | 14 +-
drivers/net/nbl/nbl_core.h | 16 ++
drivers/net/nbl/nbl_dev/nbl_dev.c | 200 ++++++++++++++++++++++
drivers/net/nbl/nbl_dev/nbl_dev.h | 24 +++
drivers/net/nbl/nbl_include/nbl_def_dev.h | 107 ++++++++++++
6 files changed, 360 insertions(+), 3 deletions(-)
create mode 100644 drivers/net/nbl/nbl_dev/nbl_dev.c
create mode 100644 drivers/net/nbl/nbl_dev/nbl_dev.h
create mode 100644 drivers/net/nbl/nbl_include/nbl_def_dev.h
diff --git a/drivers/net/nbl/meson.build b/drivers/net/nbl/meson.build
index 23601727ef..7f4abd3db0 100644
--- a/drivers/net/nbl/meson.build
+++ b/drivers/net/nbl/meson.build
@@ -8,6 +8,7 @@ endif
includes += include_directories('nbl_include')
includes += include_directories('nbl_hw')
+includes += include_directories('nbl_common')
sources = files(
'nbl_ethdev.c',
@@ -15,6 +16,7 @@ sources = files(
'nbl_dispatch.c',
'nbl_common/nbl_common.c',
'nbl_common/nbl_thread.c',
+ 'nbl_dev/nbl_dev.c',
'nbl_hw/nbl_channel.c',
'nbl_hw/nbl_resource.c',
'nbl_hw/nbl_txrx.c',
diff --git a/drivers/net/nbl/nbl_core.c b/drivers/net/nbl/nbl_core.c
index 548eb3a2fd..1a6a6bc11d 100644
--- a/drivers/net/nbl/nbl_core.c
+++ b/drivers/net/nbl/nbl_core.c
@@ -54,8 +54,14 @@ int nbl_core_init(struct nbl_adapter *adapter, struct
rte_eth_dev *eth_dev)
if (ret)
goto disp_init_fail;
+ ret = nbl_dev_init(adapter, eth_dev);
+ if (ret)
+ goto dev_init_fail;
+
return 0;
+dev_init_fail:
+ nbl_disp_remove(adapter);
disp_init_fail:
product_base_ops->res_remove(adapter);
res_init_fail:
@@ -72,6 +78,7 @@ void nbl_core_remove(struct nbl_adapter *adapter)
product_base_ops = nbl_core_get_product_ops(adapter->caps.product_type);
+ nbl_dev_remove(adapter);
nbl_disp_remove(adapter);
product_base_ops->res_remove(adapter);
product_base_ops->chan_remove(adapter);
@@ -80,12 +87,13 @@ void nbl_core_remove(struct nbl_adapter *adapter)
int nbl_core_start(struct nbl_adapter *adapter)
{
- RTE_SET_USED(adapter);
+ int ret = 0;
- return 0;
+ ret = nbl_dev_start(adapter);
+ return ret;
}
void nbl_core_stop(struct nbl_adapter *adapter)
{
- RTE_SET_USED(adapter);
+ nbl_dev_stop(adapter);
}
diff --git a/drivers/net/nbl/nbl_core.h b/drivers/net/nbl/nbl_core.h
index 2730539050..9a05bbee48 100644
--- a/drivers/net/nbl/nbl_core.h
+++ b/drivers/net/nbl/nbl_core.h
@@ -11,6 +11,7 @@
#include "nbl_def_channel.h"
#include "nbl_def_resource.h"
#include "nbl_def_dispatch.h"
+#include "nbl_def_dev.h"
#define NBL_VENDOR_ID (0x1F0F)
#define NBL_DEVICE_ID_M18110 (0x3403)
@@ -37,11 +38,13 @@
#define NBL_ADAPTER_TO_CHAN_MGT(adapter) ((adapter)->core.chan_mgt)
#define NBL_ADAPTER_TO_RES_MGT(adapter)
((adapter)->core.res_mgt)
#define NBL_ADAPTER_TO_DISP_MGT(adapter) ((adapter)->core.disp_mgt)
+#define NBL_ADAPTER_TO_DEV_MGT(adapter)
((adapter)->core.dev_mgt)
#define NBL_ADAPTER_TO_PHY_OPS_TBL(adapter) ((adapter)->intf.phy_ops_tbl)
#define NBL_ADAPTER_TO_CHAN_OPS_TBL(adapter)
((adapter)->intf.channel_ops_tbl)
#define NBL_ADAPTER_TO_RES_OPS_TBL(adapter)
((adapter)->intf.resource_ops_tbl)
#define NBL_ADAPTER_TO_DISP_OPS_TBL(adapter)
((adapter)->intf.dispatch_ops_tbl)
+#define NBL_ADAPTER_TO_DEV_OPS_TBL(adapter) ((adapter)->intf.dev_ops_tbl)
struct nbl_core {
void *phy_mgt;
@@ -51,11 +54,23 @@ struct nbl_core {
void *dev_mgt;
};
+enum nbl_ethdev_state {
+ NBL_ETHDEV_UNINITIALIZED = 0,
+ NBL_ETHDEV_INITIALIZED,
+ NBL_ETHDEV_CONFIGURING,
+ NBL_ETHDEV_CONFIGURED,
+ NBL_ETHDEV_CLOSING,
+ NBL_ETHDEV_STARTING,
+ NBL_ETHDEV_STARTED,
+ NBL_ETHDEV_STOPPING,
+};
+
struct nbl_interface {
struct nbl_phy_ops_tbl *phy_ops_tbl;
struct nbl_channel_ops_tbl *channel_ops_tbl;
struct nbl_resource_ops_tbl *resource_ops_tbl;
struct nbl_dispatch_ops_tbl *dispatch_ops_tbl;
+ struct nbl_dev_ops_tbl *dev_ops_tbl;
};
struct nbl_adapter {
@@ -64,6 +79,7 @@ struct nbl_adapter {
struct nbl_core core;
struct nbl_interface intf;
struct nbl_func_caps caps;
+ enum nbl_ethdev_state state;
};
int nbl_core_init(struct nbl_adapter *adapter, struct rte_eth_dev *eth_dev);
diff --git a/drivers/net/nbl/nbl_dev/nbl_dev.c
b/drivers/net/nbl/nbl_dev/nbl_dev.c
new file mode 100644
index 0000000000..86006d6762
--- /dev/null
+++ b/drivers/net/nbl/nbl_dev/nbl_dev.c
@@ -0,0 +1,200 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2025 Nebulamatrix Technology Co., Ltd.
+ */
+
+#include "nbl_dev.h"
+
+static int nbl_dev_configure(struct rte_eth_dev *eth_dev)
+{
+ RTE_SET_USED(eth_dev);
+ return 0;
+}
+
+static int nbl_dev_port_start(struct rte_eth_dev *eth_dev)
+{
+ RTE_SET_USED(eth_dev);
+ return 0;
+}
+
+static int nbl_dev_port_stop(struct rte_eth_dev *eth_dev)
+{
+ RTE_SET_USED(eth_dev);
+ return 0;
+}
+
+static int nbl_dev_close(struct rte_eth_dev *eth_dev)
+{
+ RTE_SET_USED(eth_dev);
+ return 0;
+}
+
+struct nbl_dev_ops dev_ops = {
+ .dev_configure = nbl_dev_configure,
+ .dev_start = nbl_dev_port_start,
+ .dev_stop = nbl_dev_port_stop,
+ .dev_close = nbl_dev_close,
+};
+
+static int nbl_dev_setup_chan_queue(struct nbl_adapter *adapter)
+{
+ struct nbl_dev_mgt *dev_mgt = NBL_ADAPTER_TO_DEV_MGT(adapter);
+ struct nbl_channel_ops *chan_ops = NBL_DEV_MGT_TO_CHAN_OPS(dev_mgt);
+ int ret = 0;
+
+ ret = chan_ops->setup_queue(NBL_DEV_MGT_TO_CHAN_PRIV(dev_mgt));
+
+ return ret;
+}
+
+static int nbl_dev_teardown_chan_queue(struct nbl_adapter *adapter)
+{
+ struct nbl_dev_mgt *dev_mgt = NBL_ADAPTER_TO_DEV_MGT(adapter);
+ struct nbl_channel_ops *chan_ops = NBL_DEV_MGT_TO_CHAN_OPS(dev_mgt);
+ int ret = 0;
+
+ ret = chan_ops->teardown_queue(NBL_DEV_MGT_TO_CHAN_PRIV(dev_mgt));
+
+ return ret;
+}
+
+static int nbl_dev_leonis_init(void *adapter)
+{
+ return nbl_dev_setup_chan_queue((struct nbl_adapter *)adapter);
+}
+
+static void nbl_dev_leonis_uninit(void *adapter)
+{
+ nbl_dev_teardown_chan_queue((struct nbl_adapter *)adapter);
+}
+
+static int nbl_dev_leonis_start(void *p)
+{
+ RTE_SET_USED(p);
+ return 0;
+}
+
+static void nbl_dev_leonis_stop(void *p)
+{
+ RTE_SET_USED(p);
+}
+
+static void nbl_dev_remove_ops(struct nbl_dev_ops_tbl **dev_ops_tbl)
+{
+ rte_free(*dev_ops_tbl);
+ *dev_ops_tbl = NULL;
+}
+
+static int nbl_dev_setup_ops(struct nbl_dev_ops_tbl **dev_ops_tbl,
+ struct nbl_adapter *adapter)
+{
+ *dev_ops_tbl = rte_zmalloc("nbl_dev_ops", sizeof(struct
nbl_dev_ops_tbl), 0);
+ if (!*dev_ops_tbl)
+ return -ENOMEM;
+
+ NBL_DEV_OPS_TBL_TO_OPS(*dev_ops_tbl) = &dev_ops;
+ NBL_DEV_OPS_TBL_TO_PRIV(*dev_ops_tbl) = adapter;
+
+ return 0;
+}
+
+int nbl_dev_init(void *p, __rte_unused struct rte_eth_dev *eth_dev)
+{
+ struct nbl_adapter *adapter = (struct nbl_adapter *)p;
+ struct nbl_dev_mgt **dev_mgt;
+ struct nbl_dev_ops_tbl **dev_ops_tbl;
+ struct nbl_channel_ops_tbl *chan_ops_tbl;
+ struct nbl_dispatch_ops_tbl *dispatch_ops_tbl;
+ struct nbl_product_dev_ops *product_dev_ops = NULL;
+ int ret = 0;
+
+ dev_mgt = (struct nbl_dev_mgt **)&NBL_ADAPTER_TO_DEV_MGT(adapter);
+ dev_ops_tbl = &NBL_ADAPTER_TO_DEV_OPS_TBL(adapter);
+ chan_ops_tbl = NBL_ADAPTER_TO_CHAN_OPS_TBL(adapter);
+ dispatch_ops_tbl = NBL_ADAPTER_TO_DISP_OPS_TBL(adapter);
+ product_dev_ops = nbl_dev_get_product_ops(adapter->caps.product_type);
+
+ *dev_mgt = rte_zmalloc("nbl_dev_mgt", sizeof(struct nbl_dev_mgt), 0);
+ if (*dev_mgt == NULL) {
+ NBL_LOG(ERR, "Failed to allocate nbl_dev_mgt memory");
+ return -ENOMEM;
+ }
+
+ NBL_DEV_MGT_TO_CHAN_OPS_TBL(*dev_mgt) = chan_ops_tbl;
+ NBL_DEV_MGT_TO_DISP_OPS_TBL(*dev_mgt) = dispatch_ops_tbl;
+
+ if (product_dev_ops->dev_init)
+ ret = product_dev_ops->dev_init(adapter);
+
+ if (ret)
+ goto init_dev_failed;
+
+ ret = nbl_dev_setup_ops(dev_ops_tbl, adapter);
+ if (ret)
+ goto set_ops_failed;
+
+ adapter->state = NBL_ETHDEV_INITIALIZED;
+
+ return 0;
+
+set_ops_failed:
+ if (product_dev_ops->dev_uninit)
+ product_dev_ops->dev_uninit(adapter);
+init_dev_failed:
+ rte_free(*dev_mgt);
+ *dev_mgt = NULL;
+ return ret;
+}
+
+void nbl_dev_remove(void *p)
+{
+ struct nbl_adapter *adapter = (struct nbl_adapter *)p;
+ struct nbl_dev_mgt **dev_mgt;
+ struct nbl_dev_ops_tbl **dev_ops_tbl;
+ struct nbl_product_dev_ops *product_dev_ops = NULL;
+
+ dev_mgt = (struct nbl_dev_mgt **)&NBL_ADAPTER_TO_DEV_MGT(adapter);
+ dev_ops_tbl = &NBL_ADAPTER_TO_DEV_OPS_TBL(adapter);
+ product_dev_ops = nbl_dev_get_product_ops(adapter->caps.product_type);
+
+ nbl_dev_remove_ops(dev_ops_tbl);
+ if (product_dev_ops->dev_uninit)
+ product_dev_ops->dev_uninit(adapter);
+
+ rte_free(*dev_mgt);
+ *dev_mgt = NULL;
+}
+
+void nbl_dev_stop(void *p)
+{
+ struct nbl_adapter *adapter = (struct nbl_adapter *)p;
+ struct nbl_product_dev_ops *product_dev_ops = NULL;
+
+ product_dev_ops = nbl_dev_get_product_ops(adapter->caps.product_type);
+ if (product_dev_ops->dev_stop)
+ return product_dev_ops->dev_stop(p);
+}
+
+int nbl_dev_start(void *p)
+{
+ struct nbl_adapter *adapter = (struct nbl_adapter *)p;
+ struct nbl_product_dev_ops *product_dev_ops = NULL;
+
+ product_dev_ops = nbl_dev_get_product_ops(adapter->caps.product_type);
+ if (product_dev_ops->dev_start)
+ return product_dev_ops->dev_start(p);
+ return 0;
+}
+
+static struct nbl_product_dev_ops nbl_product_dev_ops[NBL_PRODUCT_MAX] = {
+ {
+ .dev_init = nbl_dev_leonis_init,
+ .dev_uninit = nbl_dev_leonis_uninit,
+ .dev_start = nbl_dev_leonis_start,
+ .dev_stop = nbl_dev_leonis_stop,
+ },
+};
+
+struct nbl_product_dev_ops *nbl_dev_get_product_ops(enum nbl_product_type
product_type)
+{
+ return &nbl_product_dev_ops[product_type];
+}
diff --git a/drivers/net/nbl/nbl_dev/nbl_dev.h
b/drivers/net/nbl/nbl_dev/nbl_dev.h
new file mode 100644
index 0000000000..ccc9c02531
--- /dev/null
+++ b/drivers/net/nbl/nbl_dev/nbl_dev.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2025 Nebulamatrix Technology Co., Ltd.
+ */
+
+#ifndef _NBL_DEV_H_
+#define _NBL_DEV_H_
+
+#include "nbl_common.h"
+
+#define NBL_DEV_MGT_TO_DISP_OPS_TBL(dev_mgt) ((dev_mgt)->disp_ops_tbl)
+#define NBL_DEV_MGT_TO_DISP_OPS(dev_mgt)
(NBL_DEV_MGT_TO_DISP_OPS_TBL(dev_mgt)->ops)
+#define NBL_DEV_MGT_TO_DISP_PRIV(dev_mgt)
(NBL_DEV_MGT_TO_DISP_OPS_TBL(dev_mgt)->priv)
+#define NBL_DEV_MGT_TO_CHAN_OPS_TBL(dev_mgt) ((dev_mgt)->chan_ops_tbl)
+#define NBL_DEV_MGT_TO_CHAN_OPS(dev_mgt)
(NBL_DEV_MGT_TO_CHAN_OPS_TBL(dev_mgt)->ops)
+#define NBL_DEV_MGT_TO_CHAN_PRIV(dev_mgt)
(NBL_DEV_MGT_TO_CHAN_OPS_TBL(dev_mgt)->priv)
+
+struct nbl_dev_mgt {
+ struct nbl_dispatch_ops_tbl *disp_ops_tbl;
+ struct nbl_channel_ops_tbl *chan_ops_tbl;
+};
+
+struct nbl_product_dev_ops *nbl_dev_get_product_ops(enum nbl_product_type
product_type);
+
+#endif
diff --git a/drivers/net/nbl/nbl_include/nbl_def_dev.h
b/drivers/net/nbl/nbl_include/nbl_def_dev.h
new file mode 100644
index 0000000000..b6e38bc2d3
--- /dev/null
+++ b/drivers/net/nbl/nbl_include/nbl_def_dev.h
@@ -0,0 +1,107 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2025 Nebulamatrix Technology Co., Ltd.
+ */
+
+#ifndef _NBL_DEF_DEV_H_
+#define _NBL_DEF_DEV_H_
+
+#include "nbl_include.h"
+
+#define NBL_DEV_OPS_TBL_TO_OPS(dev_ops_tbl) ((dev_ops_tbl)->ops)
+#define NBL_DEV_OPS_TBL_TO_PRIV(dev_ops_tbl) ((dev_ops_tbl)->priv)
+
+struct nbl_dev_ops {
+ eth_dev_configure_t dev_configure; /**< Configure device */
+ eth_dev_start_t dev_start; /**< Start device */
+ eth_dev_stop_t dev_stop; /**< Stop device */
+ eth_dev_set_link_up_t dev_set_link_up; /**< Device link up */
+ eth_dev_set_link_down_t dev_set_link_down; /**< Device link down */
+ eth_dev_close_t dev_close; /**< Close device */
+ eth_dev_reset_t dev_reset; /**< Reset device */
+ eth_link_update_t link_update; /**< Get device link state */
+ eth_speed_lanes_get_t speed_lanes_get; /**< Get link speed
active lanes */
+ eth_speed_lanes_set_t speed_lanes_set; /**< Set link speeds
supported lanes */
+ /** Get link speed lanes capability */
+ eth_speed_lanes_get_capability_t speed_lanes_get_capa;
+ /** Check if the device was physically removed */
+ eth_is_removed_t is_removed;
+
+ eth_promiscuous_enable_t promiscuous_enable; /**< Promiscuous ON */
+ eth_promiscuous_disable_t promiscuous_disable;/**< Promiscuous OFF */
+ eth_allmulticast_enable_t allmulticast_enable;/**< Rx multicast ON */
+ eth_allmulticast_disable_t allmulticast_disable;/**< Rx multicast OFF */
+ eth_mac_addr_remove_t mac_addr_remove; /**< Remove MAC address */
+ eth_mac_addr_add_t mac_addr_add; /**< Add a MAC address */
+ eth_mac_addr_set_t mac_addr_set; /**< Set a MAC address */
+ /** Set list of multicast addresses */
+ eth_set_mc_addr_list_t set_mc_addr_list;
+ mtu_set_t mtu_set; /**< Set MTU */
+
+ /** Get generic device statistics */
+ eth_stats_get_t stats_get;
+ /** Reset generic device statistics */
+ eth_stats_reset_t stats_reset;
+ /** Get extended device statistics */
+ eth_xstats_get_t xstats_get;
+ /** Reset extended device statistics */
+ eth_xstats_reset_t xstats_reset;
+ /** Get names of extended statistics */
+ eth_xstats_get_names_t xstats_get_names;
+ /** Configure per queue stat counter mapping */
+ eth_queue_stats_mapping_set_t queue_stats_mapping_set;
+
+ eth_get_module_info_t get_module_info;
+ eth_get_module_eeprom_t get_module_eeprom;
+ reta_update_t reta_update; /** Update redirection table.
*/
+ reta_query_t reta_query; /** Query redirection table.
*/
+ rss_hash_conf_get_t rss_hash_conf_get; /** Get current RSS hash
configuration. */
+
+ eth_fec_get_capability_t fec_get_capability;
+ /**< Get Forward Error Correction(FEC) capability. */
+ eth_fec_get_t fec_get;
+ /**< Get Forward Error Correction(FEC) mode. */
+ eth_fec_set_t fec_set;
+ /**< Set Forward Error Correction(FEC) mode. */
+
+ eth_dev_infos_get_t dev_infos_get; /**< Get device info. */
+ eth_rxq_info_get_t rxq_info_get; /**< retrieve RX queue
information. */
+ eth_txq_info_get_t txq_info_get; /**< retrieve TX queue
information. */
+ eth_burst_mode_get_t rx_burst_mode_get; /**< Get RX burst mode */
+ eth_burst_mode_get_t tx_burst_mode_get; /**< Get TX burst mode */
+ eth_fw_version_get_t fw_version_get; /**< Get firmware version. */
+ eth_dev_supported_ptypes_get_t dev_supported_ptypes_get;
+ /**< Get packet types supported and identified by device. */
+ eth_dev_ptypes_set_t dev_ptypes_set;
+ /**< Inform Ethernet device about reduced range of packet types to
handle. */
+
+ vlan_filter_set_t vlan_filter_set; /**< Filter VLAN Setup. */
+ vlan_tpid_set_t vlan_tpid_set; /**< Outer/Inner VLAN TPID
Setup. */
+ vlan_strip_queue_set_t vlan_strip_queue_set; /**< VLAN Stripping on
queue. */
+ vlan_offload_set_t vlan_offload_set; /**< Set VLAN Offload. */
+ vlan_pvid_set_t vlan_pvid_set; /**< Set port based TX VLAN
insertion. */
+
+ eth_queue_start_t rx_queue_start;/**< Start RX for a queue. */
+ eth_queue_stop_t rx_queue_stop; /**< Stop RX for a queue. */
+ eth_queue_start_t tx_queue_start;/**< Start TX for a queue. */
+ eth_queue_stop_t tx_queue_stop; /**< Stop TX for a queue. */
+ eth_rx_queue_setup_t rx_queue_setup;/**< Set up device RX queue.
*/
+ eth_queue_release_t rx_queue_release; /**< Release RX queue. */
+
+ eth_tx_queue_setup_t tx_queue_setup;/**< Set up device TX queue.
*/
+ eth_queue_release_t tx_queue_release; /**< Release TX queue. */
+ eth_get_eeprom_length_t get_eeprom_length; /**< Get eeprom length. */
+ eth_get_eeprom_t get_eeprom; /**< Get eeprom data. */
+ eth_set_eeprom_t set_eeprom; /**< Set eeprom. */
+};
+
+struct nbl_dev_ops_tbl {
+ struct nbl_dev_ops *ops;
+ void *priv;
+};
+
+int nbl_dev_init(void *p, struct rte_eth_dev *eth_dev);
+void nbl_dev_remove(void *p);
+int nbl_dev_start(void *p);
+void nbl_dev_stop(void *p);
+
+#endif
--
2.43.0
