net/dpaa2: support separate MC portal per process

[dpdk.git] / drivers / net / dpaa2 / dpaa2_ethdev.c

diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c
index 181d00b..0b3cc82 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_ethdev.c
+++ b/drivers/net/dpaa2/dpaa2_ethdev.c
@@ -117,7 +117,7 @@ dpaa2_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = priv->hw;
+       struct fsl_mc_io *dpni = dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -144,7 +144,7 @@ static int
 dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = priv->hw;
+       struct fsl_mc_io *dpni = dev->process_private;
        int ret;
 
        PMD_INIT_FUNC_TRACE();
@@ -182,7 +182,7 @@ dpaa2_vlan_tpid_set(struct rte_eth_dev *dev,
                      uint16_t tpid)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = priv->hw;
+       struct fsl_mc_io *dpni = dev->process_private;
        int ret = -ENOTSUP;
 
        PMD_INIT_FUNC_TRACE();
@@ -220,8 +220,7 @@ dpaa2_fw_version_get(struct rte_eth_dev *dev,
                     size_t fw_size)
 {
        int ret;
-       struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = priv->hw;
+       struct fsl_mc_io *dpni = dev->process_private;
        struct mc_soc_version mc_plat_info = {0};
        struct mc_version mc_ver_info = {0};
 
@@ -430,7 +429,7 @@ static int
 dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = priv->hw;
+       struct fsl_mc_io *dpni = dev->process_private;
        struct rte_eth_conf *eth_conf = &dev->data->dev_conf;
        uint64_t rx_offloads = eth_conf->rxmode.offloads;
        uint64_t tx_offloads = eth_conf->txmode.offloads;
@@ -570,7 +569,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev,
                         struct rte_mempool *mb_pool)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        struct dpaa2_queue *dpaa2_q;
        struct dpni_queue cfg;
        uint8_t options = 0;
@@ -718,7 +717,7 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev,
                priv->tx_vq[tx_queue_id];
        struct dpaa2_queue *dpaa2_tx_conf_q = (struct dpaa2_queue *)
                priv->tx_conf_vq[tx_queue_id];
-       struct fsl_mc_io *dpni = priv->hw;
+       struct fsl_mc_io *dpni = dev->process_private;
        struct dpni_queue tx_conf_cfg;
        struct dpni_queue tx_flow_cfg;
        uint8_t options = 0, flow_id;
@@ -844,7 +843,8 @@ dpaa2_dev_rx_queue_release(void *q __rte_unused)
 {
        struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)q;
        struct dpaa2_dev_priv *priv = dpaa2_q->eth_data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni =
+               (struct fsl_mc_io *)priv->eth_dev->process_private;
        uint8_t options = 0;
        int ret;
        struct dpni_queue cfg;
