Received: by 2002:a05:7412:251c:b0:e2:908c:2ebd with SMTP id w28csp296885rda; Sat, 21 Oct 2023 08:06:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGsYk9KkUwC9SaRH9LksAq6SoXa8exE9U2w+XLcQGBfgQmZ7iptQg3No80n3LxT+Ahb5UUW X-Received: by 2002:a17:90b:4c43:b0:27d:9bef:1456 with SMTP id np3-20020a17090b4c4300b0027d9bef1456mr4019350pjb.31.1697900782286; Sat, 21 Oct 2023 08:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697900782; cv=none; d=google.com; s=arc-20160816; b=KG0wzOLSS7y2RSKHfcYnhb1WwaU57C2CSQybCTHYv7/jaijsOwv0+ejvU3d60KmovU uDGKiyRSlniqXmI3dmHUVx2V6lJqmZrNjQCviuz9MtfoPs/ExC0yeCOOpLM2JNPmCAU3 gM3HbPyNhoQtUccEZrcwIJZQ5jMe+Lkd9HgudHk+shNKjDajGc5ruuEaNYcuhwtcszY5 lWguNJLtkiXjE9+M0/S3vlBjM3uLRTLJXx8BYOcXjmsk7biV/BB5B/TjhXFH22XrRqOP XO1D9E3zT48ZJaYJslq/XFAgn4gHiv/nvWraRj9M59QbmsdFnzTaLFCW+OGAOL6RRupR Si9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=w8KjYiWmBScABIuDtiMMncZnICHnoOPuW6DFu0n03Co=; fh=eHa7Z3zbFWM18AVJ5pDRDTgWoVjL+mntYwvIzfMcSJc=; b=PjEHMkowlCqw6wHG+waowgZNOaF+BFv+8X2068+c7WmnEPNG/Gj+JglnYr87txvBAw 2CzG1XHfwMOIBC/81F0ZsG8Z/myRT4uYKKzCpaqCLhxEDhYqGpUc1nii50VGOTYnqSND dD3nLBvPA0LUNvS4cjSoVVXrDyqglgneugHy8jJ8R6Bv75Shyljm4e6y/lveYXQCkk6Q zaQw0GY9PwtmPGtHSg6BSyvkwS2kEcUSOlXtqY25l29QRMCkau4qxNKShWoQz7vmUn2w 0KraJ7ZpPUUSfrrhAoYacLSH63TdMJJClyCqtwSUyXbHAUl93nOxqCxZ+CiZaMudoZQn JULQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=SDlIfAu3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id q9-20020a170902dac900b001c74876f029si3789834plx.381.2023.10.21.08.06.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 08:06:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=SDlIfAu3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 64E3F805CCD4; Sat, 21 Oct 2023 08:05:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231529AbjJUPFi (ORCPT + 99 others); Sat, 21 Oct 2023 11:05:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229784AbjJUPFg (ORCPT ); Sat, 21 Oct 2023 11:05:36 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3E00E7 for ; Sat, 21 Oct 2023 08:05:30 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1c9b70b9671so84545ad.1 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=vlYxXeUsVGQJ05JNjNjD8y8xVYlbmudjEomP9FJzEvL2rvfFus1C/FTX4SZe+4GAoO qXWR+ier17dBPLvAyZKnDWnI1Dyt1wKgxGdMkeZoU8iYsEXxYxTexKhAm/+jlGz27X7Q cbt4mLcK6SiP/WiUA7eZL549lrLi3+GoRrwYHQhFLAoJYTNsUWDDK2t57igDSTdRIj7A bcCv7LvTQg/EFijdhxZixU5j5ltxd9UWLcqcZA261BPdUgMraS0mUd/uV4FUloVNEWeb NNhePQQ2fyOnBUPllf4Inri9kiUhnQODXV0MbNlyhmL8/w3SJ7CgxvoGuaIRf2Abx6vm o87A== X-Gm-Message-State: AOJu0YxRN9Yzii7UtQvgyj7dAVFTjrQM09EKV3ZDTRx4h/VcROyCwEgQ fkTW7xinb36Xt8WeyUDX3lDm/qP3sALhXr8ZWyeKFQ== 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) 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sat, 21 Oct 2023 08:05:57 -0700 (PDT) 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 >