From nobody Fri Dec 19 00:03:35 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 3B8AE42A83; Sun, 27 Apr 2025 01:06:13 +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=1745715975; cv=none; b=nngeVPGkRrTsLzSAFUP62l9CxnIDIQaQI2gRPwaDAy10PUAHvrpalGzmXSO/ZqOgGqoUKNpjbe2mSdtBZbhcAJKeUL726VnYAjhXsihwqpLXaSM8/rbyoItMx7jyMy60LXetahe6AoAAOxJ1WMA9fKxHuJ6Hmi0asirs7sGV0Z0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745715975; c=relaxed/simple; bh=kDctFkkJ2SUzn8l0v91DYSyiok3K2+3MqU3WKVzjD6E=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=mQp+uW2JpGy50l3DZQHy4j8du9wqWbeyoclNQCwDV0baTSDnOBltbjPVaek55Kjyp6+6+gpswqUPtqRBr1vebEHcZSFE9Tnh59412jtO1wiX4ZFWGLkRKZqphcHFrqrPdCkRI1r7RjNW+Kf5yy+YTKs00nF3POguNCcul7jL3gs= 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 1u8qNO-000000006ZO-2KL7; Sun, 27 Apr 2025 01:06:06 +0000 Date: Sun, 27 Apr 2025 02:05:44 +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 v2] net: ethernet: mtk_eth_soc: fix SER panic with 4GB+ RAM Message-ID: <4adc2aaeb0fb1b9cdc56bf21cf8e7fa328daa345.1745715843.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's 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/+/71f47ea785699c6aa3b922d66c2bdc1a43da25b1 Signed-off-by: Chad Monroe --- Changes since v1: * fix Link: * improve formatting drivers/net/ethernet/mediatek/mtk_eth_soc.c | 14 +++++++++----- 1 file changed, 9 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..a817fdf468d4 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -2252,14 +2252,18 @@ 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