From nobody Fri Dec 19 18:52:27 2025 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (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 EA6B6191F95; Sat, 26 Apr 2025 01:25:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.142.180.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745630751; cv=none; b=apq/u8iD2uN1YHxnMimUXF+KMF9AokVgG2QaInHH1X/fdBKb8hvxpNd5XQF5yOPtmtj+NWC0QkEdgkf5CaWlBAdK08Bk+rvx8phXchyFVyltDwrgYrlQ/JoN2MXrFbBRuIpTWD0aIkt3wbwSFBty9L2nhP4njc6jimIKmFag3l0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745630751; c=relaxed/simple; bh=Uh7YOaFa/GauQw+D1Y5cRdQi24/8GwgNBQ94AKUSAVY=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=ZOt3nmilsnKmzv4WmUh2AFCFEKLz71nICkzLnGRSk/e7mnLO+Ze5AyDKctbQH6NBuITyM9fZjb9V7EJC//ww+n+AU1g4umZ3xdYa6PQIUxalomohR5E6bLopymvCOdP333DtOltdWEcVdQnMdcg6o8ktkmFYA2/kBiGNUkJbOHI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.client-ip=185.142.180.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.98.2) (envelope-from ) id 1u8UCc-000000007gz-3myq; Sat, 26 Apr 2025 01:25:30 +0000 Date: Sat, 26 Apr 2025 02:25:23 +0100 From: Daniel Golle To: Chad Monroe , Felix Fietkau , Bc-Bocun Chen , Sean Wang , Lorenzo Bianconi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno , Daniel Golle , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH net] net: ethernet: mtk_eth_soc: fix SER panic with 4GB+ RAM Message-ID: <995df78417d6f117062d1d7ef63228426b97a26e.1745630570.git.daniel@makrotopia.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Chad Monroe If the mtk_poll_rx() function detects the MTK_RESETTING flag, it will jump to release_desc and refill the high word of the SDP on the 4GB RFB. Subsequently, mtk_rx_clean will process an incorrect SDP, leading to a panic. Add patch from Mediatek SDK to resolve this. Fixes: 2d75891ebc09 ("net: ethernet: mtk_eth_soc: support 36-bit DMA addres= sing on MT7988") Link: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-= feeds/+/11857ce2f90bf065b5e53211d182622d999a4542 Signed-off-by: Chad Monroe --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethe= rnet/mediatek/mtk_eth_soc.c index 47807b202310..7bac5ccfb79c 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -2252,14 +2252,17 @@ static int mtk_poll_rx(struct napi_struct *napi, in= t budget, ring->data[idx] =3D new_data; rxd->rxd1 =3D (unsigned int)dma_addr; release_desc: + if (MTK_HAS_CAPS(eth->soc->caps, MTK_36BIT_DMA)) { + if (unlikely(dma_addr =3D=3D DMA_MAPPING_ERROR)) + addr64 =3D FIELD_GET(RX_DMA_ADDR64_MASK, rxd->rxd2); + else + addr64 =3D RX_DMA_PREP_ADDR64(dma_addr); + } + if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) rxd->rxd2 =3D RX_DMA_LSO; else - rxd->rxd2 =3D RX_DMA_PREP_PLEN0(ring->buf_size); - - if (MTK_HAS_CAPS(eth->soc->caps, MTK_36BIT_DMA) && - likely(dma_addr !=3D DMA_MAPPING_ERROR)) - rxd->rxd2 |=3D RX_DMA_PREP_ADDR64(dma_addr); + rxd->rxd2 =3D RX_DMA_PREP_PLEN0(ring->buf_size) | addr64; =20 ring->calc_idx =3D idx; done++; --=20 2.49.0