Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/remoteproc/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ config QCOM_Q6V5_PIL 
	depends on OF && ARCH_QCOM

	depends on QCOM_SMEM

	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 QCOM_RPROC_COMMON

	select QCOM_SCM
@@ -120,6 +121,7 @@ config QCOM_WCNSS_PIL 
	tristate "Qualcomm WCNSS Peripheral Image Loader"

	depends on OF && ARCH_QCOM

	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

	select QCOM_MDT_LOADER

	select QCOM_RPROC_COMMON

drivers/remoteproc/imx_rproc.c

+4 −5
Original line number Diff line number Diff line
@@ -264,15 +264,14 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, 
		if (!(att->flags & ATT_OWN))

			continue;



		if (b > IMX7D_RPROC_MEM_MAX)

		if (b >= IMX7D_RPROC_MEM_MAX)

			break;



		priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev,

						     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");

			err = PTR_ERR(priv->mem[b].cpu_addr);

			return err;

			return -ENOMEM;

		}

		priv->mem[b].sys_addr = att->sa;

		priv->mem[b].size = att->size;
@@ -296,7 +295,7 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, 
			return err;

		}



		if (b > IMX7D_RPROC_MEM_MAX)

		if (b >= IMX7D_RPROC_MEM_MAX)

			break;



		priv->mem[b].cpu_addr = devm_ioremap_resource(&pdev->dev, &res);