Re: [PATCH 01/34] AMD IOMMU: add Kconfig entry

[Ingo Molnar]

* FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> wrote:

> On Wed, 9 Jul 2008 10:48:37 +0200
> Ingo Molnar <mingo@xxxxxxx> wrote:
> 
> > 
> > * Pavel Machek <pavel@xxxxxxx> wrote:
> > 
> > > > +config AMD_IOMMU
> > > > +	bool "AMD IOMMU support"
> > > > +	select SWIOTL
> > > 
> > > SWIOTLB?
> > 
> > yep, that typo got already fixed via the patch below.
> > 
> > 	Ingo
> > 
> > --------------->
> > commit 07c40e8a1acdb56fca485a6deeb252ebf19509a1
> > Author: Ingo Molnar <mingo@xxxxxxx>
> > Date:   Fri Jun 27 11:31:28 2008 +0200
> > 
> >     x86, AMD IOMMU: build fix #3
> >     
> >     fix typo causing:
> >     
> >     arch/x86/kernel/built-in.o: In function `__unmap_single':
> >     amd_iommu.c:(.text+0x17771): undefined reference to `iommu_area_free'
> >     arch/x86/kernel/built-in.o: In function `__map_single':
> >     amd_iommu.c:(.text+0x1797a): undefined reference to `iommu_area_alloc'
> >     amd_iommu.c:(.text+0x179a2): undefined reference to `iommu_area_alloc'
> >     
> >     Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
> > 
> > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> > index 62a2820..8aae462 100644
> > --- a/arch/x86/Kconfig
> > +++ b/arch/x86/Kconfig
> > @@ -551,7 +551,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
> >  
> >  config AMD_IOMMU
> >  	bool "AMD IOMMU support"
> > -	select SWIOTL
> > +	select SWIOTLB
> >  	depends on X86_64 && PCI && ACPI
> >  	help
> >  	  Select this to get support for AMD IOMMU hardware in your system.
> 
> This fix is fine though the explicit fix is that AMD_IOMMU depends on
> IOMMU_HELPER since they are the IOMMU helper functions. SWIOTLB
> requires IOMMU_HELPER so declaring that AMD_IOMMU depends on SWIOTLB
> properly fixes the problems.
> 
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index f98e1c3..4d85501 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -579,7 +579,7 @@ config SWIOTLB
>  	  3 GB of memory. If unsure, say Y.
>  
>  config IOMMU_HELPER
> -	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
> +	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)

applied to tip/x86/core - thanks.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/