net/bnxt: support action bitmap opcode

[dpdk.git] / drivers / net / dpaa / dpaa_ethdev.c

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index 26805f1..13d1c6a 100644 (file)
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -46,6 +46,8 @@
 #include <fsl_bman.h>
 #include <fsl_fman.h>
 
+int dpaa_logtype_pmd;
+
 /* Supported Rx offloads */
 static uint64_t dev_rx_offloads_sup =
                DEV_RX_OFFLOAD_JUMBO_FRAME |
@@ -174,7 +176,7 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
        }
 
        if (frame_size > RTE_ETHER_MAX_LEN)
-               dev->data->dev_conf.rxmode.offloads &=
+               dev->data->dev_conf.rxmode.offloads |=
                                                DEV_RX_OFFLOAD_JUMBO_FRAME;
        else
                dev->data->dev_conf.rxmode.offloads &=
@@ -363,6 +365,10 @@ static int dpaa_eth_dev_info(struct rte_eth_dev *dev,
                                        dev_tx_offloads_nodis;
        dev_info->default_rxportconf.burst_size = DPAA_DEF_RX_BURST_SIZE;
        dev_info->default_txportconf.burst_size = DPAA_DEF_TX_BURST_SIZE;
+       dev_info->default_rxportconf.nb_queues = 1;
+       dev_info->default_txportconf.nb_queues = 1;
+       dev_info->default_txportconf.ring_size = CGR_TX_CGR_THRESH;
+       dev_info->default_rxportconf.ring_size = CGR_RX_PERFQ_THRESH;
 
        return 0;
 }
@@ -881,8 +887,8 @@ dpaa_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        PMD_INIT_FUNC_TRACE();
 
        if (qman_query_fq_frm_cnt(rxq, &frm_cnt) == 0) {
-               RTE_LOG(DEBUG, PMD, "RX frame count for q(%d) is %u\n",
-                       rx_queue_id, frm_cnt);
+               DPAA_PMD_DEBUG("RX frame count for q(%d) is %u",
+                              rx_queue_id, frm_cnt);
        }
        return frm_cnt;
 }
@@ -996,8 +1002,7 @@ dpaa_dev_add_mac_addr(struct rte_eth_dev *dev,
        ret = fman_if_add_mac_addr(dpaa_intf->fif, addr->addr_bytes, index);
 
        if (ret)
-               RTE_LOG(ERR, PMD, "error: Adding the MAC ADDR failed:"
-                       " err = %d", ret);
+               DPAA_PMD_ERR("Adding the MAC ADDR failed: err = %d", ret);
        return 0;
 }
 
@@ -1023,7 +1028,7 @@ dpaa_dev_set_mac_addr(struct rte_eth_dev *dev,
 
        ret = fman_if_add_mac_addr(dpaa_intf->fif, addr->addr_bytes, 0);
        if (ret)
-               RTE_LOG(ERR, PMD, "error: Setting the MAC ADDR failed %d", ret);
+               DPAA_PMD_ERR("Setting the MAC ADDR failed %d", ret);
 
        return ret;
 }
@@ -1055,7 +1060,7 @@ static int dpaa_dev_queue_intr_disable(struct rte_eth_dev *dev,
 
        temp1 = read(rxq->q_fd, &temp, sizeof(temp));
        if (temp1 != sizeof(temp))
-               DPAA_EVENTDEV_ERR("irq read error");
+               DPAA_PMD_ERR("irq read error");
 
        qman_fq_portal_thread_irq(rxq->qp);
 
@@ -1306,6 +1311,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        struct fman_if *fman_intf;
        struct fman_if_bpool *bp, *tmp_bp;
        uint32_t cgrid[DPAA_MAX_NUM_PCD_QUEUES];
+       char eth_buf[RTE_ETHER_ADDR_FMT_SIZE];
 
        PMD_INIT_FUNC_TRACE();
 
@@ -1326,7 +1332,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
        dpaa_device = DEV_TO_DPAA_DEVICE(eth_dev->device);
        dev_id = dpaa_device->id.dev_id;
        dpaa_intf = eth_dev->data->dev_private;
-       cfg = &dpaa_netcfg->port_cfg[dev_id];
+       cfg = dpaa_get_eth_port_cfg(dev_id);
        fman_intf = cfg->fman_if;
 
        dpaa_intf->name = dpaa_device->name;
@@ -1457,15 +1463,9 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
 
        /* copy the primary mac address */
        rte_ether_addr_copy(&fman_intf->mac_addr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_format_addr(eth_buf, sizeof(eth_buf), &fman_intf->mac_addr);
 
-       RTE_LOG(INFO, PMD, "net: dpaa: %s: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               dpaa_device->name,
-               fman_intf->mac_addr.addr_bytes[0],
-               fman_intf->mac_addr.addr_bytes[1],
-               fman_intf->mac_addr.addr_bytes[2],
-               fman_intf->mac_addr.addr_bytes[3],
-               fman_intf->mac_addr.addr_bytes[4],
-               fman_intf->mac_addr.addr_bytes[5]);
+       DPAA_PMD_INFO("net: dpaa: %s: %s", dpaa_device->name, eth_buf);
 
        /* Disable RX mode */
        fman_if_discard_rx_errors(fman_intf);
@@ -1578,8 +1578,7 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused,
 
        if (!is_global_init && (rte_eal_process_type() == RTE_PROC_PRIMARY)) {
                if (access("/tmp/fmc.bin", F_OK) == -1) {
-                       RTE_LOG(INFO, PMD,
-                               "* FMC not configured.Enabling default mode\n");
+                       DPAA_PMD_INFO("* FMC not configured.Enabling default mode");
                        default_q = 1;
                }
 
@@ -1667,3 +1666,9 @@ static struct rte_dpaa_driver rte_dpaa_pmd = {
 };
 
 RTE_PMD_REGISTER_DPAA(net_dpaa, rte_dpaa_pmd);
+RTE_INIT(dpaa_net_init_log)
+{
+       dpaa_logtype_pmd = rte_log_register("pmd.net.dpaa");
+       if (dpaa_logtype_pmd >= 0)
+               rte_log_set_level(dpaa_logtype_pmd, RTE_LOG_NOTICE);
+}