From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D063C433E0 for ; Mon, 27 Jul 2020 01:24:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D46492070A for ; Mon, 27 Jul 2020 01:24:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="S/fH7G7y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726794AbgG0BYM (ORCPT ); Sun, 26 Jul 2020 21:24:12 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:51584 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726107AbgG0BYM (ORCPT ); Sun, 26 Jul 2020 21:24:12 -0400 Received: from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EF960585; Mon, 27 Jul 2020 03:24:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1595813049; bh=xvl0NgEuxJtE7qoq2f3bOEotTxGedSOf7odZUtNjIaA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=S/fH7G7yfEQ2KU3Tp5cjOvx82vOwdijZq16SHgI4g0ooXvTYbpap35RG5Vk7BC+u6 f+iQ4uAm7VV+Ps6lsO33hVPB6oVKlB+kaPRZvVch7zx4nhkRDTay1GDNIItRyvIVxJ 8YBN6oKaiyxSz95H1KRZZyqpWxyqquWPqQ/gcBnc= Date: Mon, 27 Jul 2020 04:23:54 +0300 From: Laurent Pinchart To: Fugang Duan Cc: davem@davemloft.net, netdev@vger.kernel.org, andrew@lunn.ch, cphealy@gmail.com, martin.fuzzey@flowbird.group Subject: Re: [RESENT PATCH net--stat 1/1] net: ethernet: fec: Revert "net: ethernet: fec: Replace interrupt driven MDIO with polled IO" Message-ID: <20200727012354.GT28704@pendragon.ideasonboard.com> References: <1587996484-3504-1-git-send-email-fugang.duan@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1587996484-3504-1-git-send-email-fugang.duan@nxp.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi Fugang, On Mon, Apr 27, 2020 at 10:08:04PM +0800, Fugang Duan wrote: > This reverts commit 29ae6bd1b0d8a57d7c00ab12cbb949fc41986eef. > > The commit breaks ethernet function on i.MX6SX, i.MX7D, i.MX8MM, > i.MX8MQ, and i.MX8QXP platforms. Boot yocto system by NFS mounting > rootfs will be failed with the commit. I'm afraid this commit breaks networking on i.MX7D for me :-( My board is configured to boot over NFS root with IP autoconfiguration through DHCP. The DHCP request goes out, the reply it sent back by the server, but never noticed by the fec driver. v5.7 works fine. As 29ae6bd1b0d8a57d7c00ab12cbb949fc41986eef was merged during the v5.8 merge window, I suspect something else cropped in between 29ae6bd1b0d8a57d7c00ab12cbb949fc41986eef and this patch that needs to be reverted too. We're close to v5.8 and it would be annoying to see this regression ending up in the released kernel. I can test patches, but I'm not familiar enough with the driver (or the networking subsystem) to fix the issue myself. > Signed-off-by: Fugang Duan > > diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h > index a6cdd5b..e74dd1f 100644 > --- a/drivers/net/ethernet/freescale/fec.h > +++ b/drivers/net/ethernet/freescale/fec.h > @@ -376,7 +376,8 @@ struct bufdesc_ex { > #define FEC_ENET_TS_AVAIL ((uint)0x00010000) > #define FEC_ENET_TS_TIMER ((uint)0x00008000) > > -#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF) > +#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII) > +#define FEC_NAPI_IMASK FEC_ENET_MII > #define FEC_RX_DISABLED_IMASK (FEC_DEFAULT_IMASK & (~FEC_ENET_RXF)) > > /* ENET interrupt coalescing macro define */ > @@ -542,6 +543,7 @@ struct fec_enet_private { > int link; > int full_duplex; > int speed; > + struct completion mdio_done; > int irq[FEC_IRQ_NUM]; > bool bufdesc_ex; > int pause_flag; > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index 1ae075a..c7b84bb 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -976,8 +976,8 @@ fec_restart(struct net_device *ndev) > writel((__force u32)cpu_to_be32(temp_mac[1]), > fep->hwp + FEC_ADDR_HIGH); > > - /* Clear any outstanding interrupt, except MDIO. */ > - writel((0xffffffff & ~FEC_ENET_MII), fep->hwp + FEC_IEVENT); > + /* Clear any outstanding interrupt. */ > + writel(0xffffffff, fep->hwp + FEC_IEVENT); > > fec_enet_bd_init(ndev); > > @@ -1123,7 +1123,7 @@ fec_restart(struct net_device *ndev) > if (fep->link) > writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK); > else > - writel(0, fep->hwp + FEC_IMASK); > + writel(FEC_ENET_MII, fep->hwp + FEC_IMASK); > > /* Init the interrupt coalescing */ > fec_enet_itr_coal_init(ndev); > @@ -1652,10 +1652,6 @@ fec_enet_interrupt(int irq, void *dev_id) > irqreturn_t ret = IRQ_NONE; > > int_events = readl(fep->hwp + FEC_IEVENT); > - > - /* Don't clear MDIO events, we poll for those */ > - int_events &= ~FEC_ENET_MII; > - > writel(int_events, fep->hwp + FEC_IEVENT); > fec_enet_collect_events(fep, int_events); > > @@ -1663,12 +1659,16 @@ fec_enet_interrupt(int irq, void *dev_id) > ret = IRQ_HANDLED; > > if (napi_schedule_prep(&fep->napi)) { > - /* Disable interrupts */ > - writel(0, fep->hwp + FEC_IMASK); > + /* Disable the NAPI interrupts */ > + writel(FEC_NAPI_IMASK, fep->hwp + FEC_IMASK); > __napi_schedule(&fep->napi); > } > } > > + if (int_events & FEC_ENET_MII) { > + ret = IRQ_HANDLED; > + complete(&fep->mdio_done); > + } > return ret; > } > > @@ -1818,24 +1818,11 @@ static void fec_enet_adjust_link(struct net_device *ndev) > phy_print_status(phy_dev); > } > > -static int fec_enet_mdio_wait(struct fec_enet_private *fep) > -{ > - uint ievent; > - int ret; > - > - ret = readl_poll_timeout_atomic(fep->hwp + FEC_IEVENT, ievent, > - ievent & FEC_ENET_MII, 2, 30000); > - > - if (!ret) > - writel(FEC_ENET_MII, fep->hwp + FEC_IEVENT); > - > - return ret; > -} > - > static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum) > { > struct fec_enet_private *fep = bus->priv; > struct device *dev = &fep->pdev->dev; > + unsigned long time_left; > int ret = 0, frame_start, frame_addr, frame_op; > bool is_c45 = !!(regnum & MII_ADDR_C45); > > @@ -1843,6 +1830,8 @@ static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum) > if (ret < 0) > return ret; > > + reinit_completion(&fep->mdio_done); > + > if (is_c45) { > frame_start = FEC_MMFR_ST_C45; > > @@ -1854,9 +1843,11 @@ static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum) > fep->hwp + FEC_MII_DATA); > > /* wait for end of transfer */ > - ret = fec_enet_mdio_wait(fep); > - if (ret) { > + time_left = wait_for_completion_timeout(&fep->mdio_done, > + usecs_to_jiffies(FEC_MII_TIMEOUT)); > + if (time_left == 0) { > netdev_err(fep->netdev, "MDIO address write timeout\n"); > + ret = -ETIMEDOUT; > goto out; > } > > @@ -1875,9 +1866,11 @@ static int fec_enet_mdio_read(struct mii_bus *bus, int mii_id, int regnum) > FEC_MMFR_TA, fep->hwp + FEC_MII_DATA); > > /* wait for end of transfer */ > - ret = fec_enet_mdio_wait(fep); > - if (ret) { > + time_left = wait_for_completion_timeout(&fep->mdio_done, > + usecs_to_jiffies(FEC_MII_TIMEOUT)); > + if (time_left == 0) { > netdev_err(fep->netdev, "MDIO read timeout\n"); > + ret = -ETIMEDOUT; > goto out; > } > > @@ -1895,6 +1888,7 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, > { > struct fec_enet_private *fep = bus->priv; > struct device *dev = &fep->pdev->dev; > + unsigned long time_left; > int ret, frame_start, frame_addr; > bool is_c45 = !!(regnum & MII_ADDR_C45); > > @@ -1904,6 +1898,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, > else > ret = 0; > > + reinit_completion(&fep->mdio_done); > + > if (is_c45) { > frame_start = FEC_MMFR_ST_C45; > > @@ -1915,9 +1911,11 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, > fep->hwp + FEC_MII_DATA); > > /* wait for end of transfer */ > - ret = fec_enet_mdio_wait(fep); > - if (ret) { > + time_left = wait_for_completion_timeout(&fep->mdio_done, > + usecs_to_jiffies(FEC_MII_TIMEOUT)); > + if (time_left == 0) { > netdev_err(fep->netdev, "MDIO address write timeout\n"); > + ret = -ETIMEDOUT; > goto out; > } > } else { > @@ -1933,9 +1931,12 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, > fep->hwp + FEC_MII_DATA); > > /* wait for end of transfer */ > - ret = fec_enet_mdio_wait(fep); > - if (ret) > + time_left = wait_for_completion_timeout(&fep->mdio_done, > + usecs_to_jiffies(FEC_MII_TIMEOUT)); > + if (time_left == 0) { > netdev_err(fep->netdev, "MDIO write timeout\n"); > + ret = -ETIMEDOUT; > + } > > out: > pm_runtime_mark_last_busy(dev); > @@ -2144,9 +2145,6 @@ static int fec_enet_mii_init(struct platform_device *pdev) > > writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED); > > - /* Clear any pending transaction complete indication */ > - writel(FEC_ENET_MII, fep->hwp + FEC_IEVENT); > - > fep->mii_bus = mdiobus_alloc(); > if (fep->mii_bus == NULL) { > err = -ENOMEM; > @@ -3688,6 +3686,7 @@ fec_probe(struct platform_device *pdev) > fep->irq[i] = irq; > } > > + init_completion(&fep->mdio_done); > ret = fec_enet_mii_init(pdev); > if (ret) > goto failed_mii_init; -- Regards, Laurent Pinchart