lkml.org 
[lkml]   [2020]   [May]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 08/14] of: Include a dev param in of_dma_get_range()
    Date
    Currently there is only one caller of of_dma_get_range().  A struct device
    *dev param is needed For implementing multiple dma offsets. This function
    will still work if dev == NULL.

    Signed-off-by: Jim Quinlan <james.quinlan@broadcom.com>
    ---
    drivers/of/address.c | 4 +++-
    drivers/of/device.c | 2 +-
    drivers/of/of_private.h | 8 ++++----
    3 files changed, 8 insertions(+), 6 deletions(-)

    diff --git a/drivers/of/address.c b/drivers/of/address.c
    index 8eea3f6e29a4..96d8cfb14a60 100644
    --- a/drivers/of/address.c
    +++ b/drivers/of/address.c
    @@ -920,6 +920,7 @@ EXPORT_SYMBOL(of_io_request_and_map);

    /**
    * of_dma_get_range - Get DMA range info
    + * @dev: device pointer; only needed for a corner case.
    * @np: device node to get DMA range info
    * @dma_addr: pointer to store initial DMA address of DMA range
    * @paddr: pointer to store initial CPU address of DMA range
    @@ -935,7 +936,8 @@ EXPORT_SYMBOL(of_io_request_and_map);
    * It returns -ENODEV if "dma-ranges" property was not found
    * for this device in DT.
    */
    -int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *size)
    +int of_dma_get_range(struct device *dev, struct device_node *np, u64 *dma_addr,
    + u64 *paddr, u64 *size)
    {
    struct device_node *node = of_node_get(np);
    const __be32 *ranges = NULL;
    diff --git a/drivers/of/device.c b/drivers/of/device.c
    index 27203bfd0b22..ef6a741f9f0b 100644
    --- a/drivers/of/device.c
    +++ b/drivers/of/device.c
    @@ -95,7 +95,7 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)
    const struct iommu_ops *iommu;
    u64 mask, end;

    - ret = of_dma_get_range(np, &dma_addr, &paddr, &size);
    + ret = of_dma_get_range(dev, np, &dma_addr, &paddr, &size);
    if (ret < 0) {
    /*
    * For legacy reasons, we have to assume some devices need
    diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
    index edc682249c00..7a83d3a81ab6 100644
    --- a/drivers/of/of_private.h
    +++ b/drivers/of/of_private.h
    @@ -158,11 +158,11 @@ extern int of_bus_n_addr_cells(struct device_node *np);
    extern int of_bus_n_size_cells(struct device_node *np);

    #ifdef CONFIG_OF_ADDRESS
    -extern int of_dma_get_range(struct device_node *np, u64 *dma_addr,
    - u64 *paddr, u64 *size);
    +extern int of_dma_get_range(struct device *dev, struct device_node *np,
    + u64 *dma_addr, u64 *paddr, u64 *size);
    #else
    -static inline int of_dma_get_range(struct device_node *np, u64 *dma_addr,
    - u64 *paddr, u64 *size)
    +static inline int of_dma_get_range(struct device *dev, struct device_node *np,
    + u64 *dma_addr, u64 *paddr, u64 *size)
    {
    return -ENODEV;
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-05-26 21:19    [W:4.223 / U:0.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site