diff mbox

iommu=pt is a valid early param

Message ID 20090730221215.4063.37889.stgit@nehalem.lart (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Alex Williamson July 30, 2009, 10:15 p.m. UTC 
This avoids a "Malformed early option 'iommu'" on boot when trying
to use pass-through mode.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

 Looks like maybe this was copied from "usedac", which seems to return 1
 because it's deprecated.

 arch/x86/kernel/pci-dma.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Jesse Barnes Aug. 10, 2009, 4:27 p.m. UTC | #1 
On Thu, 30 Jul 2009 16:15:18 -0600
Alex Williamson <alex.williamson@hp.com> wrote:

> This avoids a "Malformed early option 'iommu'" on boot when trying
> to use pass-through mode.
> 
> Signed-off-by: Alex Williamson <alex.williamson@hp.com>
> ---
> 
>  Looks like maybe this was copied from "usedac", which seems to
> return 1 because it's deprecated.
> 
>  arch/x86/kernel/pci-dma.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
> index 1a041bc..ae13e34 100644
> --- a/arch/x86/kernel/pci-dma.c
> +++ b/arch/x86/kernel/pci-dma.c
> @@ -212,10 +212,8 @@ static __init int iommu_setup(char *p)
>  		if (!strncmp(p, "soft", 4))
>  			swiotlb = 1;
>  #endif
> -		if (!strncmp(p, "pt", 2)) {
> +		if (!strncmp(p, "pt", 2))
>  			iommu_pass_through = 1;
> -			return 1;
> -		}
>  
>  		gart_parse_options(p);

Applied to linux-next, thanks.
David Woodhouse Aug. 10, 2009, 9:07 p.m. UTC | #2 
On Mon, 2009-08-10 at 09:27 -0700, Jesse Barnes wrote:
> Applied to linux-next, thanks.

It's already in the iommu-2.6.git tree.
Jesse Barnes Aug. 10, 2009, 9:40 p.m. UTC | #3 
On Mon, 10 Aug 2009 22:07:35 +0100
David Woodhouse <dwmw2@infradead.org> wrote:

> On Mon, 2009-08-10 at 09:27 -0700, Jesse Barnes wrote:
> > Applied to linux-next, thanks.
> 
> It's already in the iommu-2.6.git tree.

Should be harmless; I can drop it though if you want.
diff mbox

Patch

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 1a041bc..ae13e34 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -212,10 +212,8 @@  static __init int iommu_setup(char *p)
 		if (!strncmp(p, "soft", 4))
 			swiotlb = 1;
 #endif
-		if (!strncmp(p, "pt", 2)) {
+		if (!strncmp(p, "pt", 2))
 			iommu_pass_through = 1;
-			return 1;
-		}
 
 		gart_parse_options(p);