lkml.org 
[lkml]   [2019]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 06/48] soc: fsl: qe: replace spin_event_timeout by readx_poll_timeout_atomic
    Date
    In preparation for allowing QE to be built for architectures other
    than ppc, use the generic readx_poll_timeout_atomic() helper from
    iopoll.h rather than the ppc-only spin_event_timeout().

    Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
    ---
    drivers/soc/fsl/qe/qe.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    diff --git a/drivers/soc/fsl/qe/qe.c b/drivers/soc/fsl/qe/qe.c
    index 456bd7416876..85737e6f5b62 100644
    --- a/drivers/soc/fsl/qe/qe.c
    +++ b/drivers/soc/fsl/qe/qe.c
    @@ -22,6 +22,7 @@
    #include <linux/module.h>
    #include <linux/delay.h>
    #include <linux/ioport.h>
    +#include <linux/iopoll.h>
    #include <linux/crc32.h>
    #include <linux/mod_devicetable.h>
    #include <linux/of_platform.h>
    @@ -108,7 +109,8 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input)
    {
    unsigned long flags;
    u8 mcn_shift = 0, dev_shift = 0;
    - u32 ret;
    + u32 val;
    + int ret;

    spin_lock_irqsave(&qe_lock, flags);
    if (cmd == QE_RESET) {
    @@ -135,13 +137,12 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input)
    }

    /* wait for the QE_CR_FLG to clear */
    - ret = spin_event_timeout((qe_ioread32be(&qe_immr->cp.cecr) & QE_CR_FLG) == 0,
    - 100, 0);
    - /* On timeout (e.g. failure), the expression will be false (ret == 0),
    - otherwise it will be true (ret == 1). */
    + ret = readx_poll_timeout_atomic(qe_ioread32be, &qe_immr->cp.cecr, val,
    + (val & QE_CR_FLG) == 0, 0, 100);
    + /* On timeout, ret is -ETIMEDOUT, otherwise it will be 0. */
    spin_unlock_irqrestore(&qe_lock, flags);

    - return ret == 1;
    + return ret == 0;
    }
    EXPORT_SYMBOL(qe_issue_cmd);

    --
    2.23.0
    \
     
     \ /
      Last update: 2019-11-18 12:25    [W:4.173 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site