* [PATCH] amd-iommu: fix iommu flag masks
@ 2009-05-04 10:11 Joerg Roedel
2009-05-04 23:01 ` [stable] " Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Joerg Roedel @ 2009-05-04 10:11 UTC (permalink / raw)
To: stable; +Cc: linux-kernel, Joerg Roedel
Impact: fix initialization of iommu flags
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kernel/amd_iommu_init.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 42c33ce..8c0be09 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -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);
--
1.6.2.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [stable] [PATCH] amd-iommu: fix iommu flag masks
2009-05-04 10:11 [PATCH] amd-iommu: fix iommu flag masks Joerg Roedel
@ 2009-05-04 23:01 ` Greg KH
2009-05-05 10:21 ` Joerg Roedel
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2009-05-04 23:01 UTC (permalink / raw)
To: Joerg Roedel; +Cc: stable, linux-kernel
On Mon, May 04, 2009 at 12:11:47PM +0200, Joerg Roedel wrote:
> Impact: fix initialization of iommu flags
>
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [stable] [PATCH] amd-iommu: fix iommu flag masks
2009-05-04 23:01 ` [stable] " Greg KH
@ 2009-05-05 10:21 ` Joerg Roedel
2009-05-05 14:55 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Joerg Roedel @ 2009-05-05 10:21 UTC (permalink / raw)
To: Greg KH; +Cc: stable, linux-kernel
On Mon, May 04, 2009 at 04:01:47PM -0700, Greg KH wrote:
> On Mon, May 04, 2009 at 12:11:47PM +0200, Joerg Roedel wrote:
> > Impact: fix initialization of iommu flags
> >
> > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
>
> 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
--
| 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [stable] [PATCH] amd-iommu: fix iommu flag masks
2009-05-05 10:21 ` Joerg Roedel
@ 2009-05-05 14:55 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2009-05-05 14:55 UTC (permalink / raw)
To: Joerg Roedel; +Cc: stable, linux-kernel
On Tue, May 05, 2009 at 12:21:37PM +0200, Joerg Roedel wrote:
> On Mon, May 04, 2009 at 04:01:47PM -0700, Greg KH wrote:
> > On Mon, May 04, 2009 at 12:11:47PM +0200, Joerg Roedel wrote:
> > > Impact: fix initialization of iommu flags
> > >
> > > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> >
> > 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 stable@kernel.org when it goes into Linus's tree, so
we know to apply it then.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-05-05 21:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-04 10:11 [PATCH] amd-iommu: fix iommu flag masks Joerg Roedel
2009-05-04 23:01 ` [stable] " Greg KH
2009-05-05 10:21 ` Joerg Roedel
2009-05-05 14:55 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.