[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAD=FV=VOdj5z76Rvue93MUriGhX2Arijo-ZMifHw=qO6kxbjtQ@mail.gmail.com>
Date: Wed, 29 Nov 2023 13:26:52 -0800
From: Doug Anderson <dianders@...omium.org>
To: Hayes Wang <hayeswang@...ltek.com>
Cc: Jakub Kicinski <kuba@...nel.org>, "David S . Miller" <davem@...emloft.net>,
Laura Nao <laura.nao@...labora.com>, Edward Hill <ecgh@...omium.org>,
Alan Stern <stern@...land.harvard.edu>, Grant Grundler <grundler@...omium.org>,
"linux-usb@...r.kernel.org" <linux-usb@...r.kernel.org>, Simon Horman <horms@...nel.org>,
Bjørn Mork <bjorn@...k.no>,
Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH net v2 2/5] r8152: Add RTL8152_INACCESSIBLE checks to more loops
Hi,
On Wed, Nov 29, 2023 at 4:47 AM Hayes Wang <hayeswang@...ltek.com> wrote:
>
> Douglas Anderson <dianders@...omium.org>
> > Sent: Wednesday, November 29, 2023 5:38 AM
> [...]
> > @@ -3000,6 +3000,8 @@ static void rtl8152_nic_reset(struct r8152 *tp)
> > ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CR, CR_RST);
> >
> > for (i = 0; i < 1000; i++) {
> > + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags))
> > + return;
> > if (!(ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CR) & CR_RST))
> > break;
> > usleep_range(100, 400);
> > @@ -3329,6 +3331,8 @@ static void rtl_disable(struct r8152 *tp)
> > rxdy_gated_en(tp, true);
> >
> > for (i = 0; i < 1000; i++) {
> > + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags))
> > + return;
>
> I think you have to replace return with break.
> Otherwise, rtl_stop_rx() wouldn't be called.
> And, you may free the memory which is using, when rtl8152_close () is called.
>
> > ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
> > if ((ocp_data & FIFO_EMPTY) == FIFO_EMPTY)
> > break;
> > @@ -3336,6 +3340,8 @@ static void rtl_disable(struct r8152 *tp)
> > }
> >
> > for (i = 0; i < 1000; i++) {
> > + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags))
> > + return;
>
> Same as above.
Good catch, thanks! I've changed all of the `return` statements in
this patch to `break` for consistency, though for the other ones it
doesn't really matter. For patch #3 I also changed the `return` to a
`break`, but for patches #4 and #5 the return was better so I left
those.
v3 posted now with this fix.
-Doug
Powered by blists - more mailing lists