Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
From:   Shiji Yang <yangshiji66@outlook.com>
To:     linux-wireless@vger.kernel.org
Cc:     Stanislaw Gruszka <stf_xl@wp.pl>,
        Helmut Schaa <helmut.schaa@googlemail.com>,
        Kalle Valo <kvalo@kernel.org>,
        Shiji Yang <yangshiji66@outlook.com>
Subject: [PATCH] wifi: rt2x00: fix rt2800 watchdog function
Date:   Sat, 14 Oct 2023 14:55:01 +0800
Message-ID: <TYAP286MB0315BC1D83D31154924F0D39BCD1A@TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: TYAP286MB0315:EE_|OSZP286MB2332:EE_
X-MS-Office365-Filtering-Correlation-Id: 55c5a1c7-f8ad-488c-6882-08dbcc82879b
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: kX3FKwoXrgZeft6oQlGrtYi3K3ldmYK8odU2dm9tu+QzqEnlqgN1lI8T7geijsPWqg7EGWET4+/WSGegWEGPfWz9OQQsUebcw9JAUatXpW8Rsetja1M2kNrznAxHIf6AnR67uV0yOWjpGEV2A/yLyfySmIteh6ET6bYAe9N3zVbXzYRSSj1x3q/DQamO3anIFOq7N7Ic0rMdzeQGY1vpDtE7OeOktzGKfjcisy2qR4LBhpS4RgbkGtS1u+Muv7wzbv+0+K/28Sa+v2+MpVQg+VBctoRZ6wdC7mI5U0MjNZvQml4Bzu6hmkCsQX8wGYAlcXLamhlYcbOk1O/QnDZONvvCnMAbwWvRH/99HsB10SmUF5E65CnaCOiNithtvBswovZuHfDtoMLexX9MFg9PHHMKXVUz2GFodVfhBb4yPwGMj2W8lZ606QFSplxx8t0JUChP3j6zF8zgi1YE4hddbIEDDD3Lnjh49Mztg/7Nrm5w+CV0HGgEn+g454bFQdI4yvPsPW49IUhFoawVoAXIKQul2OQv8SVa3XP6NeTig9UKyx0FJ/XNziJ8vu2u6Wo6RxpSlKcviNLHrnar9Xcw61WN1c3E3e7kFp22r7rXZOQ=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tJgy4Z+RvAfEtbjaEZrhqQaE7j8154BejNobzK/qXwNQPMk6RKuT2lpqUngS?=
 =?us-ascii?Q?vYUheyC+Im1yqT7z2AEokrmMcjIrxukDfou28e2pDx+BaovHAV2lyRASn9JE?=
 =?us-ascii?Q?NZWmfi6nIk6icd331tN95d4IVZl1zuOCIek47j8ZrrI6pYA+9Tmyj2ltx3hU?=
 =?us-ascii?Q?7uy5qFdE0Qz9A2ZlCjv0sXPQeubvVcoi50YOBesFqTNqd2/QBvUWJjMjij7u?=
 =?us-ascii?Q?3h/0zRCWTcI5uA35lS4wTmUxRh2x/ogXnPF+hpy/DSE0negnSz2CUjkXcjEf?=
 =?us-ascii?Q?32M2bpOClUctLbT/W+74OxK+MEY70G8WHf3+k7dJ/4Eu6oelBxoKrawbe1UX?=
 =?us-ascii?Q?HxSc6h36LPv37NSy/O+CKI2Z2nfcq35DwR4Kddf3N7HUAYQdRwwY+v/CTJq2?=
 =?us-ascii?Q?1S0xWGStbe4XeWzPKsdXi6TJSDqToccJISmiihUiOtDkDG1AWh7BnjwJnrux?=
 =?us-ascii?Q?1tjoWxw933jNEUDlwB1yTMHtrTFyEQsiyzgHsqEpOTPkR9jDl2NJ3nFVmqJs?=
 =?us-ascii?Q?lEiGjbkNG98FiefY/ZUZ8GAtJ7BNxozZDPKhZ9t7ZtcbpmvmBaR4WZKbWQAC?=
 =?us-ascii?Q?NbQqeCZ+ZiZO2KgC9EZbKxrOGm0jvwSVM6Vgh98+4IHmA+G6w7ZMxJ7d3fls?=
 =?us-ascii?Q?lChZ88BCDAiowIx4nw66xKGe9vHV6jomv2pNRvqbE8XroIc3e97cjW/trTwW?=
 =?us-ascii?Q?S15z5BH5jEBP+PPmJ8CGhtPlaQrBekOKMr5zLPcnLwvwr2ATxezYl8QPyxnG?=
 =?us-ascii?Q?gtjDm2dbmxOfA7zuEeNsF1qeXk4uYnse38pwzLK5HA0ZtoFzYXtH1AFCGavy?=
 =?us-ascii?Q?kxjfvkq9tjUlf/g/tV5jzsERfTS+oPnqmkVFB/bg/McSQ22rFI0R0LprAb5i?=
 =?us-ascii?Q?QN9jcYH3SiuKKMtJQJR4TY0+23/dxgiLLdkL4qFy8fJXejpXXWs2KO36K8LO?=
 =?us-ascii?Q?ibVDqumLI7/SrErHW2Q0dXGbR3xemqe9RQNa6iR0aRj9afhCr7XNCwmgQ+Q9?=
 =?us-ascii?Q?f4lKoMnxWIpZfMe2ma0hTT4DVUsypwi1rTHD47M0eJOpQoMKMDHWuqmzaFNX?=
 =?us-ascii?Q?SxORKcmmDEVjN4AuFBj7hSVZIl6fHYPjgmhkG+5RR/igwitTY58aL6LZgfxe?=
 =?us-ascii?Q?El0mnWOaIWcDy3fDusKUxKIfTURyBkfu7Cl5Nyu63DWd3ClOPLWx0A4Rw/mL?=
 =?us-ascii?Q?Rw3A4i2RRm1tAHVxEjRrff9OqaZwCH2GHhSCcFw3cgAgRs0WhXJmOmJjW44?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 55c5a1c7-f8ad-488c-6882-08dbcc82879b
