Received-SPF: pass (google.com: domain of linux-wireless+bounces-4553-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
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 v4 8/9] wifi: rtw88: Reset 8703b firmware before download
Date: Mon, 11 Mar 2024 11:37:12 +0100
Message-ID: <20240311103735.615541-9-fiona.klute@gmx.de>
In-Reply-To: <20240311103735.615541-1-fiona.klute@gmx.de>
References: <20240311103735.615541-1-fiona.klute@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:+TILPNUhTsw=;q8nMNFkib4Pvwo9jtvDhgU4jfYG
 hBV433wa0i72JDAKxic79rao6mXgHLwbkxNj77yfps3PCVWBEm7TZOXcQp1wPpeBhzTZz/MeO
 GG5JDjrxdxxztWUCYYwlc+CyruVFPQx2wkW3fWbu68aQjTYkUHED5Q7Ue3P0FVZF2YmKvSucG
 5V4gDEYN/bn1r1LG6nQp57STy6W70Co+rR/XvnX97JyoQf3zlKp9ChTvfno9hGMzXGdrqDg6O
 KvU+gI/Ir9AzTJ8ZeZa89fr9lW+tKOiXGarg/XQwnS5D4/fPqBA7ALsJrbHpIBj6w+JrCgDPc
 AwPmZ5rqUDYAtzoFcyYBZwwXvIlj2eSSNu+xWXuBo2p2pPlFeiYiTsgN79bdEqHRCGwEf5fvZ
 uogX6fm1/cJIfyYaFUbNU6WVHas/dtrkVKBWyYyyj6cI2OvQyZlryYPaV7WZLvVQdDu7fCOSr
 eej7rTfovTkgR31ZwTtZ29P29KhWraDnqgI9Uk9Phkzxi/IR4Y2cgb81v9q2Mzrdaf45bkUzx
 IImM3bqA4sT7rssLu2lW0nLkjV8hFrT1aNXnzhaEs867dXf4rbGYNUJLv2Wh2IcQ+SUidVlCM
 WSN48VBntkIJxYRTcN295hCm/vmMmRsz25h+Rm3aGq8v1O4Wc4WALjs8hO6ORTfpn9rCrsbmf
 3ycbtY5Rcg6fP8rsl8CpKT6icd550Lzz3VSwT7czYyjZ7K7RLgH69Uu2P5yriF3pK52Sa4DPz
 V0yJ0Iq3qcaJhtpQXZKw8VyMcXYXbxFLWV8dTX3ElPbfRWDPGhvJo1FC25oYmCrg35uaLhd+U
 ewLLDv0K9XUXA0JcItcyBHnaTf+ybvJ/jLu7GlSQnGJ1Q=

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