From patchwork Thu Apr 8 20:52:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai X-Patchwork-Id: 91510 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 o38KsBZH017339 for ; Thu, 8 Apr 2010 20:54:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933404Ab0DHUyK (ORCPT ); Thu, 8 Apr 2010 16:54:10 -0400 Received: from acsinet12.oracle.com ([141.146.126.234]:20203 "EHLO acsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933389Ab0DHUyJ (ORCPT ); Thu, 8 Apr 2010 16:54:09 -0400 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by acsinet12.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id o38KrtK0020708 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 8 Apr 2010 20:53:56 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id o38JpMZA031094; Thu, 8 Apr 2010 20:53:45 GMT Received: from abhmt020.oracle.com by acsmt355.oracle.com with ESMTP id 159271771270760020; Thu, 08 Apr 2010 13:53:40 -0700 Received: from [129.146.63.93] (/129.146.63.93) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 08 Apr 2010 13:53:39 -0700 Message-ID: <4BBE4209.3080900@oracle.com> Date: Thu, 08 Apr 2010 13:52:25 -0700 From: Yinghai User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100228 SUSE/3.0.3-1.1.1 Thunderbird/3.0.3 MIME-Version: 1.0 To: Roland Dreier CC: Jesse Barnes , Chris Wright , David.Woodhouse@intel.com, fenghua.yu@intel.com, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, iommu@lists.linux-foundation.org Subject: Re: [PATCH 4/6] pci/dmar/sriov: use physfn to search drhd for VF References: <1270753107-15881-1-git-send-email-yinghai@kernel.org> <1270753107-15881-5-git-send-email-yinghai@kernel.org> In-Reply-To: X-Source-IP: acsmt353.oracle.com [141.146.40.153] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090208.4BBE425A.00A1:SCFMA4539814,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 20:54:12 +0000 (UTC) Index: linux-2.6/drivers/pci/dmar.c =================================================================== --- linux-2.6.orig/drivers/pci/dmar.c +++ linux-2.6/drivers/pci/dmar.c @@ -534,6 +534,8 @@ dmar_find_matched_drhd_unit(struct pci_d struct dmar_drhd_unit *dmaru = NULL; struct acpi_dmar_hardware_unit *drhd; + dev = pci_physfn(dev); + list_for_each_entry(dmaru, &dmar_drhd_units, list) { drhd = container_of(dmaru->hdr, struct acpi_dmar_hardware_unit, Index: linux-2.6/include/linux/pci.h =================================================================== --- linux-2.6.orig/include/linux/pci.h +++ linux-2.6/include/linux/pci.h @@ -334,6 +334,16 @@ struct pci_dev { #endif }; +static inline struct pci_dev *pci_physfn(struct pci_dev *dev) +{ +#ifdef CONFIG_PCI_IOV + if (dev->is_virtfn) + dev = dev->physfn; +#endif + + return dev; +} + extern struct pci_dev *alloc_pci_dev(void); #define pci_dev_b(n) list_entry(n, struct pci_dev, bus_list)