AMD IOMMU: include amd_iommu_last_bdf in device initialization
PATCH 1/1 AMD IOMMU: include amd_iommu_last_bdf in device initialization
All the values read while searching for amd_iommu_last_bdf are defined as inclusive. Let the code handle this value as such. Found by Wei Wang. Thanks Wei.
Cc Wei Wang <[email protected]>
Signed-off-by Joerg Roedel <[email protected]>
--- arch/x86/kernel/amd_iommu.c | 4 ++-- arch/x86/kernel/amd_iommu_init.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/kernel/amd_iommu.c +2 -2
@@ -667,7 +667,7 @@ static int get_device_resources(struct device *dev, _bdf =calc_devid (pcidev->bus->number, pcidev->devfn);/* device not translated by any IOMMU in the system? */ -if (_bdf >= amd_iommu_last_bdf) { +if (_bdf > amd_iommu_last_bdf) { *iommu =NULL ; *domain =NULL ; *bdf =0xffff ;
@@ -1085,7 +1085,7 @@ void prealloc_protection_domains(void)while ((dev =pci_get_device (PCI_ANY_ID ,PCI_ANY_ID , dev)) !=NULL ) { devid = (dev->bus->number <<8 ) | dev->devfn; -if (devid >= amd_iommu_last_bdf) +if (devid > amd_iommu_last_bdf)continue ; devid = amd_iommu_alias_table[devid];if (domain_for_device (devid))
arch/x86/kernel/amd_iommu_init.c +2 -2
@@ -732,7 +732,7 @@ static int __init init_exclusion_range(struct ivmd_header *m)set_device_exclusion_range (m->devid, m);break ;case ACPI_IVMD_TYPE_ALL : -for (i =0 ; i < amd_iommu_last_bdf; ++i) +for (i =0 ; i <= amd_iommu_last_bdf; ++i)set_device_exclusion_range (i, m);break ;case ACPI_IVMD_TYPE_RANGE :
@@ -934,7 +934,7 @@ int __init amd_iommu_init(void)/* * let all alias entries point to itself */ -for (i =0 ; i < amd_iommu_last_bdf; ++i) +for (i =0 ; i <= amd_iommu_last_bdf; ++i) amd_iommu_alias_table[i] = i;/*
Signature · 1 line
1.5.3.7
Ingo Molnar
AppliedQuoted 3 lines · Joerg Roedel
All the values read while searching for
amd_iommu_last_bdfare defined as inclusive. Let the code handle this value as such. Found by Wei Wang. Thanks Wei.
applied to tip/x86/urgent, thanks Joerg.
Ingo