From patchwork Sat Feb 22 08:07:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Liu X-Patchwork-Id: 1242397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Pgmd64b5z9sRJ for ; Sat, 22 Feb 2020 19:02:56 +1100 (AEDT) Received: from localhost ([::1]:39886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5PkT-0002DY-I8 for incoming@patchwork.ozlabs.org; Sat, 22 Feb 2020 03:02:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57413) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5Pjj-0002B6-NA for qemu-devel@nongnu.org; Sat, 22 Feb 2020 03:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5Pjh-0007zZ-NE for qemu-devel@nongnu.org; Sat, 22 Feb 2020 03:02:06 -0500 Received: from mga17.intel.com ([192.55.52.151]:49238) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j5Pjh-0007tq-Dt for qemu-devel@nongnu.org; Sat, 22 Feb 2020 03:02:05 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Feb 2020 00:01:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,471,1574150400"; d="scan'208";a="240547677" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga006.jf.intel.com with ESMTP; 22 Feb 2020 00:01:57 -0800 From: Liu Yi L To: qemu-devel@nongnu.org, alex.williamson@redhat.com, peterx@redhat.com Subject: [RFC v3.1 09/22] hw/pci: add pci_device_host_iommu_context() Date: Sat, 22 Feb 2020 00:07:10 -0800 Message-Id: <1582358843-51931-10-git-send-email-yi.l.liu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1582358843-51931-1-git-send-email-yi.l.liu@intel.com> References: <1582358843-51931-1-git-send-email-yi.l.liu@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.151 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kevin.tian@intel.com, yi.l.liu@intel.com, Yi Sun , kvm@vger.kernel.org, mst@redhat.com, jun.j.tian@intel.com, eric.auger@redhat.com, yi.y.sun@intel.com, Jacob Pan , pbonzini@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch adds pci_device_host_iommu_context() to expose HostIOMMUContext to vIOMMU emulators via pci layer. Cc: Kevin Tian Cc: Jacob Pan Cc: Peter Xu Cc: Eric Auger Cc: Yi Sun Cc: David Gibson Cc: Michael S. Tsirkin Signed-off-by: Liu Yi L --- hw/pci/pci.c | 8 ++++++++ include/hw/pci/pci.h | 1 + 2 files changed, 9 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 3166cc3..288576f 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2689,6 +2689,14 @@ AddressSpace *pci_device_iommu_address_space(PCIDevice *dev) return &address_space_memory; } +HostIOMMUContext *pci_device_host_iommu_context(PCIDevice *dev) +{ + if (dev && dev->host_iommu_fn) { + return dev->host_iommu_fn(dev); + } + return NULL; +} + void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque) { bus->iommu_fn = fn; diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index e44eefb..cb514d0 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -494,6 +494,7 @@ AddressSpace *pci_device_iommu_address_space(PCIDevice *dev); void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque); void pci_device_setup_iommu(PCIDevice *dev, PCIHostIOMMUFunc fn); void pci_device_unset_iommu(PCIDevice *dev); +HostIOMMUContext *pci_device_host_iommu_context(PCIDevice *dev); static inline void pci_set_byte(uint8_t *config, uint8_t val)