log: introduce logtype register macro

[dpdk.git] / drivers / net / softnic / rte_eth_softnic.c

diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c
index 4bda2f2..866d17a 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -28,6 +28,16 @@
 #define PMD_PARAM_TM_QSIZE1                                "tm_qsize1"
 #define PMD_PARAM_TM_QSIZE2                                "tm_qsize2"
 #define PMD_PARAM_TM_QSIZE3                                "tm_qsize3"
+#define PMD_PARAM_TM_QSIZE4                                "tm_qsize4"
+#define PMD_PARAM_TM_QSIZE5                                "tm_qsize5"
+#define PMD_PARAM_TM_QSIZE6                                "tm_qsize6"
+#define PMD_PARAM_TM_QSIZE7                                "tm_qsize7"
+#define PMD_PARAM_TM_QSIZE8                                "tm_qsize8"
+#define PMD_PARAM_TM_QSIZE9                                "tm_qsize9"
+#define PMD_PARAM_TM_QSIZE10                               "tm_qsize10"
+#define PMD_PARAM_TM_QSIZE11                               "tm_qsize11"
+#define PMD_PARAM_TM_QSIZE12                               "tm_qsize12"
+
 
 static const char * const pmd_valid_args[] = {
        PMD_PARAM_FIRMWARE,
@@ -39,6 +49,15 @@ static const char * const pmd_valid_args[] = {
        PMD_PARAM_TM_QSIZE1,
        PMD_PARAM_TM_QSIZE2,
        PMD_PARAM_TM_QSIZE3,
+       PMD_PARAM_TM_QSIZE4,
+       PMD_PARAM_TM_QSIZE5,
+       PMD_PARAM_TM_QSIZE6,
+       PMD_PARAM_TM_QSIZE7,
+       PMD_PARAM_TM_QSIZE8,
+       PMD_PARAM_TM_QSIZE9,
+       PMD_PARAM_TM_QSIZE10,
+       PMD_PARAM_TM_QSIZE11,
+       PMD_PARAM_TM_QSIZE12,
        NULL
 };
 
@@ -61,19 +80,21 @@ static const struct softnic_conn_params conn_params_default = {
        .msg_handle_arg = NULL,
 };
 
-static int pmd_softnic_logtype;
+RTE_LOG_REGISTER(pmd_softnic_logtype, pmd.net.softnic, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, pmd_softnic_logtype, \
                "%s(): " fmt "\n", __func__, ##args)
 
-static void
+static int
 pmd_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
        struct rte_eth_dev_info *dev_info)
 {
        dev_info->max_rx_pktlen = UINT32_MAX;
        dev_info->max_rx_queues = UINT16_MAX;
        dev_info->max_tx_queues = UINT16_MAX;
+
+       return 0;
 }
 
 static int
@@ -434,6 +455,15 @@ pmd_parse_args(struct pmd_params *p, const char *params)
        p->tm.qsize[1] = SOFTNIC_TM_QUEUE_SIZE;
        p->tm.qsize[2] = SOFTNIC_TM_QUEUE_SIZE;
        p->tm.qsize[3] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[4] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[5] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[6] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[7] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[8] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[9] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[10] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[11] = SOFTNIC_TM_QUEUE_SIZE;
+       p->tm.qsize[12] = SOFTNIC_TM_QUEUE_SIZE;
 
        /* Firmware script (optional) */
        if (rte_kvargs_count(kvlist, PMD_PARAM_FIRMWARE) == 1) {
@@ -504,6 +534,67 @@ pmd_parse_args(struct pmd_params *p, const char *params)
                        goto out_free;
        }
 
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE4) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE4,
+                       &get_uint32, &p->tm.qsize[4]);
+               if (ret < 0)
+                       goto out_free;
+       }
+
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE5) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE5,
+                       &get_uint32, &p->tm.qsize[5]);
+               if (ret < 0)
+                       goto out_free;
+       }
+
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE6) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE6,
+                       &get_uint32, &p->tm.qsize[6]);
+               if (ret < 0)
+                       goto out_free;
+       }
+
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE7) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE7,
+                       &get_uint32, &p->tm.qsize[7]);
+               if (ret < 0)
+                       goto out_free;
+       }
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE8) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE8,
+                       &get_uint32, &p->tm.qsize[8]);
+               if (ret < 0)
+                       goto out_free;
+       }
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE9) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE9,
+                       &get_uint32, &p->tm.qsize[9]);
+               if (ret < 0)
+                       goto out_free;
+       }
+
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE10) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE10,
+                       &get_uint32, &p->tm.qsize[10]);
+               if (ret < 0)
+                       goto out_free;
+       }
+
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE11) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE11,
+                       &get_uint32, &p->tm.qsize[11]);
+               if (ret < 0)
+                       goto out_free;
+       }
+
+       if (rte_kvargs_count(kvlist, PMD_PARAM_TM_QSIZE12) == 1) {
+               ret = rte_kvargs_process(kvlist, PMD_PARAM_TM_QSIZE12,
+                       &get_uint32, &p->tm.qsize[12]);
+               if (ret < 0)
+                       goto out_free;
+       }
+
 out_free:
        rte_kvargs_free(kvlist);
        return ret;
@@ -588,16 +679,17 @@ RTE_PMD_REGISTER_PARAM_STRING(net_softnic,
        PMD_PARAM_TM_QSIZE1 "=<uint32> "
        PMD_PARAM_TM_QSIZE2 "=<uint32> "
        PMD_PARAM_TM_QSIZE3 "=<uint32>"
+       PMD_PARAM_TM_QSIZE4 "=<uint32> "
+       PMD_PARAM_TM_QSIZE5 "=<uint32> "
+       PMD_PARAM_TM_QSIZE6 "=<uint32> "
+       PMD_PARAM_TM_QSIZE7 "=<uint32> "
+       PMD_PARAM_TM_QSIZE8 "=<uint32> "
+       PMD_PARAM_TM_QSIZE9 "=<uint32> "
+       PMD_PARAM_TM_QSIZE10 "=<uint32> "
+       PMD_PARAM_TM_QSIZE11 "=<uint32>"
+       PMD_PARAM_TM_QSIZE12 "=<uint32>"
 );
 
-
-RTE_INIT(pmd_softnic_init_log)
-{
-       pmd_softnic_logtype = rte_log_register("pmd.net.softnic");
-       if (pmd_softnic_logtype >= 0)
-               rte_log_set_level(pmd_softnic_logtype, RTE_LOG_NOTICE);
-}
-
 int
 rte_pmd_softnic_manage(uint16_t port_id)
 {