From mboxrd@z Thu Jan 1 00:00:00 1970 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 0957218DB2F; Sat, 26 Apr 2025 01:36:33 +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=1745631395; cv=none; b=O0iu534cIO6KTidChmqgSnQbquKY8l402SCOzzaw/fo271gYd0SrUAsgZsudxoe920iALCd8XweYGAw3cnb7S9ShJAvG+sLOnRWGaPCz784z3V8V1HrERR0S0tvdEYIrIPm6ihOvU2p0KvdyXAVDdl8UWCBUbZV59Uy96LctS0c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745631395; c=relaxed/simple; bh=SMSNuUX7ZHc+q5C14GZZDuTM/OgTxpbj1zQTohnASTQ=; h=Date:From:To:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=QW0BHJn4Ws2JfVYMosnLr7Y1UGdDAIWeTymfn/YE04F8UGcAsHpjPwHIQksQVcj9w1TAPy39nYRbugqvStslNY1IO1ntn++Omn8Z1FmWnuDGBBexQbYeka48ixjeWReKnAeGYsnyXCye2aayQrCPIsBj0f6UT6+GOmNL4HmRWIA= 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 1u8UNB-000000007iz-3kmJ; Sat, 26 Apr 2025 01:36:25 +0000 Date: Sat, 26 Apr 2025 02:36:22 +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 , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: Re: [PATCH net] net: ethernet: mtk_eth_soc: fix SER panic with 4GB+ RAM Message-ID: References: <995df78417d6f117062d1d7ef63228426b97a26e.1745630570.git.daniel@makrotopia.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <995df78417d6f117062d1d7ef63228426b97a26e.1745630570.git.daniel@makrotopia.org> On Sat, Apr 26, 2025 at 02:25:23AM +0100, Daniel Golle wrote: > 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 addressing on MT7988") > Link: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-feeds/+/11857ce2f90bf065b5e53211d182622d999a4542 The above link has to be replaced by Link: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-feeds/+/71f47ea785699c6aa3b922d66c2bdc1a43da25b1 > 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/ethernet/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, int budget, > ring->data[idx] = new_data; > rxd->rxd1 = (unsigned int)dma_addr; > release_desc: > + if (MTK_HAS_CAPS(eth->soc->caps, MTK_36BIT_DMA)) { > + if (unlikely(dma_addr == DMA_MAPPING_ERROR)) > + addr64 = FIELD_GET(RX_DMA_ADDR64_MASK, rxd->rxd2); > + else > + addr64 = RX_DMA_PREP_ADDR64(dma_addr); > + } > + > if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) > rxd->rxd2 = RX_DMA_LSO; > else > - rxd->rxd2 = RX_DMA_PREP_PLEN0(ring->buf_size); > - > - if (MTK_HAS_CAPS(eth->soc->caps, MTK_36BIT_DMA) && > - likely(dma_addr != DMA_MAPPING_ERROR)) > - rxd->rxd2 |= RX_DMA_PREP_ADDR64(dma_addr); > + rxd->rxd2 = RX_DMA_PREP_PLEN0(ring->buf_size) | addr64; > > ring->calc_idx = idx; > done++; > -- > 2.49.0 > >