From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 54EB05101A; Mon, 11 Dec 2023 18:27:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Z4bHDcWL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB514C433C7; Mon, 11 Dec 2023 18:27:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1702319246; bh=TCWkzqlmE/0aj0EFdPRVJQA2CUL25ZtKSgyd+zF2u+s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z4bHDcWLImiU29HOodr1Yhe0gLrBCY5uF0VKWkAUZ2kZgzydJFSXYiDBgRnTzjBlg LHq65sIQACurN8+DdC1AEFr8isZUNXcCUxEq1ib4Xo27MXP3mc4Q4ON2Eo+Gymmtv4 98n4ZQYEeWuoxVY1/8irkIBwyN5A+MstloWVKmTA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Grant Grundler , Douglas Anderson , Hayes Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 6.6 034/244] r8152: Add RTL8152_INACCESSIBLE to r8156b_wait_loading_flash() Date: Mon, 11 Dec 2023 19:18:47 +0100 Message-ID: <20231211182047.349390045@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231211182045.784881756@linuxfoundation.org> References: <20231211182045.784881756@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Douglas Anderson [ Upstream commit 8a67b47fced9f6a84101eb9ec5ce4c7d64204bc7 ] Delay loops in r8152 should break out if RTL8152_INACCESSIBLE is set so that they don't delay too long if the device becomes inaccessible. Add the break to the loop in r8156b_wait_loading_flash(). Fixes: 195aae321c82 ("r8152: support new chips") Reviewed-by: Grant Grundler Signed-off-by: Douglas Anderson Acked-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index bbb2824f285d8..ec43279a482fe 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5488,6 +5488,8 @@ static void r8156b_wait_loading_flash(struct r8152 *tp) int i; for (i = 0; i < 100; i++) { + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) + break; if (ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL) & GPHY_PATCH_DONE) break; usleep_range(1000, 2000); -- 2.42.0