lkml.org 
[lkml]   [2010]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/iommu] x86, calgary: Make Calgary IOMMU use IOMMU_INIT_* macros.
    Commit-ID:  d2aa232f3d0b5a3e22f91b736fe68eddcf0d5ea3
    Gitweb: http://git.kernel.org/tip/d2aa232f3d0b5a3e22f91b736fe68eddcf0d5ea3
    Author: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    AuthorDate: Thu, 26 Aug 2010 13:58:02 -0400
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Thu, 26 Aug 2010 15:14:15 -0700

    x86, calgary: Make Calgary IOMMU use IOMMU_INIT_* macros.

    We utilize the IOMMU_INIT macros to create this dependency:

    [pci_xen_swiotlb_detect]
    |
    [pci_swiotlb_detect_override]
    |
    [pci_swiotlb_detect_4gb]
    |
    [detect_calgary]

    Meaning that 'detect_calgary' is going to be called after
    'pci_swiotlb_detect'.

    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    LKML-Reference: <1282845485-8991-8-git-send-email-konrad.wilk@oracle.com>
    CC: Muli Ben-Yehuda <muli@il.ibm.com>
    CC: "Jon D. Mason" <jdmason@kudzu.us>
    CC: "Darrick J. Wong" <djwong@us.ibm.com>
    CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    arch/x86/kernel/pci-calgary_64.c | 3 +++
    1 files changed, 3 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
    index 28c6b38..f56a117 100644
    --- a/arch/x86/kernel/pci-calgary_64.c
    +++ b/arch/x86/kernel/pci-calgary_64.c
    @@ -47,6 +47,7 @@
    #include <asm/rio.h>
    #include <asm/bios_ebda.h>
    #include <asm/x86_init.h>
    +#include <asm/iommu_table.h>

    #ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT
    int use_calgary __read_mostly = 1;
    @@ -1595,3 +1596,5 @@ static int __init calgary_fixup_tce_spaces(void)
    * and before device_initcall.
    */
    rootfs_initcall(calgary_fixup_tce_spaces);
    +
    +IOMMU_INIT_POST(detect_calgary);

    \
     
     \ /
      Last update: 2010-08-27 01:33    [W:0.027 / U:0.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site