remoteproc: imx_rproc: enlarge IMX7D_RPROC_MEM_MAX

8 is not enough when we need more, such as resource table for remote cores
that booted before Linux Kernel, so enlarge IMX7D_RPROC_MEM_MAX to 32.
And also rename it to IMX_RPROC_MEM_MAX which make more sense.

Signed-off-by: Peng Fan <[email protected]>
Reviewed-by: Mathieu Poirier <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Bjorn Andersson <[email protected]>

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 077413319f58c512c5c146dc99112c36469ba41c..b05aae0ad7a21a03f05aedbce04bcf7fdf4cd684 100644 (file)
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -48,7 +48,7 @@
                                         | IMX6SX_SW_M4C_NON_SCLR_RST \
                                         | IMX6SX_SW_M4C_RST)
 
-#define IMX7D_RPROC_MEM_MAX            8
+#define IMX_RPROC_MEM_MAX              32
 
 /**
  * struct imx_rproc_mem - slim internal memory structure
@@ -88,7 +88,7 @@ struct imx_rproc {
        struct regmap                   *regmap;
        struct rproc                    *rproc;
        const struct imx_rproc_dcfg     *dcfg;
-       struct imx_rproc_mem            mem[IMX7D_RPROC_MEM_MAX];
+       struct imx_rproc_mem            mem[IMX_RPROC_MEM_MAX];
        struct clk                      *clk;
        struct mbox_client              cl;
        struct mbox_chan                *tx_ch;
@@ -272,7 +272,7 @@ static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *i
        if (imx_rproc_da_to_sys(priv, da, len, &sys))
                return NULL;
 
-       for (i = 0; i < IMX7D_RPROC_MEM_MAX; i++) {
+       for (i = 0; i < IMX_RPROC_MEM_MAX; i++) {
                if (sys >= priv->mem[i].sys_addr && sys + len <
                    priv->mem[i].sys_addr +  priv->mem[i].size) {
                        unsigned int offset = sys - priv->mem[i].sys_addr;
@@ -425,7 +425,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
                if (!(att->flags & ATT_OWN))
                        continue;
 
-               if (b >= IMX7D_RPROC_MEM_MAX)
+               if (b >= IMX_RPROC_MEM_MAX)
                        break;
 
                priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev,
@@ -461,7 +461,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 
                of_node_put(node);
 
-               if (b >= IMX7D_RPROC_MEM_MAX)
+               if (b >= IMX_RPROC_MEM_MAX)
                        break;
 
                /* Not use resource version, because we might share region */