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 563DC12D74D; Mon, 15 Apr 2024 12:50:36 +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=1713185436; cv=none; b=G/PZTMzL7KfhjE5whMv+/mtCGsUD8J7bfBpt/j+uQ2CVlgH2TsmDpKAWyDdqe8nkF+WkhOiala24sLOpWVAuwovIY6MvGZ9TOuhtAF50Obua6OZ41c2NEIg+aKNqmqY9wCM4yGEZ/r8LhNd3UKzMo99iGwMUn1ux3N2d6JX+4Ng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713185436; c=relaxed/simple; bh=rA9soYmiKObeRIVJRgF83vS5w0HufAyWAFGC4PqDpPs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HdE3V4po/WRVx1zZQ+sniEdkR3n+IRpkYeMnGio48lCnIlhKc35kLho/dXGApYwitNMV0+jG1rYsZIGcXC0VD00XalLepOYwLJRxtcPb4R4Yb19Ph2fzlQkQ8r8zX3OK3A7dnyh3GQ9GILYqrCmmg0xEkzJSbpIZgAfE2pY5BnU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vPLnmoAW; 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="vPLnmoAW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98384C2BD10; Mon, 15 Apr 2024 12:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713185435; bh=rA9soYmiKObeRIVJRgF83vS5w0HufAyWAFGC4PqDpPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vPLnmoAWuuk/0wSMaDaDDby8dF95/LGBoU4ls9/fYHBx7KdZrA3hnB24zL89e12ui hLJozJkkltoT30VJUM9smmEATPL4XZcSjYuQ+s7IoKt3+R50pJwP0BSMy/i/4/tO39 WNlYUTihgPF0CERkUB46E4yRXqiFmOX4AdvW4Hn8Xsovc9D1BIl/p5BOeVMSkcKLn3 Ic9Sz1tyDPS0Gc6AHaOts4rotVXMzqquC+aPgxwwYFu7DzDuKQq3RpEpMlNtZo+mZc 5iSbpewWbHofMeTBlYpjtMBpvr3hoNY/TptLA52prTEqOAsXmrlG/oxuj+5AcKl7R+ 0n6TefyOn1dbQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Phil Elwell , Maarten Vanraes , "David S . Miller" , Sasha Levin , opendmb@gmail.com, florian.fainelli@broadcom.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 4/6] net: bcmgenet: Reset RBUF on first open Date: Mon, 15 Apr 2024 06:04:25 -0400 Message-ID: <20240415100433.3127434-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240415100433.3127434-1-sashal@kernel.org> References: <20240415100433.3127434-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.86 Content-Transfer-Encoding: 8bit From: Phil Elwell [ Upstream commit 0a6380cb4c6b5c1d6dad226ba3130f9090f0ccea ] If the RBUF logic is not reset when the kernel starts then there may be some data left over from any network boot loader. If the 64-byte packet headers are enabled then this can be fatal. Extend bcmgenet_dma_disable to do perform the reset, but not when called from bcmgenet_resume in order to preserve a wake packet. N.B. This different handling of resume is just based on a hunch - why else wouldn't one reset the RBUF as well as the TBUF? If this isn't the case then it's easy to change the patch to make the RBUF reset unconditional. See: https://github.com/raspberrypi/linux/issues/3850 See: https://github.com/raspberrypi/firmware/issues/1882 Signed-off-by: Phil Elwell Signed-off-by: Maarten Vanraes Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index c2a9913082153..4b8574acf848e 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -3298,7 +3298,7 @@ static void bcmgenet_get_hw_addr(struct bcmgenet_priv *priv, } /* Returns a reusable dma control register value */ -static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) +static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv, bool flush_rx) { unsigned int i; u32 reg; @@ -3323,6 +3323,14 @@ static u32 bcmgenet_dma_disable(struct bcmgenet_priv *priv) udelay(10); bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); + if (flush_rx) { + reg = bcmgenet_rbuf_ctrl_get(priv); + bcmgenet_rbuf_ctrl_set(priv, reg | BIT(0)); + udelay(10); + bcmgenet_rbuf_ctrl_set(priv, reg); + udelay(10); + } + return dma_ctrl; } @@ -3386,8 +3394,8 @@ static int bcmgenet_open(struct net_device *dev) bcmgenet_set_hw_addr(priv, dev->dev_addr); - /* Disable RX/TX DMA and flush TX queues */ - dma_ctrl = bcmgenet_dma_disable(priv); + /* Disable RX/TX DMA and flush TX and RX queues */ + dma_ctrl = bcmgenet_dma_disable(priv, true); /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); @@ -4258,7 +4266,7 @@ static int bcmgenet_resume(struct device *d) bcmgenet_hfb_create_rxnfc_filter(priv, rule); /* Disable RX/TX DMA and flush TX queues */ - dma_ctrl = bcmgenet_dma_disable(priv); + dma_ctrl = bcmgenet_dma_disable(priv, false); /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); -- 2.43.0