diff options
author | Neil Turton <nturton@solarflare.com> | 2009-05-14 09:08:11 -0400 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-05-28 12:06:38 -0400 |
commit | 7455aab1f95f6464c5af3fbdee28744e73f38564 (patch) | |
tree | 8eb400d9e888b73c933617b24480221f20268a53 /arch/x86 | |
parent | 421f909c803d1c397f6c66b75653f238696c39ee (diff) |
amd-iommu: fix the handling of device aliases in the AMD IOMMU driver.
The devid parameter to set_dev_entry_from_acpi is the requester ID
rather than the device ID since it is used to index the IOMMU device
table. The handling of IVHD_DEV_ALIAS used to pass the device ID.
This patch fixes it to pass the requester ID.
[ Impact: fix setting the wrong req-id in acpi-table parsing ]
Signed-off-by: Neil Turton <nturton@solarflare.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index 35fc9654c7a8..53f93db54c4d 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -618,7 +618,7 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu, | |||
618 | case IVHD_DEV_ALIAS: | 618 | case IVHD_DEV_ALIAS: |
619 | devid = e->devid; | 619 | devid = e->devid; |
620 | devid_to = e->ext >> 8; | 620 | devid_to = e->ext >> 8; |
621 | set_dev_entry_from_acpi(iommu, devid, e->flags, 0); | 621 | set_dev_entry_from_acpi(iommu, devid_to, e->flags, 0); |
622 | amd_iommu_alias_table[devid] = devid_to; | 622 | amd_iommu_alias_table[devid] = devid_to; |
623 | break; | 623 | break; |
624 | case IVHD_DEV_ALIAS_RANGE: | 624 | case IVHD_DEV_ALIAS_RANGE: |