Received-SPF: pass (google.com: domain of linux-wireless+bounces-4513-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,
	Ping-Ke Shih <pkshih@realtek.com>
Cc: Fiona Klute <fiona.klute@gmx.de>,
	Kalle Valo <kvalo@kernel.org>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	linux-mmc@vger.kernel.org,
	Pavel Machek <pavel@ucw.cz>,
	=?UTF-8?q?Ond=C5=99ej=20Jirman?= <megi@xff.cz>
Subject: [PATCH v3 8/9] wifi: rtw88: Reset 8703b firmware before download
Date: Sat,  9 Mar 2024 12:56:44 +0100
Message-ID: <20240309115650.367204-9-fiona.klute@gmx.de>
In-Reply-To: <20240309115650.367204-1-fiona.klute@gmx.de>
References: <20240309115650.367204-1-fiona.klute@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:NG+efRHEFds=;xkjLljadMslbiPLJ0M2iv6rgyMv
 WUEDgmlZGX+yzBIL3SuZXgxzd/np/w9Vq2JNs2OjWg1g9lVLUBq2ejRm/p78feAZ8X1x9rzqa
 U6pvsuCWZQIQSfZWiRnoZkBpxIP1KMf6uV0VCxVNToIDKZkI9h8NpGFE7JmGKCKNcqtwH33us
 dy9VKCDL7QCLRAIPfjdJzWcLDzCwjoiDnXB4+dXaciazBobyOwVFaE78EivKqZf9KAuJQzuq9
 K1Bn1HZF5vNvSIXGcA9IriTSaCnnAF/udzqsY9nYLedaZZ002kZi229nhUEf8dKyAuKe7S2+R
 Yp4UHHXpXxdT2o2DYapIvw7SwBLXV0+8uO3ibgNm/hpbZUGi2BpmEWC2iNQXZ7GjuVWRO/Q9I
 rk55jvbFg5r5LBoM5PmAzQ+UIrGjJNKXf5v1+R2vWn+prcs0BiCRS9zYUhzxKRrECP+Ed3RO7
 uevNn8WsGoB4tZgCbjnQv4LIQeU+AVzEDLKcPMv9XAOk5jjwwg2B7ZeT6Obvk3TqC6b0IUAgP
 yl8WFJAYhT6HGpaKkC40AAnstOYITitrh4b3daMxO9UjRR9udn6BJRAjmPF5liyAbPyKTOtaP
 ksCMM0R9JoJTzuRayd2yg8lNvYTlXfe633ALnJo7KSucvqqdq/3/hfNrofKG5fmtHAC/kZ737
 R7bmtp5+44FuAprX6nHrfcoRGzRrfVohlkHb2jxE67w1nRmECoHbToQkGuLEmkjkYJziCaEL1
 5sXt+43sVDa2uhOYLWMWEeXCGZukn39rI1l+vfpqR1/qMZI1WItoPUK3VJhrC9vBf0QojPiO0
 uZCY8jazskYD8eZc5fDSLRnuxM/GiDf8sMNSmho5xUj90=

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