lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 047/179] fpga: dfl: fix bug in port reset handshake
    Date
    From: Matthew Gerlach <matthew.gerlach@linux.intel.com>

    [ Upstream commit 8614afd689df59d9ce019439389be20bd788a897 ]

    When putting the port in reset, driver must wait for the soft reset
    acknowledgment bit instead of the soft reset bit.

    Fixes: 47c1b19c160f (fpga: dfl: afu: add port ops support)
    Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
    Signed-off-by: Xu Yilun <yilun.xu@intel.com>
    Acked-by: Wu Hao <hao.wu@intel.com>
    Reviewed-by: Tom Rix <trix@redhat.com>
    Signed-off-by: Moritz Fischer <mdf@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/fpga/dfl-afu-main.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/fpga/dfl-afu-main.c b/drivers/fpga/dfl-afu-main.c
    index 65437b6a68424..77e257c88a1df 100644
    --- a/drivers/fpga/dfl-afu-main.c
    +++ b/drivers/fpga/dfl-afu-main.c
    @@ -83,7 +83,8 @@ int __afu_port_disable(struct platform_device *pdev)
    * on this port and minimum soft reset pulse width has elapsed.
    * Driver polls port_soft_reset_ack to determine if reset done by HW.
    */
    - if (readq_poll_timeout(base + PORT_HDR_CTRL, v, v & PORT_CTRL_SFTRST,
    + if (readq_poll_timeout(base + PORT_HDR_CTRL, v,
    + v & PORT_CTRL_SFTRST_ACK,
    RST_POLL_INVL, RST_POLL_TIMEOUT)) {
    dev_err(&pdev->dev, "timeout, fail to reset device\n");
    return -ETIMEDOUT;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-27 16:21    [W:4.140 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site