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 140D41A29A; Wed, 7 May 2025 18:46:25 +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=1746643585; cv=none; b=fP/a12HMzeM4nGGHzWv0ml1GT3IhDJhj7iltq2UPb7E2MbR4SS+v1GGHPBwQqcc3Q7/k/Z0/l/CAgoypmmZNTBeJluNFa3QDsRLSJEuBjUwsCMEAdKR8bb6O4I4uKOK2qUXcqgEM6nA+XFoD84ZtYCPpW/930kPCYMX6t1xGljA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746643585; c=relaxed/simple; bh=gBVeheKtm8JNgjkUC48Sbhuy9SsbfgQyhNRp4DvGbak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nnZ1wRPsAbzDAHHMdGoMcTD2g2lxdYC/30IsHQgFYcE2QeB07HGOVmR3mBI2Ttj8/djPoay6SO4CUDg3lr6tnjLsuFeWBIhmQ9TCJOPcQs6OBsD1DGp01TPOXsotPJD+qxUhXrEJoli2BMxh7hA3/t2mX71+/l1Jc5GXRrYQKWc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1K4oxcU9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1K4oxcU9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F54BC4CEE2; Wed, 7 May 2025 18:46:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1746643584; bh=gBVeheKtm8JNgjkUC48Sbhuy9SsbfgQyhNRp4DvGbak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1K4oxcU9Q6Z5DHy1FiisarzaNyQM5AW77xuncLzqe7VG9a1ztRjU1y8GWySvW4xYr s5fMOya+NPXJcKIQh2SQFtI/qAFHn9QMpgYbOIyFaUQKR6V9Pm9CU5GZkcDADBIHiq Sel/jKHA1x/PfBfOTYHKRKo/fXp6QMOvZagcO+3A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Louis-Alexis Eyraud , Bartosz Golaszewski , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 49/97] net: ethernet: mtk-star-emac: rearm interrupts in rx_poll only when advised Date: Wed, 7 May 2025 20:39:24 +0200 Message-ID: <20250507183808.974699975@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250507183806.987408728@linuxfoundation.org> References: <20250507183806.987408728@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Louis-Alexis Eyraud [ Upstream commit e54b4db35e201a9173da9cb7abc8377e12abaf87 ] In mtk_star_rx_poll function, on event processing completion, the mtk_star_emac driver calls napi_complete_done but ignores its return code and enable RX DMA interrupts inconditionally. This return code gives the info if a device should avoid rearming its interrupts or not, so fix this behaviour by taking it into account. Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver") Signed-off-by: Louis-Alexis Eyraud Acked-by: Bartosz Golaszewski Link: https://patch.msgid.link/20250424-mtk_star_emac-fix-spinlock-recursion-issue-v2-2-f3fde2e529d8@collabora.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c index fd729469b29f4..c42e9f741f959 100644 --- a/drivers/net/ethernet/mediatek/mtk_star_emac.c +++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c @@ -1349,8 +1349,7 @@ static int mtk_star_rx_poll(struct napi_struct *napi, int budget) priv = container_of(napi, struct mtk_star_priv, rx_napi); work_done = mtk_star_rx(priv, budget); - if (work_done < budget) { - napi_complete_done(napi, work_done); + if (work_done < budget && napi_complete_done(napi, work_done)) { spin_lock_irqsave(&priv->lock, flags); mtk_star_enable_dma_irq(priv, true, false); spin_unlock_irqrestore(&priv->lock, flags); -- 2.39.5