lkml.org 
[lkml]   [2018]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/26] ppc: Convert vas ID allocation to new IDA API
    Date
    Removes a custom spinlock and simplifies the code.

    Signed-off-by: Matthew Wilcox <willy@infradead.org>
    ---
    arch/powerpc/platforms/powernv/vas-window.c | 26 ++++-----------------
    1 file changed, 4 insertions(+), 22 deletions(-)

    diff --git a/arch/powerpc/platforms/powernv/vas-window.c b/arch/powerpc/platforms/powernv/vas-window.c
    index ff9f48812331..2a5e68a2664d 100644
    --- a/arch/powerpc/platforms/powernv/vas-window.c
    +++ b/arch/powerpc/platforms/powernv/vas-window.c
    @@ -515,35 +515,17 @@ int init_winctx_regs(struct vas_window *window, struct vas_winctx *winctx)
    return 0;
    }

    -static DEFINE_SPINLOCK(vas_ida_lock);
    -
    static void vas_release_window_id(struct ida *ida, int winid)
    {
    - spin_lock(&vas_ida_lock);
    - ida_remove(ida, winid);
    - spin_unlock(&vas_ida_lock);
    + ida_free(ida, winid);
    }

    static int vas_assign_window_id(struct ida *ida)
    {
    - int rc, winid;
    -
    - do {
    - rc = ida_pre_get(ida, GFP_KERNEL);
    - if (!rc)
    - return -EAGAIN;
    -
    - spin_lock(&vas_ida_lock);
    - rc = ida_get_new(ida, &winid);
    - spin_unlock(&vas_ida_lock);
    - } while (rc == -EAGAIN);
    -
    - if (rc)
    - return rc;
    + int winid = ida_alloc_max(ida, VAX_WINDOWS_PER_CHIP, GFP_KERNEL);

    - if (winid > VAS_WINDOWS_PER_CHIP) {
    - pr_err("Too many (%d) open windows\n", winid);
    - vas_release_window_id(ida, winid);
    + if (winid == -ENOSPC) {
    + pr_err("Too many (%d) open windows\n", VAX_WINDOWS_PER_CHIP);
    return -EAGAIN;
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2018-06-21 23:31    [W:4.116 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site