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 285532989D7; Mon, 5 May 2025 22:37:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484654; cv=none; b=eB2Ff5M3lGVZdmj5ADp35rytgU4LsNeXtuBiRMaB41P8hakvb4/IPe0gMSFwgtrN0AtV71ILlT/jedPohfHIQgVjMV4LqrLnk68QVrHOn2ziPA+42aFtKT2JIxWNxkBOBCN/Y6NlLBUBk5Ds10BJeXqh780nx+XUQ+VfPhS4EoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746484654; c=relaxed/simple; bh=oICzpjc+PidZ180DElfETsb3v6xdVVeNPNtBIvsbBgg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oTbpoPy9niBxshvhYpri2ZbnSsstIwS5nd+xiI7ogGslRdPR9sPXr9yFSlcsRXKU0S8CZcPSB4M3FQnSBdZ7WQbsYsHb2LgH9OjWuXqhI7DuKhAexVfkmuxWoEoDnwnQ+W1Gi70TCPHuWB73YRSPfhYwnV3RBDjCWTqk8ta2JAo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SabD7JSe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SabD7JSe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBBE0C4CEF1; Mon, 5 May 2025 22:37:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746484653; bh=oICzpjc+PidZ180DElfETsb3v6xdVVeNPNtBIvsbBgg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SabD7JSehR6RheHodwXfOFlkqkeFJ79XhXtpcmEDU1HSqccYS/jlJYEoM6nkkWtUc LyB8XX9zQ8AIulw4GqSaGciXBKNFuIHIdcHEGtpNhR8uU13os92T2x2sYKiOsc4zic Pzn47h6ecuDChg8SsvpsIvxAhcd0W4ypTqYaHFeBHX5cz1sou6k9nJ9NqMl1wmtGxM 6DTJj4PvEDqbuoNbc+8wsmiw9w1BIDeD0CRv/q0QbjmbYbQUreyfhiLRLxFfSMkxfb WpxsImGktcCUWBppFBq84u7OPHsbR92XUWhDEKsXKZoYu+Cw8uvjlxGDT021zpNLak FA5wpLZhBtQ5w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Soeren Moch , Ping-Ke Shih , Sasha Levin , Jes.Sorensen@gmail.com, linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 586/642] wifi: rtl8xxxu: retry firmware download on error Date: Mon, 5 May 2025 18:13:22 -0400 Message-Id: <20250505221419.2672473-586-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505221419.2672473-1-sashal@kernel.org> References: <20250505221419.2672473-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.5 Content-Transfer-Encoding: 8bit From: Soeren Moch [ Upstream commit 3d3e28feca7ac8c6cf2a390dbbe1f97e3feb7f36 ] Occasionally there is an EPROTO error during firmware download. This error is converted to EAGAIN in the download function. But nobody tries again and so device probe fails. Implement download retry to fix this. This error was observed (and fix tested) on a tbs2910 board [1] with an embedded RTL8188EU (0bda:8179) device behind a USB hub. [1] arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts Signed-off-by: Soeren Moch Acked-by: Ping-Ke Shih Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20250127194828.599379-1-smoch@web.de Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtl8xxxu/core.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/core.c b/drivers/net/wireless/realtek/rtl8xxxu/core.c index 4ce0c05c51291..569856ca677f6 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c @@ -860,9 +860,10 @@ rtl8xxxu_writeN(struct rtl8xxxu_priv *priv, u16 addr, u8 *buf, u16 len) return len; write_error: - dev_info(&udev->dev, - "%s: Failed to write block at addr: %04x size: %04x\n", - __func__, addr, blocksize); + if (rtl8xxxu_debug & RTL8XXXU_DEBUG_REG_WRITE) + dev_info(&udev->dev, + "%s: Failed to write block at addr: %04x size: %04x\n", + __func__, addr, blocksize); return -EAGAIN; } @@ -4064,8 +4065,14 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) */ rtl8xxxu_write16(priv, REG_TRXFF_BNDY + 2, fops->trxff_boundary); - ret = rtl8xxxu_download_firmware(priv); - dev_dbg(dev, "%s: download_firmware %i\n", __func__, ret); + for (int retry = 5; retry >= 0 ; retry--) { + ret = rtl8xxxu_download_firmware(priv); + dev_dbg(dev, "%s: download_firmware %i\n", __func__, ret); + if (ret != -EAGAIN) + break; + if (retry) + dev_dbg(dev, "%s: retry firmware download\n", __func__); + } if (ret) goto exit; ret = rtl8xxxu_start_firmware(priv); -- 2.39.5