redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

iommu/amd: Remove calc_devid() and use PCI_DEVID() from PCI

Browse source 
Change to remove calc_devid() and use PCI_DEVID() from PCI instead.

Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
This commit is contained in:
Shuah Khan 2013-02-27 17:07:30 -07:00 committed by Bjorn Helgaas
parent c5081cd7a2
commit 6f2729bab2
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/iommu/amd_iommu.c
View file

@ -173,7 +173,7 @@ static inline u16 get_device_id(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
return calc_devid(pdev->bus->number, pdev->devfn); return PCI_DEVID(pdev->bus->number, pdev->devfn);
} }
static struct iommu_dev_data *get_dev_data(struct device *dev) static struct iommu_dev_data *get_dev_data(struct device *dev)

6
drivers/iommu/amd_iommu_init.c
View file

@ -406,7 +406,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(calc_devid(MMIO_GET_BUS(cap), MMIO_GET_LD(cap))); update_last_devid(PCI_DEVID(MMIO_GET_BUS(cap), MMIO_GET_LD(cap)));
return 0; return 0;
} }
@ -1128,9 +1128,9 @@ static int iommu_init_pci(struct amd_iommu *iommu)
pci_read_config_dword(iommu->dev, cap_ptr + MMIO_MISC_OFFSET, pci_read_config_dword(iommu->dev, cap_ptr + MMIO_MISC_OFFSET,
&misc); &misc);
iommu->first_device = calc_devid(MMIO_GET_BUS(range), iommu->first_device = PCI_DEVID(MMIO_GET_BUS(range),
MMIO_GET_FD(range)); MMIO_GET_FD(range));
iommu->last_device = calc_devid(MMIO_GET_BUS(range), iommu->last_device = PCI_DEVID(MMIO_GET_BUS(range),
MMIO_GET_LD(range)); MMIO_GET_LD(range));
if (!(iommu->cap & (1 << IOMMU_CAP_IOTLB))) if (!(iommu->cap & (1 << IOMMU_CAP_IOTLB)))

7
drivers/iommu/amd_iommu_types.h
View file

@ -701,13 +701,6 @@ extern int amd_iommu_max_glx_val;
*/ */
extern void iommu_flush_all_caches(struct amd_iommu *iommu); extern void iommu_flush_all_caches(struct amd_iommu *iommu);
/* 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;
}
static inline int get_ioapic_devid(int id) static inline int get_ioapic_devid(int id)
{ {
struct devid_map *entry; struct devid_map *entry;