Received-SPF: pass (google.com: domain of linux-wireless+bounces-4123-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: Fiona Klute <fiona.klute@gmx.de>
To: linux-wireless@vger.kernel.org,
	pkshih@realtek.com
Cc: Fiona Klute <fiona.klute@gmx.de>,
	kvalo@kernel.org,
	ulf.hansson@linaro.org,
	linux-mmc@vger.kernel.org,
	pavel@ucw.cz,
	megi@xff.cz
Subject: [PATCH v2 8/9] wifi: rtw88: Reset 8703b firmware before download
Date: Wed, 28 Feb 2024 00:55:02 +0100
Message-ID: <20240227235507.781615-9-fiona.klute@gmx.de>
In-Reply-To: <20240227235507.781615-1-fiona.klute@gmx.de>
References: <20240227235507.781615-1-fiona.klute@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:rIvpk7JLOG4=;qM6BzlFHdR9J9tMp7xHbQq6/8OU
 Y1gp+2UMfa8IgJWDTdIX7DImCtcuYO5FxkVYWKVsa7/vTOViBxwmhcUY2YNMECn178mNMyO3K
 aJo1XzCb49P+5Frun49XZjCbSOzz6WA5Me2iZu7dAh5l1Ttz//ht/9942Ug11JKqAdb8BX6cL
 r0KjayHa4W805Ty9m22t6P6bBAQgKvasEuUzb48UNeDzbv1iHG/mWZo4aT/rhNzi61rs7z+FD
 MKqrd2GSuvF0nHtLnbnB0lUzoohBTE2qJtxxxMavWpM4dDA+nD8gggELnvai0O4rm87+VyWof
 LdYaB+6kANsk6MEq9C8Lw4Cc1MqcTdVoXhiJ3wHOLGD7sk9eU5aSDTZHqrFf8CqN41q7VTvj+
 MUehCDv7nmO3tQqFL1SmTg/Xn8IuGxtcwjMlGxUT+6fdwTkA1fGk2AUC7PRwEoh7HYt5XZz4t
 Y/f73lIYglxPOnMWJdk7k8JeSsQ1Xl+Bc0NSqSh9q92Xu2k/eFnZP54/Z8NmoR6qI4k6Ntx0D
 fQVoWnpeJswycFNFRM/6EI+OFm1XbNwLrsCpLEtQ1SnSgZqISZ4GL6i+K6Yz1vNhUabwNOhvM
 stHMKk/2CUxUQrrvs4r1uLcEFEMgB0vXBUUkiU2SXaY6MjJPVWJb8wdVG5veBzE1iVHBfjK84
 0+gHB6i8/yr/JCtLZ0btnjTXsVfdVpooxuV9UcyztGyI0cgLYKl7a3XB1uVRZRbiJfq1crkUe
 10TAgjMoMyDaSo00NmPhrrAbvZ0guV/3Rgyd1hORmgOq5kjvBpDaU462CZx2RR3g2wg6Yf4YN
 TFJeIIR/aUVd+T3x/WLXA6uz+XUMVU2/bYUytVnRy8gTU=

Sometimes 8703b firmware is still active from previous use when the
driver needs to download the firmware during MAC activation. Reset it
in that case.

Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Tested-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
=2D--
 drivers/net/wireless/realtek/rtw88/mac.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw88/mac.c b/drivers/net/wirele=
ss/realtek/rtw88/mac.c
index 298663b0358..5fa38b1068e 100644
=2D-- a/drivers/net/wireless/realtek/rtw88/mac.c
+++ b/drivers/net/wireless/realtek/rtw88/mac.c
@@ -936,6 +936,12 @@ static int __rtw_download_firmware_legacy(struct rtw_=
dev *rtwdev,
 {
 	int ret =3D 0;

+	/* reset firmware if still present */
+	if (rtwdev->chip->id =3D=3D RTW_CHIP_TYPE_8703B &&
+	    rtw_read8_mask(rtwdev, REG_MCUFW_CTRL, BIT_RAM_DL_SEL)) {
+		rtw_write8(rtwdev, REG_MCUFW_CTRL, 0x00);
+	}
+
 	en_download_firmware_legacy(rtwdev, true);
 	ret =3D download_firmware_legacy(rtwdev, fw->firmware->data, fw->firmwar=
e->size);
 	en_download_firmware_legacy(rtwdev, false);
=2D-
2.43.0