From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84AF9137E for ; Sat, 21 Oct 2023 15:05:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="SDlIfAu3" Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B018BDA for ; Sat, 21 Oct 2023 08:05:30 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1c9c496c114so118375ad.0 for ; Sat, 21 Oct 2023 08:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1697900730; x=1698505530; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=w8KjYiWmBScABIuDtiMMncZnICHnoOPuW6DFu0n03Co=; b=SDlIfAu3s6+n8hsKGnhmsqC8Br5Oyt13S1ImxgsR2tqN/MNMJB1vC633Vm3HhS1io1 aUuoH+7k+uQ0R2FrFTejqwmL6Qhx+Av8ZCaF6Zvt6tiTUc8RR1G3LjR2B410BHSekSnc 6Lej37Yce3nzEJACeUN7NSKOEoBM3bHvmr8xc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697900730; x=1698505530; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w8KjYiWmBScABIuDtiMMncZnICHnoOPuW6DFu0n03Co=; b=Pr5DhC/Zi4qSEnMYI8aGjcJ96cmktMgOFryDhV7BBU1kACscDu2w6Wsj2OZ3A3nClT DzvYipnQXcNvtuQ8bEM8rVrBLOI5jgNUG8db0UKmXevO9U/BE4Hz7pFWVW8IHSYUm1Gp 8B0arxhIYwWM5V+GKjnqu1/oDYkpa8WLz9bq+k87MNcs0cado3k0jdr8oTn6MuglTqgd H67TycSfFRuSr1a37PImWQjDKnUrSdM2QXF+zWHIcbVB2IGeYOHiDaXBIcpmn2xQb+ET +kbdmUKWZAY34ATdv2XtkwXcfXJBycEkeWOdLlimR7LwIT80k8VLoMoWygEKC4U27Efg INlA== X-Gm-Message-State: AOJu0YxJ0CFF/km7UbbS/NZEh1t7BJrtTaSVp5T76TRkSGqSPc/EHTeU w+ztK7pharUJUozLiBskrnKHcDZuFbuQYqGkF10V5w== X-Google-Smtp-Source: AGHT+IFZM53rLwdSL4zLJjFCgja09RLXFY4PbcwJmF4VO64lGjKNAOvBSbN9z57Vmt/saKmcBQTSDgpDDrsTUJkcJPI= X-Received: by 2002:a17:902:f70d:b0:1c9:c480:1797 with SMTP id h13-20020a170902f70d00b001c9c4801797mr383690plo.11.1697900729915; Sat, 21 Oct 2023 08:05:29 -0700 (PDT) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20231020210751.3415723-1-dianders@chromium.org> <20231020140655.v5.6.I6405b1587446c157c6d6263957571f2b11f330a7@changeid> In-Reply-To: <20231020140655.v5.6.I6405b1587446c157c6d6263957571f2b11f330a7@changeid> From: Grant Grundler Date: Sat, 21 Oct 2023 08:05:18 -0700 Message-ID: Subject: Re: [PATCH v5 6/8] r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en() To: Douglas Anderson Cc: Jakub Kicinski , Hayes Wang , "David S . Miller" , Edward Hill , Laura Nao , Alan Stern , Simon Horman , linux-usb@vger.kernel.org, Grant Grundler , =?UTF-8?Q?Bj=C3=B8rn_Mork?= , Eric Dumazet , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Fri, Oct 20, 2023 at 2:08=E2=80=AFPM Douglas Anderson wrote: > > If the adapter is unplugged while we're looping in r8153b_ups_en() / > r8153c_ups_en() we could end up looping for 10 seconds (20 ms * 500 > 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 Reviewed-by: Grant Grundler > --- > > (no changes since v2) > > Changes in v2: > - ("Check for unplug in r8153b_ups_en() / r8153c_ups_en()") new for v2. > > drivers/net/usb/r8152.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c > index 9888bc43e903..982f9ca03e7a 100644 > --- a/drivers/net/usb/r8152.c > +++ b/drivers/net/usb/r8152.c > @@ -3663,6 +3663,8 @@ static void r8153b_ups_en(struct r8152 *tp, bool en= able) > int i; > > for (i =3D 0; i < 500; i++) { > + if (test_bit(RTL8152_UNPLUG, &tp->flags)) > + return; > if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_B= OOT_CTRL) & > AUTOLOAD_DONE) > break; > @@ -3703,6 +3705,8 @@ static void r8153c_ups_en(struct r8152 *tp, bool en= able) > int i; > > for (i =3D 0; i < 500; i++) { > + if (test_bit(RTL8152_UNPLUG, &tp->flags)) > + return; > if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_B= OOT_CTRL) & > AUTOLOAD_DONE) > break; > -- > 2.42.0.758.gaed0368e0e-goog >