lkml.org 
[lkml]   [2010]   [Aug]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] x86/swiotlb: Make SWIOTLB use IOMMU_INIT_* macros.
    Date
    We utilize the IOMMU_INIT macros to create this dependency:

    [pci_xen_swiotlb_detect]
    |
    [pci_swiotlb_detect_override]
    |
    [pci_swiotlb_detect_4gb]

    And set the SWIOTLB IOMMU_INIT to utilize 'pci_swiotlb_init'
    for .init and 'pci_swiotlb_late_init' for .late_init.

    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    CC: x86@kernel.org
    CC: H. Peter Anvin <hpa@zytor.com>
    CC: Fujita Tomonori <fujita.tomonori@lab.ntt.co.jp>
    ---
    arch/x86/kernel/pci-swiotlb.c | 12 +++++++++++-
    1 files changed, 11 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
    index c7a72fa..a5ad584 100644
    --- a/arch/x86/kernel/pci-swiotlb.c
    +++ b/arch/x86/kernel/pci-swiotlb.c
    @@ -10,7 +10,8 @@
    #include <asm/iommu.h>
    #include <asm/swiotlb.h>
    #include <asm/dma.h>
    -
    +#include <asm/xen/swiotlb-xen.h>
    +#include <asm/iommu_table.h>
    int swiotlb __read_mostly;

    static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
    @@ -55,6 +56,10 @@ int __init pci_swiotlb_detect_override(void)

    return use_swiotlb;
    }
    +IOMMU_INIT_FINISH(pci_swiotlb_detect_override,
    + pci_xen_swiotlb_detect,
    + pci_swiotlb_init,
    + pci_swiotlb_late_init);

    /*
    * if 4GB or more detected (and iommu=off not set) return 1
    @@ -69,6 +74,10 @@ int __init pci_swiotlb_detect_4gb(void)
    #endif
    return swiotlb;
    }
    +IOMMU_INIT(pci_swiotlb_detect_4gb,
    + pci_swiotlb_detect_override,
    + pci_swiotlb_init,
    + pci_swiotlb_late_init);

    void __init pci_swiotlb_init(void)
    {
    @@ -89,3 +98,4 @@ void __init pci_swiotlb_late_init(void)
    swiotlb_print_info();
    }
    }
    +
    --
    1.7.0.1


    \
     
     \ /
      Last update: 2010-08-26 20:01    [W:0.023 / U:33.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site