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 C96DD2153C6; Wed, 7 May 2025 18:55:58 +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=1746644158; cv=none; b=MS7YhckCRwMOUCYnAgKLjAdxp7LZ1LGXduAKLDzjDsenvFFAPn9IRRZKH7n8zYbV1e6VH23sgcFJE1eFrdCjrgAmEUxLSrwSGE7DULYk2iDYgQ9UAdHSjb7i5DpgDypkv39QP+a6RNRdFhao/6djS34EwAfL5JAYG4mSg4DFqM0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746644158; c=relaxed/simple; bh=1GAspSXPgK+oJGd3CrACq4azQq+d0QJJUz472UXB0V8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BldbRDpZXaq2t38s1SyLgPXQg90+hsGG9xQ7Ox9uogDPg8FQSolGz4ucHrDwAfi/w/zyAneD+woZUxNb1pcKVG+VP3X6aQ3OQ1KHRpE69kmOQStdMF7vKLvKBWLyjX7u33Tl2mmL8JvZwDNa29C7CV+rYoxb5oGoX0EYK8vOFjU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Rp+2ckS9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Rp+2ckS9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59386C4CEE2; Wed, 7 May 2025 18:55:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1746644158; bh=1GAspSXPgK+oJGd3CrACq4azQq+d0QJJUz472UXB0V8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rp+2ckS9LRxyfj/peQwA4PsYag/Qxg6aT5U/exfmT50PLQUDGduuYqG3ghHIPrFQ0 gKu4iot88+XU6n7YvHqySiZ5KhZjsaPJFr2cemJfO/6hEWMYzixfVoHvzClQWUbCJv HpvjUANDqn22uIoNfGeVoCbMloTPnD6GWJMC+PkQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mattias Barthel , Andrew Lunn , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.14 138/183] net: fec: ERR007885 Workaround for conventional TX Date: Wed, 7 May 2025 20:39:43 +0200 Message-ID: <20250507183830.432544623@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507183824.682671926@linuxfoundation.org> References: <20250507183824.682671926@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mattias Barthel [ Upstream commit a179aad12badc43201cbf45d1e8ed2c1383c76b9 ] Activate TX hang workaround also in fec_enet_txq_submit_skb() when TSO is not enabled. Errata: ERR007885 Symptoms: NETDEV WATCHDOG: eth0 (fec): transmit queue 0 timed out commit 37d6017b84f7 ("net: fec: Workaround for imx6sx enet tx hang when enable three queues") There is a TDAR race condition for mutliQ when the software sets TDAR and the UDMA clears TDAR simultaneously or in a small window (2-4 cycles). This will cause the udma_tx and udma_tx_arbiter state machines to hang. So, the Workaround is checking TDAR status four time, if TDAR cleared by hardware and then write TDAR, otherwise don't set TDAR. Fixes: 53bb20d1faba ("net: fec: add variable reg_desc_active to speed things up") Signed-off-by: Mattias Barthel Reviewed-by: Andrew Lunn Link: https://patch.msgid.link/20250429090826.3101258-1-mattiasbarthel@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/freescale/fec_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index f7c4ce8e9a265..c5d5fa8d7dfdd 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -714,7 +714,12 @@ static int fec_enet_txq_submit_skb(struct fec_enet_priv_tx_q *txq, txq->bd.cur = bdp; /* Trigger transmission start */ - writel(0, txq->bd.reg_desc_active); + if (!(fep->quirks & FEC_QUIRK_ERR007885) || + !readl(txq->bd.reg_desc_active) || + !readl(txq->bd.reg_desc_active) || + !readl(txq->bd.reg_desc_active) || + !readl(txq->bd.reg_desc_active)) + writel(0, txq->bd.reg_desc_active); return 0; } -- 2.39.5