lkml.org 
[lkml]   [2011]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/11] swiotlb: Expose swiotlb_nr_tlb function to modules
    Date
    As a mechanism to detect whether SWIOTLB is enabled or not.
    We also fix the spelling - it was swioltb instead of
    swiotlb.

    CC: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    [v1: Ripped out swiotlb_enabled]
    Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    ---
    drivers/xen/swiotlb-xen.c | 2 +-
    include/linux/swiotlb.h | 2 +-
    lib/swiotlb.c | 5 +++--
    3 files changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
    index 6e8c15a..cbcd8cc 100644
    --- a/drivers/xen/swiotlb-xen.c
    +++ b/drivers/xen/swiotlb-xen.c
    @@ -149,7 +149,7 @@ void __init xen_swiotlb_init(int verbose)
    int rc;
    unsigned long nr_tbl;

    - nr_tbl = swioltb_nr_tbl();
    + nr_tbl = swiotlb_nr_tbl();
    if (nr_tbl)
    xen_io_tlb_nslabs = nr_tbl;
    else {
    diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
    index 445702c..e872526 100644
    --- a/include/linux/swiotlb.h
    +++ b/include/linux/swiotlb.h
    @@ -24,7 +24,7 @@ extern int swiotlb_force;

    extern void swiotlb_init(int verbose);
    extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);
    -extern unsigned long swioltb_nr_tbl(void);
    +extern unsigned long swiotlb_nr_tbl(void);

    /*
    * Enumeration for sync targets
    diff --git a/lib/swiotlb.c b/lib/swiotlb.c
    index 99093b3..058935e 100644
    --- a/lib/swiotlb.c
    +++ b/lib/swiotlb.c
    @@ -110,11 +110,11 @@ setup_io_tlb_npages(char *str)
    __setup("swiotlb=", setup_io_tlb_npages);
    /* make io_tlb_overflow tunable too? */

    -unsigned long swioltb_nr_tbl(void)
    +unsigned long swiotlb_nr_tbl(void)
    {
    return io_tlb_nslabs;
    }
    -
    +EXPORT_SYMBOL_GPL(swiotlb_nr_tbl);
    /* Note that this doesn't work with highmem page */
    static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
    volatile void *address)
    @@ -321,6 +321,7 @@ void __init swiotlb_free(void)
    free_bootmem_late(__pa(io_tlb_start),
    PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
    }
    + io_tlb_nslabs = 0;
    }

    static int is_swiotlb_buffer(phys_addr_t paddr)
    --
    1.7.6.4


    \
     
     \ /
      Last update: 2011-10-20 00:23    [W:0.025 / U:148.556 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site