From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sekhar Nori Subject: [PATCH v2 net-next] drivers: net: davinci_mdio: prevent spurious timeout Date: Wed, 9 May 2018 16:30:24 +0530 Message-ID: <20180509110024.1772-1-nsekhar@ti.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Grygorii Strashko , , , Andrew Lunn , Sekhar Nori To: "David S . Miller" Return-path: Received: from fllnx210.ext.ti.com ([198.47.19.17]:61673 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750798AbeEILAh (ORCPT ); Wed, 9 May 2018 07:00:37 -0400 Sender: netdev-owner@vger.kernel.org List-ID: A well timed kernel preemption in the time_after() loop in wait_for_idle() can result in a spurious timeout error to be returned. Fix it by using readl_poll_timeout() which takes care of this issue. Signed-off-by: Sekhar Nori --- v2: use readl_poll_timeout() per suggestion from Andrew. The issue has not been personally observed by me, but has been reported by users. Sending for next-next given the non-critical nature. There is seems to be no easy way to reproduce this. drivers/net/ethernet/ti/davinci_mdio.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c index 3c33f4504d8e..d073432a5dbe 100644 --- a/drivers/net/ethernet/ti/davinci_mdio.c +++ b/drivers/net/ethernet/ti/davinci_mdio.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -227,14 +228,16 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data) static inline int wait_for_idle(struct davinci_mdio_data *data) { struct davinci_mdio_regs __iomem *regs = data->regs; - unsigned long timeout = jiffies + msecs_to_jiffies(MDIO_TIMEOUT); + u32 val, ret; - while (time_after(timeout, jiffies)) { - if (__raw_readl(®s->control) & CONTROL_IDLE) - return 0; + ret = readl_poll_timeout(®s->control, val, val & CONTROL_IDLE, + 0, MDIO_TIMEOUT * 1000); + if (ret) { + dev_err(data->dev, "timed out waiting for idle\n"); + return ret; } - dev_err(data->dev, "timed out waiting for idle\n"); - return -ETIMEDOUT; + + return 0; } static int davinci_mdio_read(struct mii_bus *bus, int phy_id, int phy_reg) -- 2.16.2