Re: [PATCH v5 5/8] r8152: Check for unplug in rtl_phy_patch_request()

From: Grant Grundler
Date: Sat Oct 21 2023 - 11:03:40 EST


On Fri, Oct 20, 2023 at 2:08 PM Douglas Anderson <dianders@xxxxxxxxxxxx> wrote:
>
> If the adapter is unplugged while we're looping in
> rtl_phy_patch_request() we could end up looping for 10 seconds (2 ms *
> 5000 loops). Add code similar to what's done in other places in the
> driver to check for unplug and bail.
>
> Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>

Reviewed-by: Grant Grundler <grundler@xxxxxxxxxxxx>

> ---
>
> (no changes since v2)
>
> Changes in v2:
> - ("Check for unplug in rtl_phy_patch_request()") new for v2.
>
> drivers/net/usb/r8152.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
> index 656fe90734fc..9888bc43e903 100644
> --- a/drivers/net/usb/r8152.c
> +++ b/drivers/net/usb/r8152.c
> @@ -4046,6 +4046,9 @@ static int rtl_phy_patch_request(struct r8152 *tp, bool request, bool wait)
> for (i = 0; wait && i < 5000; i++) {
> u32 ocp_data;
>
> + if (test_bit(RTL8152_UNPLUG, &tp->flags))
> + break;
> +
> usleep_range(1000, 2000);
> ocp_data = ocp_reg_read(tp, OCP_PHY_PATCH_STAT);
> if ((ocp_data & PATCH_READY) ^ check)
> --
> 2.42.0.758.gaed0368e0e-goog
>