Merge tag 'defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / bus / mhi / core / init.c

diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index c81b377..5aaca6d 100644 (file)
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -129,7 +129,7 @@ static int mhi_alloc_aligned_ring(struct mhi_controller *mhi_cntrl,
                                  u64 len)
 {
        ring->alloc_size = len + (len - 1);
-       ring->pre_aligned = mhi_alloc_coherent(mhi_cntrl, ring->alloc_size,
+       ring->pre_aligned = dma_alloc_coherent(mhi_cntrl->cntrl_dev, ring->alloc_size,
                                               &ring->dma_handle, GFP_KERNEL);
        if (!ring->pre_aligned)
                return -ENOMEM;
@@ -221,13 +221,13 @@ void mhi_deinit_dev_ctxt(struct mhi_controller *mhi_cntrl)
        mhi_cmd = mhi_cntrl->mhi_cmd;
        for (i = 0; i < NR_OF_CMD_RINGS; i++, mhi_cmd++) {
                ring = &mhi_cmd->ring;
-               mhi_free_coherent(mhi_cntrl, ring->alloc_size,
+               dma_free_coherent(mhi_cntrl->cntrl_dev, ring->alloc_size,
                                  ring->pre_aligned, ring->dma_handle);
                ring->base = NULL;
                ring->iommu_base = 0;
        }
 
-       mhi_free_coherent(mhi_cntrl,
+       dma_free_coherent(mhi_cntrl->cntrl_dev,
                          sizeof(*mhi_ctxt->cmd_ctxt) * NR_OF_CMD_RINGS,
                          mhi_ctxt->cmd_ctxt, mhi_ctxt->cmd_ctxt_addr);
 
@@ -237,17 +237,17 @@ void mhi_deinit_dev_ctxt(struct mhi_controller *mhi_cntrl)
                        continue;
 
                ring = &mhi_event->ring;
-               mhi_free_coherent(mhi_cntrl, ring->alloc_size,
+               dma_free_coherent(mhi_cntrl->cntrl_dev, ring->alloc_size,
                                  ring->pre_aligned, ring->dma_handle);
                ring->base = NULL;
                ring->iommu_base = 0;
        }
 
-       mhi_free_coherent(mhi_cntrl, sizeof(*mhi_ctxt->er_ctxt) *
+       dma_free_coherent(mhi_cntrl->cntrl_dev, sizeof(*mhi_ctxt->er_ctxt) *
                          mhi_cntrl->total_ev_rings, mhi_ctxt->er_ctxt,
                          mhi_ctxt->er_ctxt_addr);
 
-       mhi_free_coherent(mhi_cntrl, sizeof(*mhi_ctxt->chan_ctxt) *
+       dma_free_coherent(mhi_cntrl->cntrl_dev, sizeof(*mhi_ctxt->chan_ctxt) *
                          mhi_cntrl->max_chan, mhi_ctxt->chan_ctxt,
                          mhi_ctxt->chan_ctxt_addr);
 
@@ -275,7 +275,7 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
                return -ENOMEM;
 
        /* Setup channel ctxt */
-       mhi_ctxt->chan_ctxt = mhi_alloc_coherent(mhi_cntrl,
+       mhi_ctxt->chan_ctxt = dma_alloc_coherent(mhi_cntrl->cntrl_dev,
                                                 sizeof(*mhi_ctxt->chan_ctxt) *
                                                 mhi_cntrl->max_chan,
                                                 &mhi_ctxt->chan_ctxt_addr,
@@ -307,7 +307,7 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
        }
 
        /* Setup event context */
-       mhi_ctxt->er_ctxt = mhi_alloc_coherent(mhi_cntrl,
+       mhi_ctxt->er_ctxt = dma_alloc_coherent(mhi_cntrl->cntrl_dev,
                                               sizeof(*mhi_ctxt->er_ctxt) *
                                               mhi_cntrl->total_ev_rings,
                                               &mhi_ctxt->er_ctxt_addr,
@@ -354,7 +354,7 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
 
        /* Setup cmd context */
        ret = -ENOMEM;
-       mhi_ctxt->cmd_ctxt = mhi_alloc_coherent(mhi_cntrl,
+       mhi_ctxt->cmd_ctxt = dma_alloc_coherent(mhi_cntrl->cntrl_dev,
                                                sizeof(*mhi_ctxt->cmd_ctxt) *
                                                NR_OF_CMD_RINGS,
                                                &mhi_ctxt->cmd_ctxt_addr,
@@ -389,10 +389,10 @@ error_alloc_cmd:
        for (--i, --mhi_cmd; i >= 0; i--, mhi_cmd--) {
                struct mhi_ring *ring = &mhi_cmd->ring;
 
-               mhi_free_coherent(mhi_cntrl, ring->alloc_size,
+               dma_free_coherent(mhi_cntrl->cntrl_dev, ring->alloc_size,
                                  ring->pre_aligned, ring->dma_handle);
        }
-       mhi_free_coherent(mhi_cntrl,
+       dma_free_coherent(mhi_cntrl->cntrl_dev,
                          sizeof(*mhi_ctxt->cmd_ctxt) * NR_OF_CMD_RINGS,
                          mhi_ctxt->cmd_ctxt, mhi_ctxt->cmd_ctxt_addr);
        i = mhi_cntrl->total_ev_rings;
@@ -405,15 +405,15 @@ error_alloc_er:
                if (mhi_event->offload_ev)
                        continue;
 
-               mhi_free_coherent(mhi_cntrl, ring->alloc_size,
+               dma_free_coherent(mhi_cntrl->cntrl_dev, ring->alloc_size,
                                  ring->pre_aligned, ring->dma_handle);
        }
-       mhi_free_coherent(mhi_cntrl, sizeof(*mhi_ctxt->er_ctxt) *
+       dma_free_coherent(mhi_cntrl->cntrl_dev, sizeof(*mhi_ctxt->er_ctxt) *
                          mhi_cntrl->total_ev_rings, mhi_ctxt->er_ctxt,
                          mhi_ctxt->er_ctxt_addr);
 
 error_alloc_er_ctxt:
-       mhi_free_coherent(mhi_cntrl, sizeof(*mhi_ctxt->chan_ctxt) *
+       dma_free_coherent(mhi_cntrl->cntrl_dev, sizeof(*mhi_ctxt->chan_ctxt) *
                          mhi_cntrl->max_chan, mhi_ctxt->chan_ctxt,
                          mhi_ctxt->chan_ctxt_addr);
 
@@ -567,7 +567,7 @@ void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl,
        if (!chan_ctxt->rbase) /* Already uninitialized */
                return;
 
-       mhi_free_coherent(mhi_cntrl, tre_ring->alloc_size,
+       dma_free_coherent(mhi_cntrl->cntrl_dev, tre_ring->alloc_size,
                          tre_ring->pre_aligned, tre_ring->dma_handle);
        vfree(buf_ring->base);
 
@@ -610,7 +610,7 @@ int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,
        buf_ring->base = vzalloc(buf_ring->len);
 
        if (!buf_ring->base) {
-               mhi_free_coherent(mhi_cntrl, tre_ring->alloc_size,
+               dma_free_coherent(mhi_cntrl->cntrl_dev, tre_ring->alloc_size,
                                  tre_ring->pre_aligned, tre_ring->dma_handle);
                return -ENOMEM;
        }
@@ -885,7 +885,8 @@ int mhi_register_controller(struct mhi_controller *mhi_cntrl,
        if (!mhi_cntrl || !mhi_cntrl->cntrl_dev || !mhi_cntrl->regs ||
            !mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put ||
            !mhi_cntrl->status_cb || !mhi_cntrl->read_reg ||
-           !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs || !mhi_cntrl->irq)
+           !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs ||
+           !mhi_cntrl->irq || !mhi_cntrl->reg_len)
                return -EINVAL;
 
        ret = parse_config(mhi_cntrl, config);
@@ -1063,7 +1064,7 @@ EXPORT_SYMBOL_GPL(mhi_free_controller);
 int mhi_prepare_for_power_up(struct mhi_controller *mhi_cntrl)
 {
        struct device *dev = &mhi_cntrl->mhi_dev->dev;
-       u32 bhie_off;
+       u32 bhi_off, bhie_off;
        int ret;
 
        mutex_lock(&mhi_cntrl->pm_mutex);
@@ -1072,29 +1073,51 @@ int mhi_prepare_for_power_up(struct mhi_controller *mhi_cntrl)
        if (ret)
                goto error_dev_ctxt;
 
-       /*
-        * Allocate RDDM table if specified, this table is for debugging purpose
-        */
-       if (mhi_cntrl->rddm_size) {
-               mhi_alloc_bhie_table(mhi_cntrl, &mhi_cntrl->rddm_image,
-                                    mhi_cntrl->rddm_size);
+       ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->regs, BHIOFF, &bhi_off);
+       if (ret) {
+               dev_err(dev, "Error getting BHI offset\n");
+               goto error_reg_offset;
+       }
 
-               /*
-                * This controller supports RDDM, so we need to manually clear
-                * BHIE RX registers since POR values are undefined.
-                */
+       if (bhi_off >= mhi_cntrl->reg_len) {
+               dev_err(dev, "BHI offset: 0x%x is out of range: 0x%zx\n",
+                       bhi_off, mhi_cntrl->reg_len);
+               ret = -EINVAL;
+               goto error_reg_offset;
+       }
+       mhi_cntrl->bhi = mhi_cntrl->regs + bhi_off;
+
+       if (mhi_cntrl->fbc_download || mhi_cntrl->rddm_size) {
                ret = mhi_read_reg(mhi_cntrl, mhi_cntrl->regs, BHIEOFF,
                                   &bhie_off);
                if (ret) {
                        dev_err(dev, "Error getting BHIE offset\n");
-                       goto bhie_error;
+                       goto error_reg_offset;
                }
 
+               if (bhie_off >= mhi_cntrl->reg_len) {
+                       dev_err(dev,
+                               "BHIe offset: 0x%x is out of range: 0x%zx\n",
+                               bhie_off, mhi_cntrl->reg_len);
+                       ret = -EINVAL;
+                       goto error_reg_offset;
+               }
                mhi_cntrl->bhie = mhi_cntrl->regs + bhie_off;
+       }
+
+       if (mhi_cntrl->rddm_size) {
+               /*
+                * This controller supports RDDM, so we need to manually clear
+                * BHIE RX registers since POR values are undefined.
+                */
                memset_io(mhi_cntrl->bhie + BHIE_RXVECADDR_LOW_OFFS,
                          0, BHIE_RXVECSTATUS_OFFS - BHIE_RXVECADDR_LOW_OFFS +
                          4);
-
+               /*
+                * Allocate RDDM table for debugging purpose if specified
+                */
+               mhi_alloc_bhie_table(mhi_cntrl, &mhi_cntrl->rddm_image,
+                                    mhi_cntrl->rddm_size);
                if (mhi_cntrl->rddm_image)
                        mhi_rddm_prepare(mhi_cntrl, mhi_cntrl->rddm_image);
        }
@@ -1103,11 +1126,8 @@ int mhi_prepare_for_power_up(struct mhi_controller *mhi_cntrl)
 
        return 0;
 
-bhie_error:
-       if (mhi_cntrl->rddm_image) {
-               mhi_free_bhie_table(mhi_cntrl, mhi_cntrl->rddm_image);
-               mhi_cntrl->rddm_image = NULL;
-       }
+error_reg_offset:
+       mhi_deinit_dev_ctxt(mhi_cntrl);
 
 error_dev_ctxt:
        mutex_unlock(&mhi_cntrl->pm_mutex);
@@ -1128,6 +1148,9 @@ void mhi_unprepare_after_power_down(struct mhi_controller *mhi_cntrl)
                mhi_cntrl->rddm_image = NULL;
        }
 
+       mhi_cntrl->bhi = NULL;
+       mhi_cntrl->bhie = NULL;
+
        mhi_deinit_dev_ctxt(mhi_cntrl);
 }
 EXPORT_SYMBOL_GPL(mhi_unprepare_after_power_down);