From de17be7fe7db66e7f9107c68e74f43d7a6b1da4a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 15 Oct 2012 12:59:14 +0200 Subject: [PATCH] AMD IOMMU: fix find_iommu_from_bdf_cap() The arguments passed for the "cap_offset" parameter get read from 16- bit fields, so the parameter should also have (at least) 16 bits. While fixing this I also noticed that this was yet another case where PCI segment information wasn't properly propagated, so a respective first parameter gets added to the function at once. Signed-off-by: Jan Beulich Acked-by: Wei Wang --- xen/drivers/passthrough/amd/iommu_acpi.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 0d692420aa..e217d45744 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -86,12 +86,13 @@ static void __init add_ivrs_mapping_entry( } static struct amd_iommu * __init find_iommu_from_bdf_cap( - u16 bdf, u8 cap_offset) + u16 seg, u16 bdf, u16 cap_offset) { struct amd_iommu *iommu; for_each_amd_iommu ( iommu ) - if ( (iommu->bdf == bdf) && (iommu->cap_offset == cap_offset) ) + if ( (iommu->seg == seg) && (iommu->bdf == bdf) && + (iommu->cap_offset == cap_offset) ) return iommu; return NULL; @@ -319,10 +320,11 @@ static int __init parse_ivmd_device_iommu( const struct acpi_ivrs_memory *ivmd_block, unsigned long base, unsigned long limit, u8 iw, u8 ir) { + int seg = 0; /* XXX */ struct amd_iommu *iommu; /* find target IOMMU */ - iommu = find_iommu_from_bdf_cap(ivmd_block->header.device_id, + iommu = find_iommu_from_bdf_cap(seg, ivmd_block->header.device_id, ivmd_block->aux_data); if ( !iommu ) { @@ -669,7 +671,8 @@ static int __init parse_ivhd_block(const struct acpi_ivrs_hardware *ivhd_block) return -ENODEV; } - iommu = find_iommu_from_bdf_cap(ivhd_block->header.device_id, + iommu = find_iommu_from_bdf_cap(ivhd_block->pci_segment_group, + ivhd_block->header.device_id, ivhd_block->capability_offset); if ( !iommu ) { -- 2.30.2