From patchwork Thu Jul 30 22:15:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 38404 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6UMH7lW006513 for ; Thu, 30 Jul 2009 22:17:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752525AbZG3WQ3 (ORCPT ); Thu, 30 Jul 2009 18:16:29 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752568AbZG3WQ2 (ORCPT ); Thu, 30 Jul 2009 18:16:28 -0400 Received: from g5t0008.atlanta.hp.com ([15.192.0.45]:12814 "EHLO g5t0008.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751997AbZG3WQ1 (ORCPT ); Thu, 30 Jul 2009 18:16:27 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g5t0008.atlanta.hp.com (Postfix) with ESMTP id DFADE24137; Thu, 30 Jul 2009 22:16:27 +0000 (UTC) Received: from ldl.fc.hp.com (ldl.fc.hp.com [15.11.146.30]) by g1t0038.austin.hp.com (Postfix) with ESMTP id 7793E30041; Thu, 30 Jul 2009 22:16:27 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl.fc.hp.com (Postfix) with ESMTP id 25FB339C007; Thu, 30 Jul 2009 16:16:27 -0600 (MDT) X-Virus-Scanned: Debian amavisd-new at ldl.fc.hp.com Received: from ldl.fc.hp.com ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1wL6X-mRJQ8A; Thu, 30 Jul 2009 16:16:26 -0600 (MDT) Received: from nehalem.lart (lart.fc.hp.com [15.11.146.31]) by ldl.fc.hp.com (Postfix) with ESMTP id 196E139C003; Thu, 30 Jul 2009 16:16:26 -0600 (MDT) From: Alex Williamson Subject: [PATCH] iommu=pt is a valid early param To: dwmw2@infradead.org, jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org, iommu@lists.linux-foundation.org, alex.williamson@hp.com Date: Thu, 30 Jul 2009 16:15:18 -0600 Message-ID: <20090730221215.4063.37889.stgit@nehalem.lart> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This avoids a "Malformed early option 'iommu'" on boot when trying to use pass-through mode. Signed-off-by: Alex Williamson --- 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 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);