lkml.org 
[lkml]   [2013]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v8 09/17] arm64/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain
    Date
    We can't simply override arm_dma_ops with xen_dma_ops because devices
    are allowed to have their own dma_ops and they take precedence over
    arm_dma_ops. When running on Xen as initial domain, we always want
    xen_dma_ops to be the one in use.

    Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
    Acked-by: Catalin Marinas <catalin.marinas@arm.com>
    CC: will.deacon@arm.com

    Changes in v7:
    - return xen_dma_ops only if we are the initial domain;
    - rename __get_dma_ops to __generic_dma_ops.
    ---
    arch/arm64/include/asm/dma-mapping.h | 13 ++++++++++++-
    1 files changed, 12 insertions(+), 1 deletions(-)

    diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
    index c2cb8a0..6763c29 100644
    --- a/arch/arm64/include/asm/dma-mapping.h
    +++ b/arch/arm64/include/asm/dma-mapping.h
    @@ -23,12 +23,15 @@

    #include <asm-generic/dma-coherent.h>

    +#include <xen/xen.h>
    +#include <asm/xen/hypervisor.h>
    +
    #define ARCH_HAS_DMA_GET_REQUIRED_MASK

    #define DMA_ERROR_CODE (~0)
    extern struct dma_map_ops *dma_ops;

    -static inline struct dma_map_ops *get_dma_ops(struct device *dev)
    +static inline struct dma_map_ops *__generic_dma_ops(struct device *dev)
    {
    if (unlikely(!dev) || !dev->archdata.dma_ops)
    return dma_ops;
    @@ -36,6 +39,14 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
    return dev->archdata.dma_ops;
    }

    +static inline struct dma_map_ops *get_dma_ops(struct device *dev)
    +{
    + if (xen_initial_domain())
    + return xen_dma_ops;
    + else
    + return __generic_dma_ops(dev);
    +}
    +
    #include <asm-generic/dma-mapping-common.h>

    static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
    --
    1.7.2.5


    \
     
     \ /
      Last update: 2013-10-09 23:01    [W:4.048 / U:0.640 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site