lkml.org 
[lkml]   [2021]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 04/11] powerpc/pseries/iommu: Add ddw_list_new_entry() helper
    Date
    There are two functions creating direct_window_list entries in a
    similar way, so create a ddw_list_new_entry() to avoid duplicity and
    simplify those functions.

    Signed-off-by: Leonardo Bras <leobras.c@gmail.com>
    Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
    ---
    arch/powerpc/platforms/pseries/iommu.c | 32 +++++++++++++++++---------
    1 file changed, 21 insertions(+), 11 deletions(-)

    diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
    index d02359ca1f9f..6f14894d2d04 100644
    --- a/arch/powerpc/platforms/pseries/iommu.c
    +++ b/arch/powerpc/platforms/pseries/iommu.c
    @@ -870,6 +870,21 @@ static u64 find_existing_ddw(struct device_node *pdn, int *window_shift)
    return dma_addr;
    }

    +static struct direct_window *ddw_list_new_entry(struct device_node *pdn,
    + const struct dynamic_dma_window_prop *dma64)
    +{
    + struct direct_window *window;
    +
    + window = kzalloc(sizeof(*window), GFP_KERNEL);
    + if (!window)
    + return NULL;
    +
    + window->device = pdn;
    + window->prop = dma64;
    +
    + return window;
    +}
    +
    static int find_existing_ddw_windows(void)
    {
    int len;
    @@ -882,18 +897,15 @@ static int find_existing_ddw_windows(void)

    for_each_node_with_property(pdn, DIRECT64_PROPNAME) {
    direct64 = of_get_property(pdn, DIRECT64_PROPNAME, &len);
    - if (!direct64)
    - continue;
    -
    - window = kzalloc(sizeof(*window), GFP_KERNEL);
    - if (!window || len < sizeof(struct dynamic_dma_window_prop)) {
    - kfree(window);
    + if (!direct64 || len < sizeof(*direct64)) {
    remove_ddw(pdn, true);
    continue;
    }

    - window->device = pdn;
    - window->prop = direct64;
    + window = ddw_list_new_entry(pdn, direct64);
    + if (!window)
    + break;
    +
    spin_lock(&direct_window_list_lock);
    list_add(&window->list, &direct_window_list);
    spin_unlock(&direct_window_list_lock);
    @@ -1303,7 +1315,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
    dev_dbg(&dev->dev, "created tce table LIOBN 0x%x for %pOF\n",
    create.liobn, dn);

    - window = kzalloc(sizeof(*window), GFP_KERNEL);
    + window = ddw_list_new_entry(pdn, ddwprop);
    if (!window)
    goto out_clear_window;

    @@ -1322,8 +1334,6 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
    goto out_free_window;
    }

    - window->device = pdn;
    - window->prop = ddwprop;
    spin_lock(&direct_window_list_lock);
    list_add(&window->list, &direct_window_list);
    spin_unlock(&direct_window_list_lock);
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-04-30 18:32    [W:7.809 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site