Skip to content

Commit

Permalink
x86/amd-iommu: Use dev->arch->iommu to store iommu related information
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Joerg Roedel committed Nov 27, 2009
1 parent 8793abe commit 657cbb6
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 24 deletions.
8 changes: 8 additions & 0 deletions arch/x86/include/asm/amd_iommu_types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
* DMA address space each. This struct represents one such range.
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/include/asm/device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ struct dev_archdata {
#ifdef CONFIG_X86_64
struct dma_map_ops *dma_ops;
#endif
#ifdef CONFIG_DMAR
#if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
void *iommu; /* hook for IOMMU specific extension */
#endif
};
Expand Down
109 changes: 86 additions & 23 deletions arch/x86/kernel/amd_iommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ static inline u16 get_device_id(struct device *dev)
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
* find the domain for a specific device
Expand Down Expand Up @@ -128,6 +133,35 @@ static bool check_device(struct device *dev)
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

/*
Expand Down Expand Up @@ -1346,28 +1380,39 @@ static void clear_dte_entry(u16 devid)
static int __attach_device(struct device *dev,
struct protection_domain *domain)
{
u16 devid = get_device_id(dev);
u16 alias = amd_iommu_alias_table[devid];
struct iommu_dev_data *dev_data, *alias_data;
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 */
spin_lock(&domain->lock);

/* Some sanity checks */
if (amd_iommu_pd_table[alias] != NULL &&
amd_iommu_pd_table[alias] != domain)
if (alias_data->domain != NULL &&
alias_data->domain != domain)
return -EBUSY;

if (amd_iommu_pd_table[devid] != NULL &&
amd_iommu_pd_table[devid] != domain)
if (dev_data->domain != NULL &&
dev_data->domain != domain)
return -EBUSY;

/* Do real assignment */
if (alias != devid &&
amd_iommu_pd_table[alias] == NULL)
alias_data->domain == NULL) {
alias_data->domain = 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);
}

/* ready */
spin_unlock(&domain->lock);
Expand Down Expand Up @@ -1406,10 +1451,12 @@ static void __detach_device(struct device *dev)
{
u16 devid = get_device_id(dev);
struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];
struct iommu_dev_data *dev_data = get_dev_data(dev);

BUG_ON(!iommu);

clear_dte_entry(devid);
dev_data->domain = NULL;

/*
* If we run in passthrough mode the device must be assigned to the
Expand Down Expand Up @@ -1439,18 +1486,23 @@ static void detach_device(struct device *dev)
static struct protection_domain *domain_for_device(struct device *dev)
{
struct protection_domain *dom;
struct iommu_dev_data *dev_data, *alias_data;
unsigned long flags;
u16 devid, alias;

devid = get_device_id(dev);
alias = amd_iommu_alias_table[devid];
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 NULL;

read_lock_irqsave(&amd_iommu_devtable_lock, flags);
dom = amd_iommu_pd_table[devid];
dom = dev_data->domain;
if (dom == NULL &&
amd_iommu_pd_table[alias] != NULL) {
__attach_device(dev, amd_iommu_pd_table[alias]);
dom = amd_iommu_pd_table[devid];
alias_data->domain != NULL) {
__attach_device(dev, alias_data->domain);
dom = alias_data->domain;
}

read_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
Expand All @@ -1473,21 +1525,24 @@ static int device_change_notifier(struct notifier_block *nb,

devid = get_device_id(dev);
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) {
case BUS_NOTIFY_UNBOUND_DRIVER:

domain = domain_for_device(dev);

if (!domain)
goto out;
if (iommu_pass_through)
break;
detach_device(dev);
break;
case BUS_NOTIFY_ADD_DEVICE:

iommu_init_device(dev);

domain = domain_for_device(dev);

/* allocate a protection domain if a device is added */
dma_domain = find_protection_domain(devid);
if (dma_domain)
Expand All @@ -1502,6 +1557,10 @@ static int device_change_notifier(struct notifier_block *nb,
spin_unlock_irqrestore(&iommu_pd_list_lock, flags);

break;
case BUS_NOTIFY_DEL_DEVICE:

iommu_uninit_device(dev);

default:
goto out;
}
Expand Down Expand Up @@ -2079,6 +2138,8 @@ static void prealloc_protection_domains(void)
if (!check_device(&dev->dev))
continue;

iommu_init_device(&dev->dev);

/* Is there already any domain for it? */
if (domain_for_device(&dev->dev))
continue;
Expand Down Expand Up @@ -2270,6 +2331,7 @@ static void amd_iommu_domain_destroy(struct iommu_domain *dom)
static void amd_iommu_detach_device(struct iommu_domain *dom,
struct device *dev)
{
struct iommu_dev_data *dev_data = dev->archdata.iommu;
struct amd_iommu *iommu;
u16 devid;

Expand All @@ -2278,7 +2340,7 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,

devid = get_device_id(dev);

if (amd_iommu_pd_table[devid] != NULL)
if (dev_data->domain != NULL)
detach_device(dev);

iommu = amd_iommu_rlookup_table[devid];
Expand All @@ -2293,22 +2355,23 @@ static int amd_iommu_attach_device(struct iommu_domain *dom,
struct device *dev)
{
struct protection_domain *domain = dom->priv;
struct protection_domain *old_domain;
struct iommu_dev_data *dev_data;
struct amd_iommu *iommu;
int ret;
u16 devid;

if (!check_device(dev))
return -EINVAL;

dev_data = dev->archdata.iommu;

devid = get_device_id(dev);

iommu = amd_iommu_rlookup_table[devid];
if (!iommu)
return -EINVAL;

old_domain = amd_iommu_pd_table[devid];
if (old_domain)
if (dev_data->domain)
detach_device(dev);

ret = attach_device(dev, domain);
Expand Down

0 comments on commit 657cbb6

Please sign in to comment.