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

Commit 646da631 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'remoteproc-4.1-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc 

Pull remoteproc update from Ohad Ben-Cohen:
 "Suman Anna is adding remoteproc support for processors not behind
  IOMMUs"

* tag 'remoteproc-4.1-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
  remoteproc: add IOMMU hardware capability flag
parents 8f49309a 315491e5

drivers/remoteproc/da8xx_remoteproc.c

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev) 


	drproc = rproc->priv;

	drproc->rproc = rproc;

	rproc->has_iommu = false;



	platform_set_drvdata(pdev, rproc);

drivers/remoteproc/omap_remoteproc.c

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ static int omap_rproc_probe(struct platform_device *pdev) 


	oproc = rproc->priv;

	oproc->rproc = rproc;

	/* All existing OMAP IPU and DSP processors have an MMU */

	rproc->has_iommu = true;



	platform_set_drvdata(pdev, rproc);

drivers/remoteproc/remoteproc_core.c

+2 −13
Original line number Diff line number Diff line
@@ -94,19 +94,8 @@ static int rproc_enable_iommu(struct rproc *rproc) 
	struct device *dev = rproc->dev.parent;

	int ret;



	/*

	 * We currently use iommu_present() to decide if an IOMMU

	 * setup is needed.

	 *

	 * This works for simple cases, but will easily fail with

	 * platforms that do have an IOMMU, but not for this specific

	 * rproc.

	 *

	 * This will be easily solved by introducing hw capabilities

	 * that will be set by the remoteproc driver.

	 */

	if (!iommu_present(dev->bus)) {

		dev_dbg(dev, "iommu not found\n");

	if (!rproc->has_iommu) {

		dev_dbg(dev, "iommu not present\n");

		return 0;

	}

drivers/remoteproc/ste_modem_rproc.c

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ static int sproc_probe(struct platform_device *pdev) 
	sproc = rproc->priv;

	sproc->mdev = mdev;

	sproc->rproc = rproc;

	rproc->has_iommu = false;

	mdev->drv_data = sproc;



	/* Provide callback functions to modem device */

include/linux/remoteproc.h

+2 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ enum rproc_crash_type { 
 * @table_ptr: pointer to the resource table in effect

 * @cached_table: copy of the resource table

 * @table_csum: checksum of the resource table

 * @has_iommu: flag to indicate if remote processor is behind an MMU

 */

struct rproc {

	struct klist_node node;
@@ -435,6 +436,7 @@ struct rproc { 
	struct resource_table *table_ptr;

	struct resource_table *cached_table;

	u32 table_csum;

	bool has_iommu;

};



/* we currently support only two vrings per rvdev */