amd-iommu: fix iommu flag masks
PATCH 1/1 amd-iommu: fix iommu flag masks
Impact: fix initialization of iommu flags
Signed-off-by Joerg Roedel <[email protected]>
--- arch/x86/kernel/amd_iommu_init.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
arch/x86/kernel/amd_iommu_init.c +8 -8
@@ -49,10 +49,10 @@#define IVHD_DEV_EXT_SELECT 0x46#define IVHD_DEV_EXT_SELECT_RANGE 0x47 -#define IVHD_FLAG_HT_TUN_EN 0x00 -#define IVHD_FLAG_PASSPW_EN 0x01 -#define IVHD_FLAG_RESPASSPW_EN 0x02 -#define IVHD_FLAG_ISOC_EN 0x03 +#define IVHD_FLAG_HT_TUN_EN_MASK 0x01 +#define IVHD_FLAG_PASSPW_EN_MASK 0x02 +#define IVHD_FLAG_RESPASSPW_EN_MASK 0x04 +#define IVHD_FLAG_ISOC_EN_MASK 0x08#define IVMD_FLAG_EXCL_RANGE 0x08#define IVMD_FLAG_UNITY_MAP 0x01
@@ -569,19 +569,19 @@ static void __init init_iommu_from_acpi(struct amd_iommu *iommu,* First set the recommended feature enable bits from ACPI * into the IOMMU control registers */ - h->flags &IVHD_FLAG_HT_TUN_EN ? + h->flags &IVHD_FLAG_HT_TUN_EN_MASK ?iommu_feature_enable (iommu,CONTROL_HT_TUN_EN ) :iommu_feature_disable (iommu,CONTROL_HT_TUN_EN ); - h->flags &IVHD_FLAG_PASSPW_EN ? + h->flags &IVHD_FLAG_PASSPW_EN_MASK ?iommu_feature_enable (iommu,CONTROL_PASSPW_EN ) :iommu_feature_disable (iommu,CONTROL_PASSPW_EN ); - h->flags &IVHD_FLAG_RESPASSPW_EN ? + h->flags &IVHD_FLAG_RESPASSPW_EN_MASK ?iommu_feature_enable (iommu,CONTROL_RESPASSPW_EN ) :iommu_feature_disable (iommu,CONTROL_RESPASSPW_EN ); - h->flags &IVHD_FLAG_ISOC_EN ? + h->flags &IVHD_FLAG_ISOC_EN_MASK ?iommu_feature_enable (iommu,CONTROL_ISOC_EN ) :iommu_feature_disable (iommu,CONTROL_ISOC_EN );
Signature · 1 line
1.6.2.4
Quoted 3 lines · Joerg Roedel
Impact: fix initialization of iommu flags
Signed-off-by Joerg Roedel <[email protected]>
This patch does not look to be in Linus's tree yet.
What is the plan for it to get there?
thanks,
greg k-h
Quoted 8 lines · Greg KH
Quoted 3 lines · Joerg Roedel
Impact: fix initialization of iommu flags
Signed-off-by Joerg Roedel <[email protected]>This patch does not look to be in Linus's tree yet.
What is the plan for it to get there?
I sent it to Ingo for 2.6.30. I think it will be upstream soon.
Joerg
Signature · 6 lines
| 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. 43632Quoted 11 lines · Joerg Roedel
Quoted 8 lines · Greg KH
Quoted 3 lines · Joerg Roedel
Impact: fix initialization of iommu flags
Signed-off-by Joerg Roedel <[email protected]>This patch does not look to be in Linus's tree yet.
What is the plan for it to get there?
I sent it to Ingo for 2.6.30. I think it will be upstream soon.
Please send it to [email protected] when it goes into Linus's tree, so we know to apply it then.
thanks,
greg k-h