mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 16:49:22 +00:00
x86, AMD IOMMU: replace DEVID macro with a function
This patch replaces the DEVID macro with a function and uses them where apropriate (also in the core code). Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Cc: iommu@lists.linux-foundation.org Cc: bhavna.sarathy@amd.com Cc: robert.richter@amd.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
83f5aac18c
commit
d591b0a3ae
3 changed files with 13 additions and 5 deletions
|
@ -664,7 +664,7 @@ static int get_device_resources(struct device *dev,
|
||||||
BUG_ON(!dev || dev->bus != &pci_bus_type || !dev->dma_mask);
|
BUG_ON(!dev || dev->bus != &pci_bus_type || !dev->dma_mask);
|
||||||
|
|
||||||
pcidev = to_pci_dev(dev);
|
pcidev = to_pci_dev(dev);
|
||||||
_bdf = (pcidev->bus->number << 8) | pcidev->devfn;
|
_bdf = calc_devid(pcidev->bus->number, pcidev->devfn);
|
||||||
|
|
||||||
/* device not translated by any IOMMU in the system? */
|
/* device not translated by any IOMMU in the system? */
|
||||||
if (_bdf >= amd_iommu_last_bdf) {
|
if (_bdf >= amd_iommu_last_bdf) {
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
/*
|
/*
|
||||||
* definitions for the ACPI scanning code
|
* definitions for the ACPI scanning code
|
||||||
*/
|
*/
|
||||||
#define DEVID(bus, devfn) (((bus) << 8) | (devfn))
|
|
||||||
#define PCI_BUS(x) (((x) >> 8) & 0xff)
|
#define PCI_BUS(x) (((x) >> 8) & 0xff)
|
||||||
#define IVRS_HEADER_LENGTH 48
|
#define IVRS_HEADER_LENGTH 48
|
||||||
|
|
||||||
|
@ -295,7 +294,7 @@ static int __init find_last_devid_on_pci(int bus, int dev, int fn, int cap_ptr)
|
||||||
u32 cap;
|
u32 cap;
|
||||||
|
|
||||||
cap = read_pci_config(bus, dev, fn, cap_ptr+MMIO_RANGE_OFFSET);
|
cap = read_pci_config(bus, dev, fn, cap_ptr+MMIO_RANGE_OFFSET);
|
||||||
update_last_devid(DEVID(MMIO_GET_BUS(cap), MMIO_GET_LD(cap)));
|
update_last_devid(calc_devid(MMIO_GET_BUS(cap), MMIO_GET_LD(cap)));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -494,8 +493,10 @@ static void __init init_iommu_from_pci(struct amd_iommu *iommu)
|
||||||
iommu->cap = read_pci_config(bus, dev, fn, cap_ptr+MMIO_CAP_HDR_OFFSET);
|
iommu->cap = read_pci_config(bus, dev, fn, cap_ptr+MMIO_CAP_HDR_OFFSET);
|
||||||
|
|
||||||
range = read_pci_config(bus, dev, fn, cap_ptr+MMIO_RANGE_OFFSET);
|
range = read_pci_config(bus, dev, fn, cap_ptr+MMIO_RANGE_OFFSET);
|
||||||
iommu->first_device = DEVID(MMIO_GET_BUS(range), MMIO_GET_FD(range));
|
iommu->first_device = calc_devid(MMIO_GET_BUS(range),
|
||||||
iommu->last_device = DEVID(MMIO_GET_BUS(range), MMIO_GET_LD(range));
|
MMIO_GET_FD(range));
|
||||||
|
iommu->last_device = calc_devid(MMIO_GET_BUS(range),
|
||||||
|
MMIO_GET_LD(range));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -332,4 +332,11 @@ static inline void print_devid(u16 devid, int nl)
|
||||||
printk("\n");
|
printk("\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* takes bus and device/function and returns the device id
|
||||||
|
* FIXME: should that be in generic PCI code? */
|
||||||
|
static inline u16 calc_devid(u8 bus, u8 devfn)
|
||||||
|
{
|
||||||
|
return (((u16)bus) << 8) | devfn;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue