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 DFBC41EAB8C; Tue, 3 Sep 2024 20:48:30 +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=1725396511; cv=none; b=L7uplpvUeH9sUSqNx5W18QaOeiplAzyJVWJsNtskvlQekZkbPZfiPiRfjVUCHkOR5XiFoQDtjpFqgbihT2VqKmMAGEhhfmDlTj15YtzECmnwY7fMk8HG7IMHTkPR+mChXR70EKIKL1xZ+SIaZgS/XsFZlk2S+6zvmjdonA9sWCY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725396511; c=relaxed/simple; bh=Vs60VZnfjjkB5j0WyCOH/EUPCzAHPB8zuvQIYQ5Yksk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sKLxNmfEpOQh6I/VklwKQNoBBZGuVckofGAam9+lIQSHk6LuT85i5VMOENQxRNU/g1afLDyJKjyn+5FEqZH3+X8BHAhW4uoB5iNd3OvUqi++fzN490j1gcfo9z9qBK7ni/ZqJodeYRnreSRpexGJG77JfzKOyfM6cnh5C7qIge4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u/uV05Kb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="u/uV05Kb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95C31C4CEC5; Tue, 3 Sep 2024 20:48:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725396510; bh=Vs60VZnfjjkB5j0WyCOH/EUPCzAHPB8zuvQIYQ5Yksk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u/uV05KbLLMxmUHLK/wyJ4aCpNW0rjqXsjprxdmPxT/FzEh82NAg4YMlyxZ8dcGCK o2qFqc45zn3xh+0qR7VC6hkhAdJt3lfAjPzKgndBNGoElOwBkoOPZyZjDfE2Z+XmA7 sB0cEe7rIA3dW+5SybhFFflMkbMPsPlV2eOfZntiYm4835V13eo4at30nQFXEJf4RM wwMlXs7TkJ4JKEgLHGVh4sM5N+NDegTTaEAjPJe9nvYBK6jb5ywx3HYcE/yaBzLnwP u7/nq+chDoi8Y24gM0ebCsiRuYYFvu7zs5i2Or2mLp+9RQLtpsqOXkUv6gupf2fUOX 4DW/bNySIhugQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jacky Chou , "David S . Miller" , Sasha Levin , edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, u.kleine-koenig@pengutronix.de, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 6/8] net: ftgmac100: Ensure tx descriptor updates are visible Date: Tue, 3 Sep 2024 15:28:42 -0400 Message-ID: <20240903192859.1108979-6-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240903192859.1108979-1-sashal@kernel.org> References: <20240903192859.1108979-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.282 Content-Transfer-Encoding: 8bit From: Jacky Chou [ Upstream commit 4186c8d9e6af57bab0687b299df10ebd47534a0a ] The driver must ensure TX descriptor updates are visible before updating TX pointer and TX clear pointer. This resolves TX hangs observed on AST2600 when running iperf3. Signed-off-by: Jacky Chou Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/faraday/ftgmac100.c | 26 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 98e94d914597a..1de25a5a3f13a 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -567,7 +567,7 @@ static bool ftgmac100_rx_packet(struct ftgmac100 *priv, int *processed) (*processed)++; return true; - drop: +drop: /* Clean rxdes0 (which resets own bit) */ rxdes->rxdes0 = cpu_to_le32(status & priv->rxdes0_edorr_mask); priv->rx_pointer = ftgmac100_next_rx_pointer(priv, pointer); @@ -651,6 +651,11 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv) ftgmac100_free_tx_packet(priv, pointer, skb, txdes, ctl_stat); txdes->txdes0 = cpu_to_le32(ctl_stat & priv->txdes0_edotr_mask); + /* Ensure the descriptor config is visible before setting the tx + * pointer. + */ + smp_wmb(); + priv->tx_clean_pointer = ftgmac100_next_tx_pointer(priv, pointer); return true; @@ -804,6 +809,11 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, dma_wmb(); first->txdes0 = cpu_to_le32(f_ctl_stat); + /* Ensure the descriptor config is visible before setting the tx + * pointer. + */ + smp_wmb(); + /* Update next TX pointer */ priv->tx_pointer = pointer; @@ -824,7 +834,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; - dma_err: +dma_err: if (net_ratelimit()) netdev_err(netdev, "map tx fragment failed\n"); @@ -846,7 +856,7 @@ static netdev_tx_t ftgmac100_hard_start_xmit(struct sk_buff *skb, * last fragment, so we know ftgmac100_free_tx_packet() * hasn't freed the skb yet. */ - drop: +drop: /* Drop the packet */ dev_kfree_skb_any(skb); netdev->stats.tx_dropped++; @@ -1418,7 +1428,7 @@ static void ftgmac100_reset_task(struct work_struct *work) ftgmac100_init_all(priv, true); netdev_dbg(netdev, "Reset done !\n"); - bail: +bail: if (priv->mii_bus) mutex_unlock(&priv->mii_bus->mdio_lock); if (netdev->phydev) @@ -1489,15 +1499,15 @@ static int ftgmac100_open(struct net_device *netdev) return 0; - err_ncsi: +err_ncsi: napi_disable(&priv->napi); netif_stop_queue(netdev); - err_alloc: +err_alloc: ftgmac100_free_buffers(priv); free_irq(netdev->irq, netdev); - err_irq: +err_irq: netif_napi_del(&priv->napi); - err_hw: +err_hw: iowrite32(0, priv->base + FTGMAC100_OFFSET_IER); ftgmac100_free_rings(priv); return err; -- 2.43.0