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

Commit 905d66c1 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/core: Add bus_type parameter to iommu_domain_alloc 



This is necessary to store a pointer to the bus-specific
iommu_ops in the iommu-domain structure. It will be used
later to call into bus-specific iommu-ops.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent ff21776d

drivers/iommu/iommu.c

+13 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

 */



#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/bug.h>

#include <linux/types.h>
@@ -71,15 +72,26 @@ bool iommu_found(void) 
}

EXPORT_SYMBOL_GPL(iommu_found);



struct iommu_domain *iommu_domain_alloc(void)

struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

{

	struct iommu_domain *domain;

	struct iommu_ops *ops;

	int ret;



	if (bus->iommu_ops)

		ops = bus->iommu_ops;

	else

		ops = iommu_ops;



	if (ops == NULL)

		return NULL;



	domain = kmalloc(sizeof(*domain), GFP_KERNEL);

	if (!domain)

		return NULL;



	domain->ops = ops;



	ret = iommu_ops->domain_init(domain);

	if (ret)

		goto out_free;

drivers/media/video/omap3isp/isp.c

+1 −1
Original line number Diff line number Diff line
@@ -2141,7 +2141,7 @@ static int isp_probe(struct platform_device *pdev) 
	/* to be removed once iommu migration is complete */

	isp->iommu = to_iommu(isp->iommu_dev);



	isp->domain = iommu_domain_alloc();

	isp->domain = iommu_domain_alloc(pdev->dev.bus);

	if (!isp->domain) {

		dev_err(isp->dev, "can't alloc iommu domain\n");

		ret = -ENOMEM;

include/linux/iommu.h

+4 −2
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 
#define IOMMU_WRITE	(2)

#define IOMMU_CACHE	(4) /* DMA cache coherency */



struct iommu_ops;

struct bus_type;

struct device;



struct iommu_domain {

	struct iommu_ops *ops;

	void *priv;

};
@@ -55,7 +57,7 @@ struct iommu_ops { 
extern void register_iommu(struct iommu_ops *ops);

extern int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops);

extern bool iommu_found(void);

extern struct iommu_domain *iommu_domain_alloc(void);

extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus);

extern void iommu_domain_free(struct iommu_domain *domain);

extern int iommu_attach_device(struct iommu_domain *domain,

			       struct device *dev);
@@ -79,7 +81,7 @@ static inline bool iommu_found(void) 
	return false;

}



static inline struct iommu_domain *iommu_domain_alloc(void)

static inline struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)

{

	return NULL;

}

virt/kvm/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ int kvm_iommu_map_guest(struct kvm *kvm) 
		return -ENODEV;

	}



	kvm->arch.iommu_domain = iommu_domain_alloc();

	kvm->arch.iommu_domain = iommu_domain_alloc(&pci_bus_type);

	if (!kvm->arch.iommu_domain)

		return -ENOMEM;