X-MS-Exchange-CrossTenant-AuthSource: TYAP286MB0315.JPNP286.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2023 06:55:20.4024
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: OSZP286MB2332
X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Fri, 13 Oct 2023 23:55:27 -0700 (PDT)

The watchdog function is broken on rt2800 series SoCs. This patch
fixes the incorrect watchdog logic to make it work again.

1. Update current wdt queue index if it's not equal to the previous
   index. Watchdog compares the current and previous queue index to
   judge if the queue hung.
2. Make sure hung_{rx,tx} 'true' status won't be override by the
   normal queue. Any queue hangs should trigger a reset action.
3. Clear the watchdog counter of all queues before resetting the
   hardware. This change may help to avoid the reset loop.
4. Change hang check function return type to bool as we only need
   to return two status, yes or no.

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index e65cc00fa..d39d87827 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -1236,13 +1236,14 @@ void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev)
 }
 EXPORT_SYMBOL_GPL(rt2800_txdone_nostatus);
 
-static int rt2800_check_hung(struct data_queue *queue)
+static bool rt2800_check_hung(struct data_queue *queue)
 {
 	unsigned int cur_idx = rt2800_drv_get_dma_done(queue);
 
-	if (queue->wd_idx != cur_idx)
+	if (queue->wd_idx != cur_idx) {
+		queue->wd_idx = cur_idx;
 		queue->wd_count = 0;
-	else
+	} else
 		queue->wd_count++;
 
 	return queue->wd_count > 16;
@@ -1279,7 +1280,7 @@ void rt2800_watchdog(struct rt2x00_dev *rt2x00dev)
 		case QID_MGMT:
 			if (rt2x00queue_empty(queue))
 				continue;
-			hung_tx = rt2800_check_hung(queue);
+			hung_tx = hung_tx || rt2800_check_hung(queue);
 			break;
 		case QID_RX:
 			/* For station mode we should reactive at least
@@ -1288,7 +1289,7 @@ void rt2800_watchdog(struct rt2x00_dev *rt2x00dev)
 			 */
 			if (rt2x00dev->intf_sta_count == 0)
 				continue;
-			hung_rx = rt2800_check_hung(queue);
+			hung_rx = hung_rx || rt2800_check_hung(queue);
 			break;
 		default:
 			break;
@@ -1301,8 +1302,12 @@ void rt2800_watchdog(struct rt2x00_dev *rt2x00dev)
 	if (hung_rx)
 		rt2x00_warn(rt2x00dev, "Watchdog RX hung detected\n");
 
-	if (hung_tx || hung_rx)
+	if (hung_tx || hung_rx) {
+		queue_for_each(rt2x00dev, queue)
+			queue->wd_count = 0;
+
 		ieee80211_restart_hw(rt2x00dev->hw);
+	}
 }
 EXPORT_SYMBOL_GPL(rt2800_watchdog);
 
-- 
2.39.2