luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu/core: Add bus_type parameter to iommu_domain_alloc

Browse Source 
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: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
Joerg Roedel 2011-09-06 16:03:26 +02:00
parent ff21776d12
commit 905d66c1e5
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/iommu/iommu.c
View File

@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/types.h> #include <linux/types.h>
@ -71,15 +72,26 @@ bool iommu_found(void)
} }
EXPORT_SYMBOL_GPL(iommu_found); 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_domain *domain;
struct iommu_ops *ops;
int ret; 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); domain = kmalloc(sizeof(*domain), GFP_KERNEL);
if (!domain) if (!domain)
return NULL; return NULL;
domain->ops = ops;
ret = iommu_ops->domain_init(domain); ret = iommu_ops->domain_init(domain);
if (ret) if (ret)
goto out_free; goto out_free;

2
drivers/media/video/omap3isp/isp.c
View File

@ -2141,7 +2141,7 @@ static int isp_probe(struct platform_device *pdev)
/* to be removed once iommu migration is complete */ /* to be removed once iommu migration is complete */
isp->iommu = to_iommu(isp->iommu_dev); isp->iommu = to_iommu(isp->iommu_dev);
isp->domain = iommu_domain_alloc(); isp->domain = iommu_domain_alloc(pdev->dev.bus);
if (!isp->domain) { if (!isp->domain) {
dev_err(isp->dev, "can't alloc iommu domain\n"); dev_err(isp->dev, "can't alloc iommu domain\n");
ret = -ENOMEM; ret = -ENOMEM;

6
include/linux/iommu.h
View File

@ -25,10 +25,12 @@
#define IOMMU_WRITE (2) #define IOMMU_WRITE (2)
#define IOMMU_CACHE (4) /* DMA cache coherency */ #define IOMMU_CACHE (4) /* DMA cache coherency */
struct iommu_ops;
struct bus_type; struct bus_type;
struct device; struct device;
struct iommu_domain { struct iommu_domain {
struct iommu_ops *ops;
void *priv; void *priv;
}; };
@ -55,7 +57,7 @@ struct iommu_ops {
extern void register_iommu(struct iommu_ops *ops); extern void register_iommu(struct iommu_ops *ops);
extern int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops); extern int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops);
extern bool iommu_found(void); 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 void iommu_domain_free(struct iommu_domain *domain);
extern int iommu_attach_device(struct iommu_domain *domain, extern int iommu_attach_device(struct iommu_domain *domain,
struct device *dev); struct device *dev);
@ -79,7 +81,7 @@ static inline bool iommu_found(void)
return false; 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; return NULL;
} }

2
virt/kvm/iommu.c
View File

@ -233,7 +233,7 @@ int kvm_iommu_map_guest(struct kvm *kvm)
return -ENODEV; return -ENODEV;
} }
kvm->arch.iommu_domain = iommu_domain_alloc(); kvm->arch.iommu_domain = iommu_domain_alloc(&pci_bus_type);
if (!kvm->arch.iommu_domain) if (!kvm->arch.iommu_domain)
return -ENOMEM; return -ENOMEM;