net/ice: remove redundant function

[dpdk.git] / drivers / common / octeontx / octeontx_mbox.c

diff --git a/drivers/common/octeontx/octeontx_mbox.c b/drivers/common/octeontx/octeontx_mbox.c
index 68cb035..f414267 100644 (file)
--- a/drivers/common/octeontx/octeontx_mbox.c
+++ b/drivers/common/octeontx/octeontx_mbox.c
@@ -35,6 +35,7 @@ struct mbox {
        uint8_t *ram_mbox_base; /* Base address of mbox message stored in ram */
        uint8_t *reg; /* Store to this register triggers PF mbox interrupt */
        uint16_t tag_own; /* Last tag which was written to own channel */
+       uint16_t domain; /* Domain */
        rte_spinlock_t lock;
 };
 
@@ -67,14 +68,7 @@ struct mbox_intf_ver {
        uint32_t minor:10;
 };
 
-int octeontx_logtype_mbox;
-
-RTE_INIT(otx_init_log)
-{
-       octeontx_logtype_mbox = rte_log_register("pmd.octeontx.mbox");
-       if (octeontx_logtype_mbox >= 0)
-               rte_log_set_level(octeontx_logtype_mbox, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(octeontx_logtype_mbox, pmd.octeontx.mbox, NOTICE);
 
 static inline void
 mbox_msgcpy(volatile uint8_t *d, volatile const uint8_t *s, uint16_t size)
@@ -198,7 +192,7 @@ mbox_send(struct mbox *m, struct octeontx_mbox_hdr *hdr, const void *txmsg,
 }
 
 int
-octeontx_mbox_set_ram_mbox_base(uint8_t *ram_mbox_base)
+octeontx_mbox_set_ram_mbox_base(uint8_t *ram_mbox_base, uint16_t domain)
 {
        struct mbox *m = &octeontx_mbox;
 
@@ -215,13 +209,14 @@ octeontx_mbox_set_ram_mbox_base(uint8_t *ram_mbox_base)
        if (m->reg != NULL) {
                rte_spinlock_init(&m->lock);
                m->init_once = 1;
+               m->domain = domain;
        }
 
        return 0;
 }
 
 int
-octeontx_mbox_set_reg(uint8_t *reg)
+octeontx_mbox_set_reg(uint8_t *reg, uint16_t domain)
 {
        struct mbox *m = &octeontx_mbox;
 
@@ -238,6 +233,7 @@ octeontx_mbox_set_reg(uint8_t *reg)
        if (m->ram_mbox_base != NULL) {
                rte_spinlock_init(&m->lock);
                m->init_once = 1;
+               m->domain = domain;
        }
 
        return 0;
@@ -276,7 +272,7 @@ octeontx_start_domain(void)
 }
 
 static int
-octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver,
+octeontx_check_mbox_version(struct mbox_intf_ver *app_intf_ver,
                            struct mbox_intf_ver *intf_ver)
 {
        struct mbox_intf_ver kernel_intf_ver = {0};
@@ -287,8 +283,9 @@ octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver,
        hdr.coproc = NO_COPROC;
        hdr.msg = RM_INTERFACE_VERSION;
 
-       result = octeontx_mbox_send(&hdr, &app_intf_ver, sizeof(app_intf_ver),
-                       &kernel_intf_ver, sizeof(kernel_intf_ver));
+       result = octeontx_mbox_send(&hdr, app_intf_ver,
+                                   sizeof(struct mbox_intf_ver),
+                                   &kernel_intf_ver, sizeof(kernel_intf_ver));
        if (result != sizeof(kernel_intf_ver)) {
                mbox_log_err("Could not send interface version. Err=%d. FuncErr=%d\n",
                             result, hdr.res_code);
@@ -298,9 +295,9 @@ octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver,
        if (intf_ver)
                *intf_ver = kernel_intf_ver;
 
-       if (app_intf_ver.platform != kernel_intf_ver.platform ||
-                       app_intf_ver.major != kernel_intf_ver.major ||
-                       app_intf_ver.minor != kernel_intf_ver.minor)
+       if (app_intf_ver->platform != kernel_intf_ver.platform ||
+                       app_intf_ver->major != kernel_intf_ver.major ||
+                       app_intf_ver->minor != kernel_intf_ver.minor)
                result = -EINVAL;
 
        return result;
@@ -309,7 +306,7 @@ octeontx_check_mbox_version(struct mbox_intf_ver app_intf_ver,
 int
 octeontx_mbox_init(void)
 {
-       const struct mbox_intf_ver MBOX_INTERFACE_VERSION = {
+       struct mbox_intf_ver MBOX_INTERFACE_VERSION = {
                .platform = 0x01,
                .major = 0x01,
                .minor = 0x03
@@ -327,7 +324,7 @@ octeontx_mbox_init(void)
                return ret;
        }
 
-       ret = octeontx_check_mbox_version(MBOX_INTERFACE_VERSION,
+       ret = octeontx_check_mbox_version(&MBOX_INTERFACE_VERSION,
                                          &rm_intf_ver);
        if (ret < 0) {
                mbox_log_err("MBOX version: Kernel(%d.%d.%d) != DPDK(%d.%d.%d)",
@@ -344,3 +341,11 @@ octeontx_mbox_init(void)
 
        return 0;
 }
+
+uint16_t
+octeontx_get_global_domain(void)
+{
+       struct mbox *m = &octeontx_mbox;
+
+       return m->domain;
+}