lkml.org 
[lkml]   [2017]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 43/67] ia64: rename swiotlb_dma_ops
    Date
    We'll need that name for a generic implementation soon.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/ia64/hp/common/hwsw_iommu.c | 4 ++--
    arch/ia64/hp/common/sba_iommu.c | 6 +++---
    arch/ia64/kernel/pci-swiotlb.c | 6 +++---
    3 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
    index 63d8e1d2477f..41279f0442bd 100644
    --- a/arch/ia64/hp/common/hwsw_iommu.c
    +++ b/arch/ia64/hp/common/hwsw_iommu.c
    @@ -19,7 +19,7 @@
    #include <linux/export.h>
    #include <asm/machvec.h>

    -extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
    +extern const struct dma_map_ops sba_dma_ops, ia64_swiotlb_dma_ops;

    /* swiotlb declarations & definitions: */
    extern int swiotlb_late_init_with_default_size (size_t size);
    @@ -38,7 +38,7 @@ static inline int use_swiotlb(struct device *dev)
    const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
    {
    if (use_swiotlb(dev))
    - return &swiotlb_dma_ops;
    + return &ia64_swiotlb_dma_ops;
    return &sba_dma_ops;
    }
    EXPORT_SYMBOL(hwsw_dma_get_ops);
    diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
    index 6f05aba9012f..d68849ad2ee1 100644
    --- a/arch/ia64/hp/common/sba_iommu.c
    +++ b/arch/ia64/hp/common/sba_iommu.c
    @@ -2093,7 +2093,7 @@ static int __init acpi_sba_ioc_init_acpi(void)
    /* This has to run before acpi_scan_init(). */
    arch_initcall(acpi_sba_ioc_init_acpi);

    -extern const struct dma_map_ops swiotlb_dma_ops;
    +extern const struct dma_map_ops ia64_swiotlb_dma_ops;

    static int __init
    sba_init(void)
    @@ -2108,7 +2108,7 @@ sba_init(void)
    * a successful kdump kernel boot is to use the swiotlb.
    */
    if (is_kdump_kernel()) {
    - dma_ops = &swiotlb_dma_ops;
    + dma_ops = &ia64_swiotlb_dma_ops;
    if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0)
    panic("Unable to initialize software I/O TLB:"
    " Try machvec=dig boot option");
    @@ -2130,7 +2130,7 @@ sba_init(void)
    * If we didn't find something sba_iommu can claim, we
    * need to setup the swiotlb and switch to the dig machvec.
    */
    - dma_ops = &swiotlb_dma_ops;
    + dma_ops = &ia64_swiotlb_dma_ops;
    if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0)
    panic("Unable to find SBA IOMMU or initialize "
    "software I/O TLB: Try machvec=dig boot option");
    diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
    index 5e50939aa03e..f1ae873a8c35 100644
    --- a/arch/ia64/kernel/pci-swiotlb.c
    +++ b/arch/ia64/kernel/pci-swiotlb.c
    @@ -31,7 +31,7 @@ static void ia64_swiotlb_free_coherent(struct device *dev, size_t size,
    swiotlb_free_coherent(dev, size, vaddr, dma_addr);
    }

    -const struct dma_map_ops swiotlb_dma_ops = {
    +const struct dma_map_ops ia64_swiotlb_dma_ops = {
    .alloc = ia64_swiotlb_alloc_coherent,
    .free = ia64_swiotlb_free_coherent,
    .map_page = swiotlb_map_page,
    @@ -48,7 +48,7 @@ const struct dma_map_ops swiotlb_dma_ops = {

    void __init swiotlb_dma_init(void)
    {
    - dma_ops = &swiotlb_dma_ops;
    + dma_ops = &ia64_swiotlb_dma_ops;
    swiotlb_init(1);
    }

    @@ -60,7 +60,7 @@ void __init pci_swiotlb_init(void)
    printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");
    machvec_init("dig");
    swiotlb_init(1);
    - dma_ops = &swiotlb_dma_ops;
    + dma_ops = &ia64_swiotlb_dma_ops;
    #else
    panic("Unable to find Intel IOMMU");
    #endif
    --
    2.14.2
    \
     
     \ /
      Last update: 2017-12-29 09:30    [W:4.127 / U:0.632 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site