From: Joerg Roedel <joerg.roedel@amd.com>
To: <iommu@lists.linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
Alex Williamson <alex.williamson@redhat.com>,
Ohad Ben-Cohen <ohad@wizery.com>,
David Woodhouse <dwmw2@infradead.org>,
David Brown <davidb@codeaurora.org>, <joro@8bytes.org>,
<linux-kernel@vger.kernel.org>,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 04/10] iommu/core: Convert iommu_found to iommu_present
Date: Fri, 23 Sep 2011 17:45:50 +0200 [thread overview]
Message-ID: <1316792756-3395-5-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1316792756-3395-1-git-send-email-joerg.roedel@amd.com>
With per-bus iommu_ops the iommu_found function needs to
work on a bus_type too. This patch adds a bus_type parameter
to that function and converts all call-places.
The function is also renamed to iommu_present because the
function now checks if an iommu is present for a given bus
and does not check for a global iommu anymore.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/ia64/kvm/kvm-ia64.c | 3 ++-
arch/x86/kvm/x86.c | 3 ++-
drivers/iommu/iommu.c | 9 ++++++---
include/linux/iommu.h | 4 ++--
virt/kvm/iommu.c | 2 +-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 8213efe..43f4c92 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -33,6 +33,7 @@
#include <linux/uaccess.h>
#include <linux/iommu.h>
#include <linux/intel-iommu.h>
+#include <linux/pci.h>
#include <asm/pgtable.h>
#include <asm/gcc_intrin.h>
@@ -204,7 +205,7 @@ int kvm_dev_ioctl_check_extension(long ext)
r = KVM_COALESCED_MMIO_PAGE_OFFSET;
break;
case KVM_CAP_IOMMU:
- r = iommu_found();
+ r = iommu_present(&pci_bus_type);
break;
default:
r = 0;
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 84a28ea..73c6a42 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -44,6 +44,7 @@
#include <linux/perf_event.h>
#include <linux/uaccess.h>
#include <linux/hash.h>
+#include <linux/pci.h>
#include <trace/events/kvm.h>
#define CREATE_TRACE_POINTS
@@ -2095,7 +2096,7 @@ int kvm_dev_ioctl_check_extension(long ext)
r = 0;
break;
case KVM_CAP_IOMMU:
- r = iommu_found();
+ r = iommu_present(&pci_bus_type);
break;
case KVM_CAP_MCE:
r = KVM_MAX_MCE_BANKS;
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 46e1c24..ad8ce1a 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -66,11 +66,14 @@ int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops)
}
EXPORT_SYMBOL_GPL(bus_set_iommu);
-bool iommu_found(void)
+bool iommu_present(struct bus_type *bus)
{
- return iommu_ops != NULL;
+ if (bus->iommu_ops != NULL)
+ return true;
+ else
+ return iommu_ops != NULL;
}
-EXPORT_SYMBOL_GPL(iommu_found);
+EXPORT_SYMBOL_GPL(iommu_present);
struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index c78d068..f56e559 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -56,7 +56,7 @@ struct iommu_ops {
extern void register_iommu(struct iommu_ops *ops);
extern int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops);
-extern bool iommu_found(void);
+extern bool iommu_present(struct bus_type *bus);
extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus);
extern void iommu_domain_free(struct iommu_domain *domain);
extern int iommu_attach_device(struct iommu_domain *domain,
@@ -76,7 +76,7 @@ extern int iommu_domain_has_cap(struct iommu_domain *domain,
struct iommu_ops {};
-static inline bool iommu_found(void)
+static inline bool iommu_present(struct bus_type *bus)
{
return false;
}
diff --git a/virt/kvm/iommu.c b/virt/kvm/iommu.c
index 20115b1..d149940 100644
--- a/virt/kvm/iommu.c
+++ b/virt/kvm/iommu.c
@@ -228,7 +228,7 @@ int kvm_iommu_map_guest(struct kvm *kvm)
{
int r;
- if (!iommu_found()) {
+ if (!iommu_present(&pci_bus_type)) {
printk(KERN_ERR "%s: iommu not found\n", __func__);
return -ENODEV;
}
--
1.7.4.1
next prev parent reply other threads:[~2011-09-23 15:48 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-23 15:45 [PATCH 0/10 v3] IOMMU: Make iommu_ops per-bus_type Joerg Roedel
2011-09-23 15:45 ` [PATCH 01/10] iommu/core: Define iommu_ops and register_iommu only with CONFIG_IOMMU_API Joerg Roedel
2011-09-23 15:45 ` [PATCH 02/10] Driver core: Add iommu_ops to bus_type Joerg Roedel
2011-09-29 20:05 ` Greg KH
2011-09-30 6:24 ` Joerg Roedel
2011-09-30 13:58 ` Greg KH
2011-09-23 15:45 ` [PATCH 03/10] iommu/core: Add bus_type parameter to iommu_domain_alloc Joerg Roedel
2011-09-23 15:45 ` Joerg Roedel [this message]
2011-09-23 15:45 ` [PATCH 05/10] iommu/core: Use bus->iommu_ops in the iommu-api Joerg Roedel
2011-09-23 15:45 ` [PATCH 06/10] iommu/amd: Use bus_set_iommu instead of register_iommu Joerg Roedel
2011-09-23 15:45 ` [PATCH 07/10] iommu/vt-d: " Joerg Roedel
2011-09-23 15:45 ` [PATCH 08/10] iommu/omap: " Joerg Roedel
2011-09-26 7:09 ` Ohad Ben-Cohen
2011-09-26 12:22 ` Roedel, Joerg
2011-09-26 12:29 ` Ohad Ben-Cohen
2011-09-27 11:00 ` Roedel, Joerg
2011-09-27 11:10 ` Ohad Ben-Cohen
2011-09-27 11:20 ` KyongHo Cho
2011-09-29 20:04 ` Greg KH
2011-10-02 17:24 ` Ohad Ben-Cohen
2011-09-23 15:45 ` [PATCH 09/10] iommu/msm: " Joerg Roedel
2011-09-23 17:44 ` David Brown
2011-09-23 15:45 ` [PATCH 10/10] iommu/core: Remove global iommu_ops and register_iommu Joerg Roedel
-- strict thread matches above, loose matches on Subject: below --
2011-09-22 16:14 [PATCH 0/10 v2] IOMMU: Make iommu_ops per-bus_type Joerg Roedel
2011-09-22 16:14 ` [PATCH 04/10] iommu/core: Convert iommu_found to iommu_present Joerg Roedel
2011-09-07 15:41 [PATCH 0/10] IOMMU: Make iommu_ops per-bus_type Joerg Roedel
2011-09-07 15:41 ` [PATCH 04/10] iommu/core: Convert iommu_found to iommu_present Joerg Roedel
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=1316792756-3395-5-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=alex.williamson@redhat.com \
--cc=davidb@codeaurora.org \
--cc=dwmw2@infradead.org \
--cc=gregkh@suse.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ohad@wizery.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®