* [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu
@ 2011-11-11 13:48 Joerg Roedel
2011-11-11 13:52 ` David Woodhouse
0 siblings, 1 reply; 6+ messages in thread
From: Joerg Roedel @ 2011-11-11 13:48 UTC (permalink / raw)
To: David Airlie, David Woodhouse; +Cc: linux-kernel, iommu
Not sure if this is fixed already. I stumbled over it while
compile-testing merges in the IOMMU tree.
>From 7d8438f41b3cfbb1094030d7cf5d06da0fd16308 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Fri, 11 Nov 2011 14:42:53 +0100
Subject: [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu
With v3.2-rc1 the following build error occurs when Intel
IOMMU is off and Intel-GTT is on:
ERROR: "intel_iommu_gfx_mapped" [drivers/char/agp/intel-gtt.ko] undefined!
This patch fixes that.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
drivers/char/agp/intel-gtt.c | 2 +-
include/linux/intel-iommu.h | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 66cd0b8..bfe5133 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -22,6 +22,7 @@
#include <linux/pagemap.h>
#include <linux/agp_backend.h>
#include <linux/delay.h>
+#include <linux/intel-iommu.h>
#include <asm/smp.h>
#include "agp.h"
#include "intel-agp.h"
@@ -1186,7 +1187,6 @@ static void gen6_cleanup(void)
/* Certain Gen5 chipsets require require idling the GPU before
* unmapping anything from the GTT when VT-d is enabled.
*/
-extern int intel_iommu_gfx_mapped;
static inline int needs_idle_maps(void)
{
const unsigned short gpu_devid = intel_private.pcidev->device;
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index e6ca56d..651cc08 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -363,4 +363,10 @@ extern int qi_submit_sync(struct qi_desc *desc, struct intel_iommu *iommu);
extern int dmar_ir_support(void);
+#ifdef CONFIG_INTEL_IOMMU
+extern int intel_iommu_gfx_mapped;
+#else
+#define intel_iommu_gfx_mapped 1
+#endif /* CONFIG_INTEL_IOMMU */
+
#endif
--
1.7.5.4
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu
2011-11-11 13:48 [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu Joerg Roedel
@ 2011-11-11 13:52 ` David Woodhouse
2011-11-11 14:24 ` Joerg Roedel
2011-11-14 13:26 ` Joerg Roedel
0 siblings, 2 replies; 6+ messages in thread
From: David Woodhouse @ 2011-11-11 13:52 UTC (permalink / raw)
To: Joerg Roedel; +Cc: David Airlie, linux-kernel, iommu, intel-gfx
[-- Attachment #1: Type: text/plain, Size: 607 bytes --]
On Fri, 2011-11-11 at 14:48 +0100, Joerg Roedel wrote:
> +#define intel_iommu_gfx_mapped 1
That ought to be zero; if the IOMMU code isn't present, it's
*definitely* not mapped through the IOMMU :)
But I'm fairly sure this was already noticed and a patch is on its way
upstream already.
It's my fault — my original testing patches to expose this information
from the IOMMU code did put it into a header file, but when I sent it
upstream I missed that part of the patch, thus leading to the horrid
'extern int intel_iommu_gfx_mapped;' in intel-gtt.c that your patch
removes.
--
dwmw2
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5818 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu
2011-11-11 13:52 ` David Woodhouse
@ 2011-11-11 14:24 ` Joerg Roedel
2011-11-14 13:26 ` Joerg Roedel
1 sibling, 0 replies; 6+ messages in thread
From: Joerg Roedel @ 2011-11-11 14:24 UTC (permalink / raw)
To: David Woodhouse; +Cc: David Airlie, linux-kernel, iommu, intel-gfx
On Fri, Nov 11, 2011 at 01:52:33PM +0000, David Woodhouse wrote:
> On Fri, 2011-11-11 at 14:48 +0100, Joerg Roedel wrote:
> > +#define intel_iommu_gfx_mapped 1
>
> That ought to be zero; if the IOMMU code isn't present, it's
> *definitely* not mapped through the IOMMU :)
>
> But I'm fairly sure this was already noticed and a patch is on its way
> upstream already.
>
> It's my fault — my original testing patches to expose this information
> from the IOMMU code did put it into a header file, but when I sent it
> upstream I missed that part of the patch, thus leading to the horrid
> 'extern int intel_iommu_gfx_mapped;' in intel-gtt.c that your patch
> removes.
No problem, it was easy to fix :) I'll keep that patch in my out-of-tree
branch until it is fixed upstream.
Joerg
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu
2011-11-11 13:52 ` David Woodhouse
2011-11-11 14:24 ` Joerg Roedel
@ 2011-11-14 13:26 ` Joerg Roedel
2011-11-14 13:35 ` Dave Airlie
1 sibling, 1 reply; 6+ messages in thread
From: Joerg Roedel @ 2011-11-14 13:26 UTC (permalink / raw)
To: David Woodhouse; +Cc: David Airlie, linux-kernel, iommu, intel-gfx
On Fri, Nov 11, 2011 at 01:52:33PM +0000, David Woodhouse wrote:
> On Fri, 2011-11-11 at 14:48 +0100, Joerg Roedel wrote:
> > +#define intel_iommu_gfx_mapped 1
>
> That ought to be zero; if the IOMMU code isn't present, it's
> *definitely* not mapped through the IOMMU :)
Okay, I change this to 0 in my patch.
> But I'm fairly sure this was already noticed and a patch is on its way
> upstream already.
It is not yet fixed upstream. I plan to send fixes to Linus soon. Any
objection against me including this if its not fixed until then?
Joerg
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu
2011-11-14 13:26 ` Joerg Roedel
@ 2011-11-14 13:35 ` Dave Airlie
2011-11-14 14:29 ` Joerg Roedel
0 siblings, 1 reply; 6+ messages in thread
From: Dave Airlie @ 2011-11-14 13:35 UTC (permalink / raw)
To: Joerg Roedel; +Cc: David Woodhouse, linux-kernel, iommu, intel-gfx
>
> > But I'm fairly sure this was already noticed and a patch is on its way
> > upstream already.
>
> It is not yet fixed upstream. I plan to send fixes to Linus soon. Any
> objection against me including this if its not fixed until then?
Does a08185a3eb658854b29c05bcbfac0f85038ffe9f in Linus tree not fix it?
Dave.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu
2011-11-14 13:35 ` Dave Airlie
@ 2011-11-14 14:29 ` Joerg Roedel
0 siblings, 0 replies; 6+ messages in thread
From: Joerg Roedel @ 2011-11-14 14:29 UTC (permalink / raw)
To: Dave Airlie; +Cc: David Woodhouse, linux-kernel, iommu, intel-gfx
On Mon, Nov 14, 2011 at 01:35:13PM +0000, Dave Airlie wrote:
>
>
> >
> > > But I'm fairly sure this was already noticed and a patch is on its way
> > > upstream already.
> >
> > It is not yet fixed upstream. I plan to send fixes to Linus soon. Any
> > objection against me including this if its not fixed until then?
>
> Does a08185a3eb658854b29c05bcbfac0f85038ffe9f in Linus tree not fix it?
Oops, tested the wrong tree. It is fixed indeed. Sorry for the noise :)
Joerg
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-11-14 14:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-11 13:48 [PATCH] iommu/intel: Fix build failure with intel-gtt and !intel-iommu Joerg Roedel
2011-11-11 13:52 ` David Woodhouse
2011-11-11 14:24 ` Joerg Roedel
2011-11-14 13:26 ` Joerg Roedel
2011-11-14 13:35 ` Dave Airlie
2011-11-14 14:29 ` Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox