public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, jeremy@xensource.com,
	hpa@zytor.com, mingo@redhat.com, konrad.wilk@oracle.com,
	fujita.tomonori@lab.ntt.co.jp, tglx@linutronix.de,
	hpa@linux.intel.com
Subject: [tip:x86/iommu] x86, xen-swiotlb: Make Xen-SWIOTLB use IOMMU_INIT_* macros.
Date: Thu, 26 Aug 2010 23:29:40 GMT	[thread overview]
Message-ID: <tip-5cb3a267939a223eb84692d229569d2ef493d7ca@git.kernel.org> (raw)
In-Reply-To: <1282845485-8991-7-git-send-email-konrad.wilk@oracle.com>

Commit-ID:  5cb3a267939a223eb84692d229569d2ef493d7ca
Gitweb:     http://git.kernel.org/tip/5cb3a267939a223eb84692d229569d2ef493d7ca
Author:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
AuthorDate: Thu, 26 Aug 2010 13:58:01 -0400
Committer:  H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Thu, 26 Aug 2010 15:14:06 -0700

x86, xen-swiotlb: Make Xen-SWIOTLB use IOMMU_INIT_* macros.

We utilize the IOMMU_INIT macros to create this dependency:

               [null]
                 |
       [pci_xen_swiotlb_detect]
                 |
       [pci_swiotlb_detect_override]
                 |
       [pci_swiotlb_detect_4gb]

In other words, we set 'pci_xen_swiotlb_detect' to be
the first detection to be run during start.

CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
LKML-Reference: <1282845485-8991-7-git-send-email-konrad.wilk@oracle.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
 arch/x86/xen/pci-swiotlb-xen.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c
index a013ec9..2247100 100644
--- a/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@ -5,6 +5,7 @@
 
 #include <asm/xen/hypervisor.h>
 #include <xen/xen.h>
+#include <asm/iommu_table.h>
 
 int xen_swiotlb __read_mostly;
 
@@ -56,3 +57,7 @@ void __init pci_xen_swiotlb_init(void)
 		dma_ops = &xen_swiotlb_dma_ops;
 	}
 }
+IOMMU_INIT_FINISH(pci_xen_swiotlb_detect,
+		  0,
+		  pci_xen_swiotlb_init,
+		  0);

  reply	other threads:[~2010-08-26 23:30 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-26 17:57 [RFC PATCH v2] Modularize IOMMUs detection/init for X86 Konrad Rzeszutek Wilk
2010-08-26 17:57 ` [PATCH 01/10] x86/iommu: Add IOMMU_INIT macros, .iommu_table section, and iommu_table_entry structure Konrad Rzeszutek Wilk
2010-08-26 18:19   ` Sam Ravnborg
2010-08-26 19:48     ` H. Peter Anvin
2010-08-26 23:47     ` H. Peter Anvin
2010-08-27 14:38     ` Konrad Rzeszutek Wilk
2010-08-27 14:40       ` Sam Ravnborg
2010-08-27 18:19         ` [PATCH] x86: Adding comments about .iommu_table and its neighbors Konrad Rzeszutek Wilk
2010-08-28  1:54           ` [tip:x86/iommu] x86, doc: " tip-bot for Konrad Rzeszutek Wilk
2010-08-26 23:27   ` [tip:x86/iommu] x86, iommu: Add IOMMU_INIT macros, .iommu_table section, and iommu_table_entry structure tip-bot for Konrad Rzeszutek Wilk
2010-08-26 17:57 ` [PATCH 02/10] x86/iommu: Make all IOMMU's detection routines return a value Konrad Rzeszutek Wilk
2010-08-26 23:28   ` [tip:x86/iommu] x86, iommu: " tip-bot for Konrad Rzeszutek Wilk
2010-08-26 17:57 ` [PATCH 03/10] x86/iommu: Add proper dependency sort routine (and sanity check) Konrad Rzeszutek Wilk
2010-08-26 23:28   ` [tip:x86/iommu] x86, iommu: " tip-bot for Konrad Rzeszutek Wilk
2010-08-26 17:57 ` [PATCH 04/10] x86/swiotlb: Simplify SWIOTLB pci_swiotlb_detect routine Konrad Rzeszutek Wilk
2010-08-26 23:28   ` [tip:x86/iommu] x86, swiotlb: " tip-bot for Konrad Rzeszutek Wilk
2010-08-26 17:58 ` [PATCH 05/10] x86/swiotlb: Make SWIOTLB use IOMMU_INIT_* macros Konrad Rzeszutek Wilk
2010-08-26 23:29   ` [tip:x86/iommu] x86, swiotlb: " tip-bot for Konrad Rzeszutek Wilk
2010-08-26 17:58 ` [PATCH 06/10] x86/xen-swiotlb: Make Xen-SWIOTLB " Konrad Rzeszutek Wilk
2010-08-26 23:29   ` tip-bot for Konrad Rzeszutek Wilk [this message]
2010-08-26 17:58 ` [PATCH 07/10] x86/calgary: Make Calgary IOMMU " Konrad Rzeszutek Wilk
2010-08-26 23:30   ` [tip:x86/iommu] x86, calgary: " tip-bot for Konrad Rzeszutek Wilk
2010-08-26 17:58 ` [PATCH 08/10] x86/GART/AMD-VI: Make AMD GART and " Konrad Rzeszutek Wilk
2010-08-26 23:30   ` [tip:x86/iommu] x86, GART/AMD-VI: " tip-bot for Konrad Rzeszutek Wilk
2010-08-26 17:58 ` [PATCH 09/10] x86/VT-d: Make Intel VT-d " Konrad Rzeszutek Wilk
2010-08-26 23:30   ` [tip:x86/iommu] x86, VT-d: " tip-bot for Konrad Rzeszutek Wilk
2010-09-07 18:10   ` [PATCH 09/10] x86/VT-d: " Tony Luck
2010-09-07 19:07     ` Konrad Rzeszutek Wilk
2010-09-07 19:12       ` Luck, Tony
2010-08-26 17:58 ` [PATCH 10/10] x86/iommu: Utilize the IOMMU_INIT macros functionality Konrad Rzeszutek Wilk
2010-08-26 23:31   ` [tip:x86/iommu] x86, iommu: " tip-bot for Konrad Rzeszutek Wilk

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=tip-5cb3a267939a223eb84692d229569d2ef493d7ca@git.kernel.org \
    --to=konrad.wilk@oracle.com \
    --cc=fujita.tomonori@lab.ntt.co.jp \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jeremy@xensource.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /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