x86/amd-iommu: Use dev->arch->iommu to store iommu related information
This patch changes IOMMU code to use dev->archdata->iommu to store information about the alias device and the domain the device is attached to. This allows the driver to get rid of the amd_iommu_pd_table in the future. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
parent
8793abeb78
commit
657cbb6b6c
|
@ -247,6 +247,14 @@ struct protection_domain {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This struct contains device specific data for the IOMMU
|
||||||
|
*/
|
||||||
|
struct iommu_dev_data {
|
||||||
|
struct device *alias; /* The Alias Device */
|
||||||
|
struct protection_domain *domain; /* Domain the device is bound to */
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* For dynamic growth the aperture size is split into ranges of 128MB of
|
* For dynamic growth the aperture size is split into ranges of 128MB of
|
||||||
* DMA address space each. This struct represents one such range.
|
* DMA address space each. This struct represents one such range.
|
||||||
|
|
|
@ -8,7 +8,7 @@ struct dev_archdata {
|
||||||
#ifdef CONFIG_X86_64
|
#ifdef CONFIG_X86_64
|
||||||
struct dma_map_ops *dma_ops;
|
struct dma_map_ops *dma_ops;
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_DMAR
|
#if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
|
||||||
void *iommu; /* hook for IOMMU specific extension */
|
void *iommu; /* hook for IOMMU specific extension */
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -73,6 +73,11 @@ static inline u16 get_device_id(struct device *dev)
|
||||||
return calc_devid(pdev->bus->number, pdev->devfn);
|
return calc_devid(pdev->bus->number, pdev->devfn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct iommu_dev_data *get_dev_data(struct device *dev)
|
||||||
|
{
|
||||||
|
return dev->archdata.iommu;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* In this function the list of preallocated protection domains is traversed to
|
* In this function the list of preallocated protection domains is traversed to
|
||||||
* find the domain for a specific device
|
* find the domain for a specific device
|
||||||
|
@ -128,6 +133,35 @@ static bool check_device(struct device *dev)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int iommu_init_device(struct device *dev)
|
||||||
|
{
|
||||||
|
struct iommu_dev_data *dev_data;
|
||||||
|
struct pci_dev *pdev;
|
||||||
|
u16 devid, alias;
|
||||||
|
|
||||||
|
if (dev->archdata.iommu)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
dev_data = kzalloc(sizeof(*dev_data), GFP_KERNEL);
|
||||||
|
if (!dev_data)
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
devid = get_device_id(dev);
|
||||||
|
alias = amd_iommu_alias_table[devid];
|
||||||
|
pdev = pci_get_bus_and_slot(PCI_BUS(alias), alias & 0xff);
|
||||||
|
if (pdev)
|
||||||
|
dev_data->alias = &pdev->dev;
|
||||||
|
|
||||||
|
dev->archdata.iommu = dev_data;
|
||||||
|
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void iommu_uninit_device(struct device *dev)
|
||||||
|
{
|
||||||
|
kfree(dev->archdata.iommu);
|
||||||
|
}
|
||||||
#ifdef CONFIG_AMD_IOMMU_STATS
|
#ifdef CONFIG_AMD_IOMMU_STATS
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1346,28 +1380,39 @@ static void clear_dte_entry(u16 devid)
|
||||||
static int __attach_device(struct device *dev,
|
static int __attach_device(struct device *dev,
|
||||||
struct protection_domain *domain)
|
struct protection_domain *domain)
|
||||||
{
|
{
|
||||||
u16 devid = get_device_id(dev);
|
struct iommu_dev_data *dev_data, *alias_data;
|
||||||
u16 alias = amd_iommu_alias_table[devid];
|
u16 devid, alias;
|
||||||
|
|
||||||
|
devid = get_device_id(dev);
|
||||||
|
alias = amd_iommu_alias_table[devid];
|
||||||
|
dev_data = get_dev_data(dev);
|
||||||
|
alias_data = get_dev_data(dev_data->alias);
|
||||||
|
if (!alias_data)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
/* lock domain */
|
/* lock domain */
|
||||||
spin_lock(&domain->lock);
|
spin_lock(&domain->lock);
|
||||||
|
|
||||||
/* Some sanity checks */
|
/* Some sanity checks */
|
||||||
if (amd_iommu_pd_table[alias] != NULL &&
|
if (alias_data->domain != NULL &&
|
||||||
amd_iommu_pd_table[alias] != domain)
|
alias_data->domain != domain)
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
|
|
||||||
if (amd_iommu_pd_table[devid] != NULL &&
|
if (dev_data->domain != NULL &&
|
||||||
amd_iommu_pd_table[devid] != domain)
|
dev_data->domain != domain)
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
|
|
||||||
/* Do real assignment */
|
/* Do real assignment */
|
||||||
if (alias != devid &&
|
if (alias != devid &&
|
||||||
amd_iommu_pd_table[alias] == NULL)
|
alias_data->domain == NULL) {
|
||||||
|
alias_data->domain = domain;
|
||||||
set_dte_entry(alias, domain);
|
set_dte_entry(alias, domain);
|
||||||
|
}
|
||||||
|
|
||||||
if (amd_iommu_pd_table[devid] == NULL)
|
if (dev_data->domain == NULL) {
|
||||||
|
dev_data->domain = domain;
|
||||||
set_dte_entry(devid, domain);
|
set_dte_entry(devid, domain);
|
||||||
|
}
|
||||||
|
|
||||||
/* ready */
|
/* ready */
|
||||||
spin_unlock(&domain->lock);
|
spin_unlock(&domain->lock);
|
||||||
|
@ -1406,10 +1451,12 @@ static void __detach_device(struct device *dev)
|
||||||
{
|
{
|
||||||
u16 devid = get_device_id(dev);
|
u16 devid = get_device_id(dev);
|
||||||
struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
|
struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
|
||||||
|
struct iommu_dev_data *dev_data = get_dev_data(dev);
|
||||||
|
|
||||||
BUG_ON(!iommu);
|
BUG_ON(!iommu);
|
||||||
|
|
||||||
clear_dte_entry(devid);
|
clear_dte_entry(devid);
|
||||||
|
dev_data->domain = NULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we run in passthrough mode the device must be assigned to the
|
* If we run in passthrough mode the device must be assigned to the
|
||||||
|
@ -1439,18 +1486,23 @@ static void detach_device(struct device *dev)
|
||||||
static struct protection_domain *domain_for_device(struct device *dev)
|
static struct protection_domain *domain_for_device(struct device *dev)
|
||||||
{
|
{
|
||||||
struct protection_domain *dom;
|
struct protection_domain *dom;
|
||||||
|
struct iommu_dev_data *dev_data, *alias_data;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
u16 devid, alias;
|
u16 devid, alias;
|
||||||
|
|
||||||
devid = get_device_id(dev);
|
devid = get_device_id(dev);
|
||||||
alias = amd_iommu_alias_table[devid];
|
alias = amd_iommu_alias_table[devid];
|
||||||
|
dev_data = get_dev_data(dev);
|
||||||
|
alias_data = get_dev_data(dev_data->alias);
|
||||||
|
if (!alias_data)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
read_lock_irqsave(&amd_iommu_devtable_lock, flags);
|
read_lock_irqsave(&amd_iommu_devtable_lock, flags);
|
||||||
dom = amd_iommu_pd_table[devid];
|
dom = dev_data->domain;
|
||||||
if (dom == NULL &&
|
if (dom == NULL &&
|
||||||
amd_iommu_pd_table[alias] != NULL) {
|
alias_data->domain != NULL) {
|
||||||
__attach_device(dev, amd_iommu_pd_table[alias]);
|
__attach_device(dev, alias_data->domain);
|
||||||
dom = amd_iommu_pd_table[devid];
|
dom = alias_data->domain;
|
||||||
}
|
}
|
||||||
|
|
||||||
read_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
|
read_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
|
||||||
|
@ -1473,14 +1525,12 @@ static int device_change_notifier(struct notifier_block *nb,
|
||||||
|
|
||||||
devid = get_device_id(dev);
|
devid = get_device_id(dev);
|
||||||
iommu = amd_iommu_rlookup_table[devid];
|
iommu = amd_iommu_rlookup_table[devid];
|
||||||
domain = domain_for_device(dev);
|
|
||||||
|
|
||||||
if (domain && !dma_ops_domain(domain))
|
|
||||||
WARN_ONCE(1, "AMD IOMMU WARNING: device %s already bound "
|
|
||||||
"to a non-dma-ops domain\n", dev_name(dev));
|
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case BUS_NOTIFY_UNBOUND_DRIVER:
|
case BUS_NOTIFY_UNBOUND_DRIVER:
|
||||||
|
|
||||||
|
domain = domain_for_device(dev);
|
||||||
|
|
||||||
if (!domain)
|
if (!domain)
|
||||||
goto out;
|
goto out;
|
||||||
if (iommu_pass_through)
|
if (iommu_pass_through)
|
||||||
|
@ -1488,6 +1538,11 @@ static int device_change_notifier(struct notifier_block *nb,
|
||||||
detach_device(dev);
|
detach_device(dev);
|
||||||
break;
|
break;
|
||||||
case BUS_NOTIFY_ADD_DEVICE:
|
case BUS_NOTIFY_ADD_DEVICE:
|
||||||
|
|
||||||
|
iommu_init_device(dev);
|
||||||
|
|
||||||
|
domain = domain_for_device(dev);
|
||||||
|
|
||||||
/* allocate a protection domain if a device is added */
|
/* allocate a protection domain if a device is added */
|
||||||
dma_domain = find_protection_domain(devid);
|
dma_domain = find_protection_domain(devid);
|
||||||
if (dma_domain)
|
if (dma_domain)
|
||||||
|
@ -1502,6 +1557,10 @@ static int device_change_notifier(struct notifier_block *nb,
|
||||||
spin_unlock_irqrestore(&iommu_pd_list_lock, flags);
|
spin_unlock_irqrestore(&iommu_pd_list_lock, flags);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
case BUS_NOTIFY_DEL_DEVICE:
|
||||||
|
|
||||||
|
iommu_uninit_device(dev);
|
||||||
|
|
||||||
default:
|
default:
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -2079,6 +2138,8 @@ static void prealloc_protection_domains(void)
|
||||||
if (!check_device(&dev->dev))
|
if (!check_device(&dev->dev))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
iommu_init_device(&dev->dev);
|
||||||
|
|
||||||
/* Is there already any domain for it? */
|
/* Is there already any domain for it? */
|
||||||
if (domain_for_device(&dev->dev))
|
if (domain_for_device(&dev->dev))
|
||||||
continue;
|
continue;
|
||||||
|
@ -2270,6 +2331,7 @@ static void amd_iommu_domain_destroy(struct iommu_domain *dom)
|
||||||
static void amd_iommu_detach_device(struct iommu_domain *dom,
|
static void amd_iommu_detach_device(struct iommu_domain *dom,
|
||||||
struct device *dev)
|
struct device *dev)
|
||||||
{
|
{
|
||||||
|
struct iommu_dev_data *dev_data = dev->archdata.iommu;
|
||||||
struct amd_iommu *iommu;
|
struct amd_iommu *iommu;
|
||||||
u16 devid;
|
u16 devid;
|
||||||
|
|
||||||
|
@ -2278,7 +2340,7 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,
|
||||||
|
|
||||||
devid = get_device_id(dev);
|
devid = get_device_id(dev);
|
||||||
|
|
||||||
if (amd_iommu_pd_table[devid] != NULL)
|
if (dev_data->domain != NULL)
|
||||||
detach_device(dev);
|
detach_device(dev);
|
||||||
|
|
||||||
iommu = amd_iommu_rlookup_table[devid];
|
iommu = amd_iommu_rlookup_table[devid];
|
||||||
|
@ -2293,7 +2355,7 @@ static int amd_iommu_attach_device(struct iommu_domain *dom,
|
||||||
struct device *dev)
|
struct device *dev)
|
||||||
{
|
{
|
||||||
struct protection_domain *domain = dom->priv;
|
struct protection_domain *domain = dom->priv;
|
||||||
struct protection_domain *old_domain;
|
struct iommu_dev_data *dev_data;
|
||||||
struct amd_iommu *iommu;
|
struct amd_iommu *iommu;
|
||||||
int ret;
|
int ret;
|
||||||
u16 devid;
|
u16 devid;
|
||||||
|
@ -2301,14 +2363,15 @@ static int amd_iommu_attach_device(struct iommu_domain *dom,
|
||||||
if (!check_device(dev))
|
if (!check_device(dev))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
dev_data = dev->archdata.iommu;
|
||||||
|
|
||||||
devid = get_device_id(dev);
|
devid = get_device_id(dev);
|
||||||
|
|
||||||
iommu = amd_iommu_rlookup_table[devid];
|
iommu = amd_iommu_rlookup_table[devid];
|
||||||
if (!iommu)
|
if (!iommu)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
old_domain = amd_iommu_pd_table[devid];
|
if (dev_data->domain)
|
||||||
if (old_domain)
|
|
||||||
detach_device(dev);
|
detach_device(dev);
|
||||||
|
|
||||||
ret = attach_device(dev, domain);
|
ret = attach_device(dev, domain);
|
||||||
|
|
Loading…
Reference in New Issue