From: Zong Li <zong.li@sifive.com> To: Florian Fainelli <f.fainelli@gmail.com> Cc: nicolas.ferre@microchip.com, claudiu.beznea@microchip.com, davem@davemloft.net, kuba@kernel.org, Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul.walmsley@sifive.com>, Andreas Schwab <schwab@linux-m68k.org>, Stephen Boyd <sboyd@kernel.org>, Albert Ou <aou@eecs.berkeley.edu>, Michael Turquette <mturquette@baylibre.com>, geert@linux-m68k.org, Yixun Lan <yixun.lan@gmail.com>, netdev@vger.kernel.org, "linux-kernel@vger.kernel.org List" <linux-kernel@vger.kernel.org>, linux-riscv <linux-riscv@lists.infradead.org> Subject: Re: [PATCH] net: macb: ensure the device is available before accessing GEMGXL control registers Date: Sat, 22 May 2021 17:08:44 +0800 [thread overview] Message-ID: <CANXhq0rQqeGO_LM233bB8Kg5XD_Q7xrtOhVrYeuCxXj29N3+Rg@mail.gmail.com> (raw) In-Reply-To: <b4088995-605e-85ca-2f07-47d2654ac2c8@gmail.com> On Sat, May 22, 2021 at 12:51 AM Florian Fainelli <f.fainelli@gmail.com> wrote: > > > > On 5/21/2021 5:48 AM, Zong Li wrote: > > If runtime power menagement is enabled, the gigabit ethernet PLL would > > be disabled after macb_probe(). During this period of time, the system > > would hang up if we try to access GEMGXL control registers. > > > > We can't put runtime_pm_get/runtime_pm_put/ there due to the issue of > > sleep inside atomic section (7fa2955ff70ce453 ("sh_eth: Fix sleeping > > function called from invalid context"). Add the similar flag to ensure > > the device is available before accessing GEMGXL device. > > > > Signed-off-by: Zong Li <zong.li@sifive.com> > > --- > > drivers/net/ethernet/cadence/macb.h | 2 ++ > > drivers/net/ethernet/cadence/macb_main.c | 7 +++++++ > > 2 files changed, 9 insertions(+) > > > > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h > > index d8d87213697c..acf5242ce715 100644 > > --- a/drivers/net/ethernet/cadence/macb.h > > +++ b/drivers/net/ethernet/cadence/macb.h > > @@ -1309,6 +1309,8 @@ struct macb { > > > > u32 rx_intr_mask; > > > > + unsigned int is_opened; > > + > > struct macb_pm_data pm_data; > > const struct macb_usrio_config *usrio; > > }; > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > > index 6bc7d41d519b..e079ed10ad91 100644 > > --- a/drivers/net/ethernet/cadence/macb_main.c > > +++ b/drivers/net/ethernet/cadence/macb_main.c > > @@ -2781,6 +2781,8 @@ static int macb_open(struct net_device *dev) > > if (bp->ptp_info) > > bp->ptp_info->ptp_init(dev); > > > > + bp->is_opened = 1; > > + > > return 0; > > > > reset_hw: > > @@ -2818,6 +2820,8 @@ static int macb_close(struct net_device *dev) > > if (bp->ptp_info) > > bp->ptp_info->ptp_remove(dev); > > > > + bp->is_opened = 0; > > + > > pm_runtime_put(&bp->pdev->dev); > > > > return 0; > > @@ -2867,6 +2871,9 @@ static struct net_device_stats *gem_get_stats(struct macb *bp) > > struct gem_stats *hwstat = &bp->hw_stats.gem; > > struct net_device_stats *nstat = &bp->dev->stats; > > > > + if (!bp->is_opened) > > + return nstat; > > The canonical way to do this check is to use netif_running(), and not > open code a boolean tracking whether a network device is opened or not. Yes, I have tried this and it worked. Let me change it in the next version. > -- > Florian
WARNING: multiple messages have this Message-ID (diff)
From: Zong Li <zong.li@sifive.com> To: Florian Fainelli <f.fainelli@gmail.com> Cc: nicolas.ferre@microchip.com, claudiu.beznea@microchip.com, davem@davemloft.net, kuba@kernel.org, Palmer Dabbelt <palmer@dabbelt.com>, Paul Walmsley <paul.walmsley@sifive.com>, Andreas Schwab <schwab@linux-m68k.org>, Stephen Boyd <sboyd@kernel.org>, Albert Ou <aou@eecs.berkeley.edu>, Michael Turquette <mturquette@baylibre.com>, geert@linux-m68k.org, Yixun Lan <yixun.lan@gmail.com>, netdev@vger.kernel.org, "linux-kernel@vger.kernel.org List" <linux-kernel@vger.kernel.org>, linux-riscv <linux-riscv@lists.infradead.org> Subject: Re: [PATCH] net: macb: ensure the device is available before accessing GEMGXL control registers Date: Sat, 22 May 2021 17:08:44 +0800 [thread overview] Message-ID: <CANXhq0rQqeGO_LM233bB8Kg5XD_Q7xrtOhVrYeuCxXj29N3+Rg@mail.gmail.com> (raw) In-Reply-To: <b4088995-605e-85ca-2f07-47d2654ac2c8@gmail.com> On Sat, May 22, 2021 at 12:51 AM Florian Fainelli <f.fainelli@gmail.com> wrote: > > > > On 5/21/2021 5:48 AM, Zong Li wrote: > > If runtime power menagement is enabled, the gigabit ethernet PLL would > > be disabled after macb_probe(). During this period of time, the system > > would hang up if we try to access GEMGXL control registers. > > > > We can't put runtime_pm_get/runtime_pm_put/ there due to the issue of > > sleep inside atomic section (7fa2955ff70ce453 ("sh_eth: Fix sleeping > > function called from invalid context"). Add the similar flag to ensure > > the device is available before accessing GEMGXL device. > > > > Signed-off-by: Zong Li <zong.li@sifive.com> > > --- > > drivers/net/ethernet/cadence/macb.h | 2 ++ > > drivers/net/ethernet/cadence/macb_main.c | 7 +++++++ > > 2 files changed, 9 insertions(+) > > > > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h > > index d8d87213697c..acf5242ce715 100644 > > --- a/drivers/net/ethernet/cadence/macb.h > > +++ b/drivers/net/ethernet/cadence/macb.h > > @@ -1309,6 +1309,8 @@ struct macb { > > > > u32 rx_intr_mask; > > > > + unsigned int is_opened; > > + > > struct macb_pm_data pm_data; > > const struct macb_usrio_config *usrio; > > }; > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > > index 6bc7d41d519b..e079ed10ad91 100644 > > --- a/drivers/net/ethernet/cadence/macb_main.c > > +++ b/drivers/net/ethernet/cadence/macb_main.c > > @@ -2781,6 +2781,8 @@ static int macb_open(struct net_device *dev) > > if (bp->ptp_info) > > bp->ptp_info->ptp_init(dev); > > > > + bp->is_opened = 1; > > + > > return 0; > > > > reset_hw: > > @@ -2818,6 +2820,8 @@ static int macb_close(struct net_device *dev) > > if (bp->ptp_info) > > bp->ptp_info->ptp_remove(dev); > > > > + bp->is_opened = 0; > > + > > pm_runtime_put(&bp->pdev->dev); > > > > return 0; > > @@ -2867,6 +2871,9 @@ static struct net_device_stats *gem_get_stats(struct macb *bp) > > struct gem_stats *hwstat = &bp->hw_stats.gem; > > struct net_device_stats *nstat = &bp->dev->stats; > > > > + if (!bp->is_opened) > > + return nstat; > > The canonical way to do this check is to use netif_running(), and not > open code a boolean tracking whether a network device is opened or not. Yes, I have tried this and it worked. Let me change it in the next version. > -- > Florian _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2021-05-22 9:09 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-21 12:48 [PATCH] net: macb: ensure the device is available before accessing GEMGXL control registers Zong Li 2021-05-21 12:48 ` Zong Li 2021-05-21 16:51 ` Florian Fainelli 2021-05-21 16:51 ` Florian Fainelli 2021-05-22 9:08 ` Zong Li [this message] 2021-05-22 9:08 ` Zong Li
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CANXhq0rQqeGO_LM233bB8Kg5XD_Q7xrtOhVrYeuCxXj29N3+Rg@mail.gmail.com \ --to=zong.li@sifive.com \ --cc=aou@eecs.berkeley.edu \ --cc=claudiu.beznea@microchip.com \ --cc=davem@davemloft.net \ --cc=f.fainelli@gmail.com \ --cc=geert@linux-m68k.org \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-riscv@lists.infradead.org \ --cc=mturquette@baylibre.com \ --cc=netdev@vger.kernel.org \ --cc=nicolas.ferre@microchip.com \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=sboyd@kernel.org \ --cc=schwab@linux-m68k.org \ --cc=yixun.lan@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.