From: "Xu, Quan" <quan.xu@intel.com> To: xen-devel@lists.xen.org Cc: Kevin Tian <kevin.tian@intel.com>, dario.faggioli@citrix.com, Feng Wu <feng.wu@intel.com>, Jan Beulich <jbeulich@suse.com>, Quan Xu <quan.xu@intel.com> Subject: [PATCH v7 10/11] vt-d: propagate the IOMMU Device-TLB flush error up to ME phantom functions Date: Wed, 8 Jun 2016 16:59:03 +0800 [thread overview] Message-ID: <1465376344-28290-11-git-send-email-quan.xu@intel.com> (raw) In-Reply-To: <1465376344-28290-1-git-send-email-quan.xu@intel.com> From: Quan Xu <quan.xu@intel.com> Signed-off-by: Quan Xu <quan.xu@intel.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> CC: Jan Beulich <jbeulich@suse.com> CC: Kevin Tian <kevin.tian@intel.com> CC: Feng Wu <feng.wu@intel.com> --- xen/drivers/passthrough/vtd/extern.h | 3 ++- xen/drivers/passthrough/vtd/iommu.c | 8 ++++---- xen/drivers/passthrough/vtd/quirks.c | 27 +++++++++++++++++---------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index cbe0286..6772839 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -91,7 +91,8 @@ int is_igd_vt_enabled_quirk(void); void platform_quirks_init(void); void vtd_ops_preamble_quirk(struct iommu* iommu); void vtd_ops_postamble_quirk(struct iommu* iommu); -void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map); +int __must_check me_wifi_quirk(struct domain *domain, + u8 bus, u8 devfn, int map); void pci_vtd_quirk(const struct pci_dev *); bool_t platform_supports_intremap(void); bool_t platform_supports_x2apic(void); diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 2a55985..8ad862e 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1470,8 +1470,8 @@ int domain_context_mapping_one( unmap_vtd_domain_page(context_entries); - if ( !seg ) - me_wifi_quirk(domain, bus, devfn, MAP_ME_PHANTOM_FUNC); + if ( !seg && !rc ) + rc = me_wifi_quirk(domain, bus, devfn, MAP_ME_PHANTOM_FUNC); return rc; } @@ -1630,8 +1630,8 @@ int domain_context_unmap_one( spin_unlock(&iommu->lock); unmap_vtd_domain_page(context_entries); - if ( !iommu->intel->drhd->segment ) - me_wifi_quirk(domain, bus, devfn, UNMAP_ME_PHANTOM_FUNC); + if ( !iommu->intel->drhd->segment && !rc ) + rc = me_wifi_quirk(domain, bus, devfn, UNMAP_ME_PHANTOM_FUNC); return rc; } diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 473d1fc..91f96ac 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -331,10 +331,12 @@ void __init platform_quirks_init(void) * assigning Intel integrated wifi device to a guest. */ -static void map_me_phantom_function(struct domain *domain, u32 dev, int map) +static int __must_check map_me_phantom_function(struct domain *domain, + u32 dev, int map) { struct acpi_drhd_unit *drhd; struct pci_dev *pdev; + int rc; /* find ME VT-d engine base on a real ME device */ pdev = pci_get_pdev(0, 0, PCI_DEVFN(dev, 0)); @@ -342,23 +344,26 @@ static void map_me_phantom_function(struct domain *domain, u32 dev, int map) /* map or unmap ME phantom function */ if ( map ) - domain_context_mapping_one(domain, drhd->iommu, 0, - PCI_DEVFN(dev, 7), NULL); + rc = domain_context_mapping_one(domain, drhd->iommu, 0, + PCI_DEVFN(dev, 7), NULL); else - domain_context_unmap_one(domain, drhd->iommu, 0, - PCI_DEVFN(dev, 7)); + rc = domain_context_unmap_one(domain, drhd->iommu, 0, + PCI_DEVFN(dev, 7)); + + return rc; } -void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map) +int me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map) { u32 id; + int rc = 0; id = pci_conf_read32(0, 0, 0, 0, 0); if ( IS_CTG(id) ) { /* quit if ME does not exist */ if ( pci_conf_read32(0, 0, 3, 0, 0) == 0xffffffff ) - return; + return 0; /* if device is WLAN device, map ME phantom device 0:3.7 */ id = pci_conf_read32(0, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), 0); @@ -372,7 +377,7 @@ void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map) case 0x423b8086: case 0x423c8086: case 0x423d8086: - map_me_phantom_function(domain, 3, map); + rc = map_me_phantom_function(domain, 3, map); break; default: break; @@ -382,7 +387,7 @@ void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map) { /* quit if ME does not exist */ if ( pci_conf_read32(0, 0, 22, 0, 0) == 0xffffffff ) - return; + return 0; /* if device is WLAN device, map ME phantom device 0:22.7 */ id = pci_conf_read32(0, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), 0); @@ -398,12 +403,14 @@ void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map) case 0x42388086: /* Puma Peak */ case 0x422b8086: case 0x422c8086: - map_me_phantom_function(domain, 22, map); + rc = map_me_phantom_function(domain, 22, map); break; default: break; } } + + return rc; } void pci_vtd_quirk(const struct pci_dev *pdev) -- 1.9.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-08 8:59 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-08 8:58 [PATCH v7 00/11] Check VT-d Device-TLB flush error Xu, Quan 2016-06-08 8:58 ` [PATCH v7 01/11] IOMMU: handle IOMMU mapping and unmapping failures Xu, Quan 2016-06-08 8:58 ` [PATCH v7 02/11] IOMMU/MMU: enhance the call trees of IOMMU unmapping and mapping Xu, Quan 2016-06-08 14:40 ` Jan Beulich [not found] ` <57584D8602000078000F32D0@prv-mh.provo.novell.com> [not found] ` <421857ad-4f6b-e99c-1e81-034b19effdfb@amd.com> 2016-06-10 6:56 ` Jan Beulich 2016-06-12 6:41 ` Tian, Kevin 2016-06-08 8:58 ` [PATCH v7 03/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU unmapping (top level ones) Xu, Quan 2016-06-08 14:42 ` Jan Beulich 2016-06-08 14:54 ` Jan Beulich 2016-06-09 19:30 ` Suravee Suthikulanit 2016-06-09 10:28 ` Julien Grall 2016-06-08 8:58 ` [PATCH v7 04/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU mapping " Xu, Quan 2016-06-08 14:43 ` Jan Beulich 2016-06-09 18:45 ` Suravee Suthikulanit 2016-06-09 10:30 ` Julien Grall 2016-06-08 8:58 ` [PATCH v7 05/11] IOMMU/MMU: propagate IOMMU Device-TLB flush error up to iommu_iotlb_flush{, _all} " Xu, Quan 2016-06-09 11:12 ` Julien Grall 2016-06-09 11:45 ` Jan Beulich 2016-06-09 12:03 ` Julien Grall 2016-06-09 12:08 ` Julien Grall 2016-06-09 12:15 ` Jan Beulich 2016-06-09 12:24 ` Julien Grall 2016-06-09 12:32 ` Jan Beulich 2016-06-09 12:39 ` Julien Grall 2016-06-12 6:55 ` Tian, Kevin 2016-06-12 7:02 ` Xu, Quan 2016-06-12 15:35 ` Julien Grall 2016-06-09 12:14 ` Jan Beulich 2016-06-12 6:46 ` Tian, Kevin 2016-06-08 8:58 ` [PATCH v7 06/11] propagate IOMMU Device-TLB flush error up to EPT update " Xu, Quan 2016-06-08 8:59 ` [PATCH v7 07/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU suspending " Xu, Quan 2016-06-08 14:51 ` Jan Beulich 2016-06-12 7:42 ` Xu, Quan 2016-06-13 9:25 ` Jan Beulich 2016-06-09 18:58 ` Suravee Suthikulanit 2016-06-12 6:58 ` Tian, Kevin 2016-06-08 8:59 ` [PATCH v7 08/11] IOMMU: propagate IOMMU Device-TLB flush error (leaf ones) Xu, Quan 2016-06-08 8:59 ` [PATCH v7 09/11] vt-d: fix the IOMMU flush issue Xu, Quan 2016-06-12 7:32 ` Tian, Kevin 2016-06-12 9:27 ` Xu, Quan 2016-06-13 8:50 ` Xu, Quan 2016-06-08 8:59 ` Xu, Quan [this message] 2016-06-12 7:34 ` [PATCH v7 10/11] vt-d: propagate the IOMMU Device-TLB flush error up to ME phantom functions Tian, Kevin 2016-06-08 8:59 ` [PATCH v7 11/11] vt-d: add __must_check annotation to IOMMU flush pointers and handlers Xu, Quan 2016-06-12 7:35 ` Tian, Kevin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1465376344-28290-11-git-send-email-quan.xu@intel.com \ --to=quan.xu@intel.com \ --cc=dario.faggioli@citrix.com \ --cc=feng.wu@intel.com \ --cc=jbeulich@suse.com \ --cc=kevin.tian@intel.com \ --cc=xen-devel@lists.xen.org \ --subject='Re: [PATCH v7 10/11] vt-d: propagate the IOMMU Device-TLB flush error up to ME phantom functions' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).