From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 599103B1016; Wed, 30 Sep 2026 18:15:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790792139; cv=none; b=tzROTMD6JXfBAjFAXN6HB0pH2nh1eRDnuKDATlsfZuWz4mnNXtEpYWMylLYBgtQ2c2xrMvFvq5pX6mSgLyTcqQpkeJAoXcB/bu1grKYl0r+iOLgdsi5vRBDejRSfMDJ4TSC554CYR7ke5tYA5naobLhFaTy7WPqjPgYJEzoDo9c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790792139; c=relaxed/simple; bh=7rQkfrffH0tQbAHi8SttRlOP39rhcImnWv+X9mCQiNQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IwwGKH1r0hAIIhrZn/IhN6VYDnGg7i9XSUIKEXxzRUySFC2iNp0t2ULwTE5ZYGNTONwx5syG1/R1v9Nfz3HFcBSCQKbdrcSS3717847N/VsN53mggwcfq5ZodhTEtU/B+WHhaLmnZKrNXk09G0Er74G7f7Gk9VjYoz3VSmE6uBI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lLgLLWeK; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lLgLLWeK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C9581F00898; Wed, 30 Sep 2026 18:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790792137; bh=Owsqw00wq1aKE0UY9xsuSoN8LXlbIAJdQGPtcIdcxTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lLgLLWeKIywbnm14WBa+nh3sSfcQNMMSypgs3l8DZhp5TPKpa3f5eCqfo0tClaLy2 egQSP8SCdKwYdhMGsV9PYJq0sBJzPer94KsAA1At9vpdx/A18Pp0usFmx46iQQ473P 2coO9vVep+hHM0hroHe6YPMbZ1HRmnjINTJt0oBU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Linus Walleij , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 512/752] net: ethernet: cortina: Ack RX overrun interrupt correctly Date: Wed, 30 Sep 2026 17:26:22 +0200 Message-ID: <20260930152409.337391506@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152358.131179731@linuxfoundation.org> References: <20260930152358.131179731@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Linus Walleij [ Upstream commit 1dd85662fee6e2ac580b1c4f9a0c0a7ae6e31f0e ] The RX overrun interrupt is reported in interrupt status register 4, but gmac_irq() acknowledges it using the RX descriptor error bit from status register 0. For GMAC0 this writes the GMAC1 overrun bit, while for GMAC1 the shift leaves no bit in the 32-bit register. Acknowledge the same per-port RX overrun bit that was detected. Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") Signed-off-by: Linus Walleij Link: https://patch.msgid.link/20260914-b4-gemini-ethernet-fixes-2-v2-1-5ab39a047b90@kernel.org Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/cortina/gemini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c index 0067930a822e5..0bf2e17126163 100644 --- a/drivers/net/ethernet/cortina/gemini.c +++ b/drivers/net/ethernet/cortina/gemini.c @@ -1767,7 +1767,7 @@ static irqreturn_t gmac_irq(int irq, void *data) if (val & (GMAC0_RX_OVERRUN_INT_BIT << (netdev->dev_id * 8))) { spin_lock(&geth->irq_lock); - writel(GMAC0_RXDERR_INT_BIT << (netdev->dev_id * 8), + writel(GMAC0_RX_OVERRUN_INT_BIT << (netdev->dev_id * 8), geth->base + GLOBAL_INTERRUPT_STATUS_4_REG); u64_stats_update_begin(&port->ir_stats_syncp); ++port->stats.rx_fifo_errors; -- 2.53.0