[PATCH] Fixed the handling of device aliases in the AMD IOMMU driver.

[PATCH] Fixed the handling of device aliases in the AMD IOMMU driver.

[Neil Turton]

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.

Signed-off-by: Neil Turton <nturton@solarflare.com>
---
 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 61479ba..c013906 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,
 		case IVHD_DEV_ALIAS:
 			devid = e->devid;
 			devid_to = e->ext >> 8;
-			set_dev_entry_from_acpi(iommu, devid, e->flags, 0);
+			set_dev_entry_from_acpi(iommu, devid_to, e->flags, 0);
 			amd_iommu_alias_table[devid] = devid_to;
 			break;
 		case IVHD_DEV_ALIAS_RANGE:
-- 
1.5.5

Re: [PATCH] Fixed the handling of device aliases in the AMD IOMMU driver.

[Roedel, Joerg]

On Thu, May 14, 2009 at 02:08:11PM +0100, Neil Turton wrote:
> 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.
> 
> Signed-off-by: Neil Turton <nturton@solarflare.com>
> ---
>  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 61479ba..c013906 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,
>  		case IVHD_DEV_ALIAS:
>  			devid = e->devid;
>  			devid_to = e->ext >> 8;
> -			set_dev_entry_from_acpi(iommu, devid, e->flags, 0);
> +			set_dev_entry_from_acpi(iommu, devid_to, e->flags, 0);
>  			amd_iommu_alias_table[devid] = devid_to;
>  			break;
>  		case IVHD_DEV_ALIAS_RANGE:

Applied too, thanks.

-- 
           | Advanced Micro Devices GmbH
 Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München
 System    | 
 Research  | Geschäftsführer: Thomas M. McCoy, Giuliano Meroni
 Center    | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
           | Registergericht München, HRB Nr. 43632