common/cnxk: clear BPHY IRQ handler

Add support for clearing previously register baseband PHY IRQ handler.

Signed-off-by: Jakub Palider <jpalider@marvell.com>
Signed-off-by: Tomasz Duszynski <tduszynski@marvell.com>
Reviewed-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/drivers/common/cnxk/roc_bphy_irq.c b/drivers/common/cnxk/roc_bphy_irq.c
index f988abf..4b87fc8 100644 (file)
--- a/drivers/common/cnxk/roc_bphy_irq.c
+++ b/drivers/common/cnxk/roc_bphy_irq.c
@@ -33,6 +33,7 @@ struct roc_bphy_irq_stack {
 #define ROC_BPHY_IOC_MAGIC 0xF3
 #define ROC_BPHY_IOC_SET_BPHY_HANDLER                                          \
        _IOW(ROC_BPHY_IOC_MAGIC, 1, struct roc_bphy_irq_usr_data)
+#define ROC_BPHY_IOC_CLR_BPHY_HANDLER  _IO(ROC_BPHY_IOC_MAGIC, 2)
 #define ROC_BPHY_IOC_GET_BPHY_MAX_IRQ  _IOR(ROC_BPHY_IOC_MAGIC, 3, uint64_t)
 #define ROC_BPHY_IOC_GET_BPHY_BMASK_IRQ _IOR(ROC_BPHY_IOC_MAGIC, 4, uint64_t)
 
@@ -316,3 +317,68 @@ roc_bphy_intr_available(struct roc_bphy_irq_chip *irq_chip, int irq_num)
 
        return irq_chip->avail_irq_bmask & BIT(irq_num);
 }
+
+int
+roc_bphy_handler_clear(struct roc_bphy_irq_chip *chip, int irq_num)
+{
+       roc_cpuset_t orig_cpuset, intr_cpuset;
+       const struct plt_memzone *mz;
+       int retval;
+
+       if (chip == NULL)
+               return -EINVAL;
+       if ((uint64_t)irq_num >= chip->max_irq || irq_num < 0)
+               return -EINVAL;
+       if (!roc_bphy_intr_available(chip, irq_num))
+               return -ENOTSUP;
+       if (chip->irq_vecs[irq_num].handler == NULL)
+               return -EINVAL;
+       mz = plt_memzone_lookup(chip->mz_name);
+       if (mz == NULL)
+               return -ENXIO;
+
+       retval = pthread_getaffinity_np(pthread_self(), sizeof(orig_cpuset),
+                                       &orig_cpuset);
+       if (retval < 0) {
+               plt_warn("Failed to get affinity mask");
+               CPU_ZERO(&orig_cpuset);
+               CPU_SET(0, &orig_cpuset);
+       }
+
+       CPU_ZERO(&intr_cpuset);
+       CPU_SET(chip->irq_vecs[irq_num].handler_cpu, &intr_cpuset);
+       retval = pthread_setaffinity_np(pthread_self(), sizeof(intr_cpuset),
+                                       &intr_cpuset);
+       if (retval < 0) {
+               plt_warn("Failed to set affinity mask");
+               CPU_ZERO(&orig_cpuset);
+               CPU_SET(0, &orig_cpuset);
+       }
+
+       retval = ioctl(chip->intfd, ROC_BPHY_IOC_CLR_BPHY_HANDLER, irq_num);
+       if (retval == 0) {
+               roc_bphy_irq_stack_remove(chip->irq_vecs[irq_num].handler_cpu);
+               chip->n_handlers--;
+               chip->irq_vecs[irq_num].isr_data = NULL;
+               chip->irq_vecs[irq_num].handler = NULL;
+               chip->irq_vecs[irq_num].handler_cpu = -1;
+               if (chip->n_handlers == 0) {
+                       retval = plt_memzone_free(mz);
+                       if (retval < 0)
+                               plt_err("Failed to free memzone: irq %d",
+                                       irq_num);
+               }
+       } else {
+               plt_err("Failed to clear bphy interrupt handler");
+       }
+
+       retval = pthread_setaffinity_np(pthread_self(), sizeof(orig_cpuset),
+                                       &orig_cpuset);
+       if (retval < 0) {
+               plt_warn("Failed to restore affinity mask");
+               CPU_ZERO(&orig_cpuset);
+               CPU_SET(0, &orig_cpuset);
+       }
+
+       return retval;
+}

diff --git a/drivers/common/cnxk/roc_bphy_irq.h b/drivers/common/cnxk/roc_bphy_irq.h
index 7dd23f4..778764f 100644 (file)
--- a/drivers/common/cnxk/roc_bphy_irq.h
+++ b/drivers/common/cnxk/roc_bphy_irq.h
@@ -32,5 +32,7 @@ roc_bphy_irq_handler_set(struct roc_bphy_irq_chip *chip, int irq_num,
                         void *isr_data);
 __roc_api bool roc_bphy_intr_available(struct roc_bphy_irq_chip *irq_chip,
                                       int irq_num);
+__roc_api int roc_bphy_handler_clear(struct roc_bphy_irq_chip *chip,
+                                    int irq_num);
 
 #endif /* _ROC_BPHY_IRQ_ */

diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 861a97c..941055b 100644 (file)
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -22,6 +22,7 @@ INTERNAL {
        roc_bphy_cgx_stop_rxtx;
        roc_bphy_dev_fini;
        roc_bphy_dev_init;
+       roc_bphy_handler_clear;
        roc_bphy_intr_available;
        roc_bphy_intr_fini;
        roc_bphy_intr_handler;