@@ -942,7 +942,7 @@ dpaa2_interrupt_handler(void *param)
 {
        struct rte_eth_dev *dev = param;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        int ret;
        int irq_index = DPNI_IRQ_INDEX;
        unsigned int status = 0, clear = 0;
@@ -981,7 +981,7 @@ dpaa2_eth_setup_irqs(struct rte_eth_dev *dev, int enable)
 {
        int err = 0;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        int irq_index = DPNI_IRQ_INDEX;
        unsigned int mask = DPNI_IRQ_EVENT_LINK_CHANGED;
 
@@ -1011,7 +1011,7 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
        struct rte_dpaa2_device *dpaa2_dev;
        struct rte_eth_dev_data *data = dev->data;
        struct dpaa2_dev_priv *priv = data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        struct dpni_queue cfg;
        struct dpni_error_cfg   err_cfg;
        uint16_t qdid;
@@ -1104,7 +1104,7 @@ static void
 dpaa2_dev_stop(struct rte_eth_dev *dev)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        int ret;
        struct rte_eth_link link;
        struct rte_intr_handle *intr_handle = dev->intr_handle;
@@ -1144,7 +1144,7 @@ static void
 dpaa2_dev_close(struct rte_eth_dev *dev)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        int ret;
        struct rte_eth_link link;
 
@@ -1169,7 +1169,7 @@ dpaa2_dev_promiscuous_enable(
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1195,7 +1195,7 @@ dpaa2_dev_promiscuous_disable(
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1225,7 +1225,7 @@ dpaa2_dev_allmulticast_enable(
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1246,7 +1246,7 @@ dpaa2_dev_allmulticast_disable(struct rte_eth_dev *dev)
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1271,7 +1271,7 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN
                                + VLAN_TAG_SIZE;
 
@@ -1316,7 +1316,7 @@ dpaa2_dev_add_mac_addr(struct rte_eth_dev *dev,
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1339,7 +1339,7 @@ dpaa2_dev_remove_mac_addr(struct rte_eth_dev *dev,
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        struct rte_eth_dev_data *data = dev->data;
        struct rte_ether_addr *macaddr;
 
@@ -1365,7 +1365,7 @@ dpaa2_dev_set_mac_addr(struct rte_eth_dev *dev,
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1389,7 +1389,7 @@ int dpaa2_dev_stats_get(struct rte_eth_dev *dev,
                         struct rte_eth_stats *stats)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        int32_t  retcode;
        uint8_t page0 = 0, page1 = 1, page2 = 2;
        union dpni_statistics value;
@@ -1469,7 +1469,7 @@ dpaa2_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
                     unsigned int n)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        int32_t  retcode;
        union dpni_statistics value[5] = {};
        unsigned int i = 0, num = RTE_DIM(dpaa2_xstats_strings);
@@ -1549,7 +1549,8 @@ dpaa2_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
 
        if (!ids) {
                struct dpaa2_dev_priv *priv = dev->data->dev_private;
-               struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+               struct fsl_mc_io *dpni =
+                       (struct fsl_mc_io *)dev->process_private;
                int32_t  retcode;
                union dpni_statistics value[5] = {};
 
@@ -1631,7 +1632,7 @@ static int
 dpaa2_dev_stats_reset(struct rte_eth_dev *dev)
 {
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        int retcode;
        int i;
        struct dpaa2_queue *dpaa2_q;
@@ -1674,7 +1675,7 @@ dpaa2_dev_link_update(struct rte_eth_dev *dev,
 {
        int ret;
        struct dpaa2_dev_priv *priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        struct rte_eth_link link;
        struct dpni_link_state state = {0};
 
@@ -1722,7 +1723,7 @@ dpaa2_dev_set_link_up(struct rte_eth_dev *dev)
        struct dpni_link_state state = {0};
 
        priv = dev->data->dev_private;
-       dpni = (struct fsl_mc_io *)priv->hw;
+       dpni = (struct fsl_mc_io *)dev->process_private;
 
        if (dpni == NULL) {
                DPAA2_PMD_ERR("dpni is NULL");
@@ -1778,7 +1779,7 @@ dpaa2_dev_set_link_down(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        priv = dev->data->dev_private;
-       dpni = (struct fsl_mc_io *)priv->hw;
+       dpni = (struct fsl_mc_io *)dev->process_private;
 
        if (dpni == NULL) {
                DPAA2_PMD_ERR("Device has not yet been configured");
@@ -1832,7 +1833,7 @@ dpaa2_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        PMD_INIT_FUNC_TRACE();
 
        priv = dev->data->dev_private;
-       dpni = (struct fsl_mc_io *)priv->hw;
+       dpni = (struct fsl_mc_io *)dev->process_private;
 
        if (dpni == NULL || fc_conf == NULL) {
                DPAA2_PMD_ERR("device not configured");
@@ -1888,7 +1889,7 @@ dpaa2_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
        PMD_INIT_FUNC_TRACE();
 
        priv = dev->data->dev_private;
-       dpni = (struct fsl_mc_io *)priv->hw;
+       dpni = (struct fsl_mc_io *)dev->process_private;
 
        if (dpni == NULL) {
                DPAA2_PMD_ERR("dpni is NULL");
@@ -2008,7 +2009,7 @@ int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev,
                const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
 {
        struct dpaa2_dev_priv *eth_priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)eth_priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id];
        uint8_t flow_id = dpaa2_ethq->flow_id;
        struct dpni_queue cfg;
@@ -2089,7 +2090,7 @@ int dpaa2_eth_eventq_detach(const struct rte_eth_dev *dev,
                int eth_rx_queue_id)
 {
        struct dpaa2_dev_priv *eth_priv = dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)eth_priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)dev->process_private;
        struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id];
        uint8_t flow_id = dpaa2_ethq->flow_id;
        struct dpni_queue cfg;
@@ -2318,6 +2319,14 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
 
        PMD_INIT_FUNC_TRACE();
 
+       dpni_dev = rte_malloc(NULL, sizeof(struct fsl_mc_io), 0);
+       if (!dpni_dev) {
+               DPAA2_PMD_ERR("Memory allocation failed for dpni device");
+               return -1;
+       }
+       dpni_dev->regs = rte_mcp_ptr_list[0];
+       eth_dev->process_private = (void *)dpni_dev;
+
        /* For secondary processes, the primary has done all the work */
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                /* In case of secondary, only burst and ops API need to be
@@ -2338,14 +2347,6 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev)
        dpaa2_dev = container_of(dev, struct rte_dpaa2_device, device);
 
        hw_id = dpaa2_dev->object_id;
-
-       dpni_dev = rte_malloc(NULL, sizeof(struct fsl_mc_io), 0);
-       if (!dpni_dev) {
-               DPAA2_PMD_ERR("Memory allocation failed for dpni device");
-               return -1;
-       }
-
-       dpni_dev->regs = rte_mcp_ptr_list[0];
        ret = dpni_open(dpni_dev, CMD_PRI_LOW, hw_id, &priv->token);
        if (ret) {
                DPAA2_PMD_ERR(
@@ -2519,7 +2520,7 @@ static int
 dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
 {
        struct dpaa2_dev_priv *priv = eth_dev->data->dev_private;
-       struct fsl_mc_io *dpni = (struct fsl_mc_io *)priv->hw;
+       struct fsl_mc_io *dpni = (struct fsl_mc_io *)eth_dev->process_private;
        int i, ret;
 
        PMD_INIT_FUNC_TRACE();
@@ -2546,6 +2547,7 @@ dpaa2_dev_uninit(struct rte_eth_dev *eth_dev)
 
        /* Free the allocated memory for ethernet private data and dpni*/
        priv->hw = NULL;
+       eth_dev->process_private = NULL;
        rte_free(dpni);
 
        for (i = 0; i < MAX_TCS; i++) {
@@ -2569,7 +2571,7 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
                struct rte_dpaa2_device *dpaa2_dev)
 {
        struct rte_eth_dev *eth_dev;
-       struct dpaa2_dev_priv *priv;
+       struct dpaa2_dev_priv *dev_priv;
        int diag;
 
        if ((DPAA2_MBUF_HW_ANNOTATION + DPAA2_FD_PTA_SIZE) >
@@ -2586,20 +2588,25 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
                eth_dev = rte_eth_dev_allocate(dpaa2_dev->device.name);
                if (!eth_dev)
                        return -ENODEV;
-               eth_dev->data->dev_private = rte_zmalloc(
-                                               "ethdev private structure",
-                                               sizeof(struct dpaa2_dev_priv),
-                                               RTE_CACHE_LINE_SIZE);
-               if (eth_dev->data->dev_private == NULL) {
+               dev_priv = rte_zmalloc("ethdev private structure",
+                                      sizeof(struct dpaa2_dev_priv),
+                                      RTE_CACHE_LINE_SIZE);
+               if (dev_priv == NULL) {
                        DPAA2_PMD_CRIT(
                                "Unable to allocate memory for private data");
                        rte_eth_dev_release_port(eth_dev);
                        return -ENOMEM;
                }
+               eth_dev->data->dev_private = (void *)dev_priv;
+               /* Store a pointer to eth_dev in dev_private */
+               dev_priv->eth_dev = eth_dev;
+               dev_priv->tx_conf_en = 0;
        } else {
                eth_dev = rte_eth_dev_attach_secondary(dpaa2_dev->device.name);
-               if (!eth_dev)
+               if (!eth_dev) {
+                       DPAA2_PMD_DEBUG("returning enodev");
                        return -ENODEV;
+               }
        }
 
        eth_dev->device = &dpaa2_dev->device;
@@ -2617,9 +2624,6 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv,
                return 0;
        }
 
-       priv = eth_dev->data->dev_private;
-       priv->tx_conf_en = 0;
-
        rte_eth_dev_release_port(eth_dev);
        return diag;
 }