| Message ID | 20201019085717.32413-5-dylan_hung@aspeedtech.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | fix ftgmac100 issues on aspeed soc | expand |
On Mon, 2020-10-19 at 16:57 +0800, Dylan Hung wrote: > The interrupt handler may set the flag to reset the mac in the > future, > but that flag is not cleared once the reset has occured. > > Fixes: 10cbd6407609 ("ftgmac100: Rework NAPI & interrupts handling") > Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com> > Signed-off-by: Joel Stanley <joel@jms.id.au> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > drivers/net/ethernet/faraday/ftgmac100.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ethernet/faraday/ftgmac100.c > b/drivers/net/ethernet/faraday/ftgmac100.c > index 0c67fc3e27df..57736b049de3 100644 > --- a/drivers/net/ethernet/faraday/ftgmac100.c > +++ b/drivers/net/ethernet/faraday/ftgmac100.c > @@ -1326,6 +1326,7 @@ static int ftgmac100_poll(struct napi_struct > *napi, int budget) > */ > if (unlikely(priv->need_mac_restart)) { > ftgmac100_start_hw(priv); > + priv->need_mac_restart = false; > > /* Re-enable "bad" interrupts */ > ftgmac100_write(FTGMAC100_INT_BAD, priv->base + > FTGMAC100_OFFSET_IER);
On Mon, 19 Oct 2020 at 08:57, Dylan Hung <dylan_hung@aspeedtech.com> wrote: > > The interrupt handler may set the flag to reset the mac in the future, > but that flag is not cleared once the reset has occured. > > Fixes: 10cbd6407609 ("ftgmac100: Rework NAPI & interrupts handling") > Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com> > Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > drivers/net/ethernet/faraday/ftgmac100.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c > index 0c67fc3e27df..57736b049de3 100644 > --- a/drivers/net/ethernet/faraday/ftgmac100.c > +++ b/drivers/net/ethernet/faraday/ftgmac100.c > @@ -1326,6 +1326,7 @@ static int ftgmac100_poll(struct napi_struct *napi, int budget) > */ > if (unlikely(priv->need_mac_restart)) { > ftgmac100_start_hw(priv); > + priv->need_mac_restart = false; > > /* Re-enable "bad" interrupts */ > ftgmac100_write(FTGMAC100_INT_BAD, priv->base + FTGMAC100_OFFSET_IER); > -- > 2.17.1 >
On Tue, 20 Oct 2020 at 04:14, Joel Stanley <joel@jms.id.au> wrote: > > On Mon, 19 Oct 2020 at 08:57, Dylan Hung <dylan_hung@aspeedtech.com> wrote: > > > > The interrupt handler may set the flag to reset the mac in the future, > > but that flag is not cleared once the reset has occured. > > > > Fixes: 10cbd6407609 ("ftgmac100: Rework NAPI & interrupts handling") > > Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com> > > Signed-off-by: Joel Stanley <joel@jms.id.au> > > Reviewed-by: Joel Stanley <joel@jms.id.au> net maintainers, this one never made it into the tree. Do you need me to re-send it? Cheers, Joel > > > --- > > drivers/net/ethernet/faraday/ftgmac100.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c > > index 0c67fc3e27df..57736b049de3 100644 > > --- a/drivers/net/ethernet/faraday/ftgmac100.c > > +++ b/drivers/net/ethernet/faraday/ftgmac100.c > > @@ -1326,6 +1326,7 @@ static int ftgmac100_poll(struct napi_struct *napi, int budget) > > */ > > if (unlikely(priv->need_mac_restart)) { > > ftgmac100_start_hw(priv); > > + priv->need_mac_restart = false; > > > > /* Re-enable "bad" interrupts */ > > ftgmac100_write(FTGMAC100_INT_BAD, priv->base + FTGMAC100_OFFSET_IER); > > -- > > 2.17.1 > >
From: Joel Stanley <joel@jms.id.au> Date: Fri, 12 Mar 2021 00:26:43 +0000 > On Tue, 20 Oct 2020 at 04:14, Joel Stanley <joel@jms.id.au> wrote: >> >> On Mon, 19 Oct 2020 at 08:57, Dylan Hung <dylan_hung@aspeedtech.com> wrote: >> > >> > The interrupt handler may set the flag to reset the mac in the future, >> > but that flag is not cleared once the reset has occured. >> > >> > Fixes: 10cbd6407609 ("ftgmac100: Rework NAPI & interrupts handling") >> > Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com> >> > Signed-off-by: Joel Stanley <joel@jms.id.au> >> >> Reviewed-by: Joel Stanley <joel@jms.id.au> > > net maintainers, this one never made it into the tree. Do you need me > to re-send it? If it has been this long, definitely you need to resend.
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 0c67fc3e27df..57736b049de3 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1326,6 +1326,7 @@ static int ftgmac100_poll(struct napi_struct *napi, int budget) */ if (unlikely(priv->need_mac_restart)) { ftgmac100_start_hw(priv); + priv->need_mac_restart = false; /* Re-enable "bad" interrupts */ ftgmac100_write(FTGMAC100_INT_BAD, priv->base + FTGMAC100_OFFSET_IER);
The interrupt handler may set the flag to reset the mac in the future, but that flag is not cleared once the reset has occured. Fixes: 10cbd6407609 ("ftgmac100: Rework NAPI & interrupts handling") Signed-off-by: Dylan Hung <dylan_hung@aspeedtech.com> Signed-off-by: Joel Stanley <joel@jms.id.au> --- drivers/net/ethernet/faraday/ftgmac100.c | 1 + 1 file changed, 1 insertion(+)