amd iommu updates for 2.6.30-rc4
Hi Ingo,
The following changes since commit 19c1a6f5764d787113fa323ffb18be7991208f82:
FUJITA Tomonori (1):
x86 gart: reimplement IOMMU_LEAK feature by using DMA_API_DEBUG
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git iommu/fixes-2.6.30
Joerg Roedel (1):
amd-iommu: fix iommu flag masks
arch/x86/kernel/amd_iommu_init.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
The patch fixes a minor issue with wrong evaluated iommu flags read from the ACPI table. Please pull.
Here is the full diff:
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 · 6 lines
| Advanced Micro Devices GmbH
Operating | Karl-Hammerschmidt-Str. 34, 85609 Dornach bei München
System |
Research | Geschäftsführer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München
| Registergericht München, HRB Nr. 43632[tip:x86/urgent] amd-iommu: fix iommu flag masks
Commit-ID: 6da7342ff1c5274c51ada084974668d10f769c16 Gitweb: http://git.kernel.org/tip/6da7342ff1c5274c51ada084974668d10f769c16 Author: Joerg Roedel <[email protected]> AuthorDate: Mon, 4 May 2009 11:44:38 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 4 May 2009 15:05:24 +0200
amd-iommu: fix iommu flag masks
The feature bits should be set via bitmasks, not via feature IDs.
[ Impact: fix feature enabling in newer IOMMU versions ]
Signed-off-by Joerg Roedel <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[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 );