]> git.itanic.dy.fi Git - linux-stable/commitdiff
remoteproc: imx_rproc: Fix ignoring mapping vdev regions
authorDong Aisheng <aisheng.dong@nxp.com>
Fri, 10 Sep 2021 09:06:19 +0000 (17:06 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 18:17:18 +0000 (19:17 +0100)
commit afe670e23af91d8a74a8d7049f6e0984bbf6ea11 upstream.

vdev regions are typically named vdev0buffer, vdev0ring0, vdev0ring1 and
etc. Change to strncmp to cover them all.

Fixes: 8f2d8961640f ("remoteproc: imx_rproc: ignore mapping vdev regions")
Reviewed-and-tested-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20210910090621.3073540-5-peng.fan@oss.nxp.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/remoteproc/imx_rproc.c

index 71dcc6dd32e406352b661e569fb2e6754b185a6f..abfeac0b1738df6bbede9f8946ed92d2c7bb3f11 100644 (file)
@@ -582,8 +582,8 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
                struct resource res;
 
                node = of_parse_phandle(np, "memory-region", a);
-               /* Not map vdev region */
-               if (!strcmp(node->name, "vdev"))
+               /* Not map vdevbuffer, vdevring region */
+               if (!strncmp(node->name, "vdev", strlen("vdev")))
                        continue;
                err = of_address_to_resource(node, 0, &res);
                if (err) {