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 F36F7301704 for ; Fri, 20 Mar 2026 15:08:56 +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=1774019337; cv=none; b=q09iTnFMSzHw+FBnT8T3GGyJ/JvBSJOccAkTILdE+piYIIWkQkUmdgrCnnNtr77viO0sfmQrJSIcaP7Bsy27rGJjdGjm4iUTSNr/T2EIAv4/7GsF1QWu25HtqOUvdnpRlPkFcyIgO7e1X26vTsna389w2gI6yr2xskHoqWzi8x4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774019337; c=relaxed/simple; bh=FSu9yRLOV/U0EPUiTukhVwJNdW0fpCEQrG4lKxft0WI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oGBMWMUdWxhZRyUGJUt1fTu9dmtX8VICpS8iaSdZQWroW1fQmFYro9MRmfChmX0g8jfPX3jW/VkwTcivxCa44gJfPiNT4CBsFmOUC/Cp0ZEPWo0qh/TEzmDrsi2deNwjMfwzhS58N8qU8yf89C7uq5z1OT7NZEE28tcqM6K5gUY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iuG/Bmsi; 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="iuG/Bmsi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 239A3C4CEF7; Fri, 20 Mar 2026 15:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774019336; bh=FSu9yRLOV/U0EPUiTukhVwJNdW0fpCEQrG4lKxft0WI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iuG/BmsilLcgPHVc1ddFhzkBuxid7TjMYw/N4wLfNV5G/QK5sLRyMG6ulNe0n9AaM 4q03LSL0CvNmen2V6d2rCbK05qlOqvWL5BVruI9NqzH8aH6BRxu+dA5Xn9plnoRz/c fWUmydtIzWgCMItLkgLBf2f7dKbiDX4pvDl7x+69Ub4HqgIjYpUIrNaudadXA16Ju+ TBkqDI34D+JRWhZjU7KrE/3w5jahuk6ksF+vmU6W5J0d9ixuX1WHg7cW51RE6RBIx/ iTg+VxcYpIMCyTbCei9Fhv2ecjOPwgu12oNSKGq3SpDwZ5SrfFzGsId6o+G3BVne1k drCsqUfAGL37w== From: Sasha Levin To: stable@vger.kernel.org Cc: Kevin Hao , Quanyang Wang , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y 3/3] net: macb: Reinitialize tx/rx queue pointer registers and rx ring during resume Date: Fri, 20 Mar 2026 11:08:52 -0400 Message-ID: <20260320150852.4191566-3-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260320150852.4191566-1-sashal@kernel.org> References: <2026032002-habitual-dolly-4a11@gregkh> <20260320150852.4191566-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kevin Hao [ Upstream commit 718d0766ce4c7634ce62fa78b526ea7263487edd ] On certain platforms, such as AMD Versal boards, the tx/rx queue pointer registers are cleared after suspend, and the rx queue pointer register is also disabled during suspend if WOL is enabled. Previously, we assumed that these registers would be restored by macb_mac_link_up(). However, in commit bf9cf80cab81, macb_init_buffers() was moved from macb_mac_link_up() to macb_open(). Therefore, we should call macb_init_buffers() to reinitialize the tx/rx queue pointer registers during resume. Due to the reset of these two registers, we also need to adjust the tx/rx rings accordingly. The tx ring will be handled by gem_shuffle_tx_rings() in macb_mac_link_up(), so we only need to initialize the rx ring here. Fixes: bf9cf80cab81 ("net: macb: Fix tx/rx malfunction after phy link down and up") Reported-by: Quanyang Wang Signed-off-by: Kevin Hao Tested-by: Quanyang Wang Cc: stable@vger.kernel.org Reviewed-by: Simon Horman Link: https://patch.msgid.link/20260312-macb-versal-v1-2-467647173fa4@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/cadence/macb_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 7374e9da71f1d..c4c28bb072bc9 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -5294,8 +5294,18 @@ static int __maybe_unused macb_resume(struct device *dev) rtnl_unlock(); } + if (!(bp->caps & MACB_CAPS_MACB_IS_EMAC)) + macb_init_buffers(bp); + for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { + if (!(bp->caps & MACB_CAPS_MACB_IS_EMAC)) { + if (macb_is_gem(bp)) + gem_init_rx_ring(queue); + else + macb_init_rx_ring(queue); + } + napi_enable(&queue->napi_rx); napi_enable(&queue->napi_tx); } -- 2.51.0