From patchwork Thu Apr 8 18:58:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 91349 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o38J1AVh020024 for ; Thu, 8 Apr 2010 19:01:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933154Ab0DHTBJ (ORCPT ); Thu, 8 Apr 2010 15:01:09 -0400 Received: from acsinet11.oracle.com ([141.146.126.233]:24546 "EHLO acsinet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933036Ab0DHTBI (ORCPT ); Thu, 8 Apr 2010 15:01:08 -0400 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by acsinet11.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o38J0opv017485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Apr 2010 19:00:54 GMT Received: from acsmt354.oracle.com (acsmt354.oracle.com [141.146.40.154]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o38IIBpA010567; Thu, 8 Apr 2010 19:00:49 GMT Received: from abhmt008.oracle.com by acsmt353.oracle.com with ESMTP id 158893281270753188; Thu, 08 Apr 2010 11:59:48 -0700 Received: from localhost.localdomain (/10.6.76.26) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Apr 2010 11:59:48 -0700 From: Yinghai Lu To: Jesse Barnes , Chris Wright , David.Woodhouse@intel.com Cc: fenghua.yu@intel.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, iommu@lists.linux-foundation.org, Yinghai Lu Subject: [PATCH 1/6] pci/dmar: Don't complain that IOPAIC is not supported Date: Thu, 8 Apr 2010 11:58:22 -0700 Message-Id: <1270753107-15881-2-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1270753107-15881-1-git-send-email-yinghai@kernel.org> References: <1270753107-15881-1-git-send-email-yinghai@kernel.org> X-Source-IP: acsmt354.oracle.com [141.146.40.154] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090209.4BBE27E1.0155,ss=1,fgs=0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 08 Apr 2010 19:01:11 +0000 (UTC) diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index 33ead97..3bd013f 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c @@ -131,9 +131,13 @@ static int __init dmar_parse_dev_scope(void *start, void *end, int *cnt, if (scope->entry_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT || scope->entry_type == ACPI_DMAR_SCOPE_TYPE_BRIDGE) (*cnt)++; - else - printk(KERN_WARNING PREFIX - "Unsupported device scope\n"); + else { +#ifdef CONFIG_INTR_REMAP + if (scope->entry_type != ACPI_DMAR_SCOPE_TYPE_IOAPIC) +#endif + printk(KERN_WARNING PREFIX + "Unsupported device scope\n"); + } start += scope->length; } if (*cnt == 0)