Commit 9add7e3e authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'rproc-v4.14-fixes' of git://github.com/andersson/remoteproc

Pull remoteproc fixes from Bjorn Andersson:
 "This fixes a couple of issues in the imx_rproc driver and corrects the
  Kconfig dependencies of the Qualcomm remoteproc drivers"

* tag 'rproc-v4.14-fixes' of git://github.com/andersson/remoteproc:
  remoteproc: imx_rproc: fix return value check in imx_rproc_addr_init()
  remoteproc: qcom: fix RPMSG_QCOM_GLINK_SMEM dependencies
  remoteproc: imx_rproc: fix a couple off by one bugs
parents 56ae414e 68a39a3e
...@@ -109,6 +109,7 @@ config QCOM_Q6V5_PIL ...@@ -109,6 +109,7 @@ config QCOM_Q6V5_PIL
depends on OF && ARCH_QCOM depends on OF && ARCH_QCOM
depends on QCOM_SMEM depends on QCOM_SMEM
depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n) depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
select MFD_SYSCON select MFD_SYSCON
select QCOM_RPROC_COMMON select QCOM_RPROC_COMMON
select QCOM_SCM select QCOM_SCM
...@@ -120,6 +121,7 @@ config QCOM_WCNSS_PIL ...@@ -120,6 +121,7 @@ config QCOM_WCNSS_PIL
tristate "Qualcomm WCNSS Peripheral Image Loader" tristate "Qualcomm WCNSS Peripheral Image Loader"
depends on OF && ARCH_QCOM depends on OF && ARCH_QCOM
depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n) depends on RPMSG_QCOM_SMD || (COMPILE_TEST && RPMSG_QCOM_SMD=n)
depends on RPMSG_QCOM_GLINK_SMEM || RPMSG_QCOM_GLINK_SMEM=n
depends on QCOM_SMEM depends on QCOM_SMEM
select QCOM_MDT_LOADER select QCOM_MDT_LOADER
select QCOM_RPROC_COMMON select QCOM_RPROC_COMMON
......
...@@ -264,15 +264,14 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, ...@@ -264,15 +264,14 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
if (!(att->flags & ATT_OWN)) if (!(att->flags & ATT_OWN))
continue; continue;
if (b > IMX7D_RPROC_MEM_MAX) if (b >= IMX7D_RPROC_MEM_MAX)
break; break;
priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev, priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev,
att->sa, att->size); att->sa, att->size);
if (IS_ERR(priv->mem[b].cpu_addr)) { if (!priv->mem[b].cpu_addr) {
dev_err(dev, "devm_ioremap_resource failed\n"); dev_err(dev, "devm_ioremap_resource failed\n");
err = PTR_ERR(priv->mem[b].cpu_addr); return -ENOMEM;
return err;
} }
priv->mem[b].sys_addr = att->sa; priv->mem[b].sys_addr = att->sa;
priv->mem[b].size = att->size; priv->mem[b].size = att->size;
...@@ -296,7 +295,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, ...@@ -296,7 +295,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
return err; return err;
} }
if (b > IMX7D_RPROC_MEM_MAX) if (b >= IMX7D_RPROC_MEM_MAX)
break; break;
priv->mem[b].cpu_addr = devm_ioremap_resource(&pdev->dev, &res); priv->mem[b].cpu_addr = devm_ioremap_resource(&pdev->dev, &res);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment