[openwrt/openwrt] realtek: eth: define interrupt status/mask base
LEDE Commits
lede-commits at lists.infradead.org
Fri Feb 13 14:29:59 PST 2026
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/f617d3e594e366d9f3598228c22afb23c8af3497
commit f617d3e594e366d9f3598228c22afb23c8af3497
Author: Markus Stockhausen <markus.stockhausen at gmx.de>
AuthorDate: Fri Feb 6 07:52:45 2026 +0100
realtek: eth: define interrupt status/mask base
Regardless of the number of receive queues (8 or 32) the interrupt
status and mask registers are built up bitwise in the same way:
- 8/32 rx run out interrupts
- 8/32 rx done interrupts
- 2 tx tone interrupts
- 2 tx all done interrupts
- 3 L2 notify interrupts (only RTL839x)
So one can always derive the bit position of those fields by using
the device specific rx_rings configuration setting. To simplify the
code these registers will be handled by central helpers in the future.
In a first step provide a interrupt base register definition that
points to the first interrupt type - aka the rx run out interrupts.
To not overcomplicate things simply reuse the existing DMA_IF_INTR_MSK
and DMA_IF_INTR_STS naming convention. Until all gets fixed the
runout registers on RTL93xx will be accessible by that name.
Signed-off-by: Markus Stockhausen <markus.stockhausen at gmx.de>
Link: https://github.com/openwrt/openwrt/pull/21893
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
.../files-6.12/drivers/net/ethernet/rtl838x_eth.c | 32 +++++++++++-----------
.../files-6.12/drivers/net/ethernet/rtl838x_eth.h | 18 ++++++------
2 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c
index 649190e945..9cd1d259b7 100644
--- a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c
+++ b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c
@@ -401,7 +401,7 @@ static irqreturn_t rteth_93xx_net_irq(int irq, void *dev_id)
{
struct net_device *dev = dev_id;
struct rteth_ctrl *ctrl = netdev_priv(dev);
- u32 status_rx_r = sw_r32(ctrl->r->dma_if_intr_rx_runout_sts);
+ u32 status_rx_r = sw_r32(ctrl->r->dma_if_intr_sts);
u32 status_rx = sw_r32(ctrl->r->dma_if_intr_rx_done_sts);
u32 status_tx = sw_r32(ctrl->r->dma_if_intr_tx_done_sts);
@@ -432,8 +432,8 @@ static irqreturn_t rteth_93xx_net_irq(int irq, void *dev_id)
/* RX buffer overrun */
if (status_rx_r) {
pr_debug("RX buffer overrun: status %x, mask: %x\n",
- status_rx_r, sw_r32(ctrl->r->dma_if_intr_rx_runout_msk));
- sw_w32(status_rx_r, ctrl->r->dma_if_intr_rx_runout_sts);
+ status_rx_r, sw_r32(ctrl->r->dma_if_intr_msk));
+ sw_w32(status_rx_r, ctrl->r->dma_if_intr_sts);
}
return IRQ_HANDLED;
@@ -500,8 +500,8 @@ static void rteth_839x_hw_reset(struct rteth_ctrl *ctrl)
static void rteth_93xx_hw_reset(struct rteth_ctrl *ctrl)
{
/* Disable and clear interrupts */
- sw_w32(0x00000000, ctrl->r->dma_if_intr_rx_runout_msk);
- sw_w32(0xffffffff, ctrl->r->dma_if_intr_rx_runout_sts);
+ sw_w32(0x00000000, ctrl->r->dma_if_intr_msk);
+ sw_w32(0xffffffff, ctrl->r->dma_if_intr_sts);
sw_w32(0x00000000, ctrl->r->dma_if_intr_rx_done_msk);
sw_w32(0xffffffff, ctrl->r->dma_if_intr_rx_done_sts);
sw_w32(0x00000000, ctrl->r->dma_if_intr_tx_done_msk);
@@ -641,7 +641,7 @@ static void rtl93xx_hw_en_rxtx(struct rteth_ctrl *ctrl)
}
/* Enable Notify, RX done and RX overflow, TX done interrupts not needed */
- sw_w32(0xffffffff, ctrl->r->dma_if_intr_rx_runout_msk);
+ sw_w32(0xffffffff, ctrl->r->dma_if_intr_msk);
sw_w32(0xffffffff, ctrl->r->dma_if_intr_rx_done_msk);
sw_w32(0x00000000, ctrl->r->dma_if_intr_tx_done_msk);
@@ -835,8 +835,8 @@ static void rtl838x_hw_stop(struct rteth_ctrl *ctrl)
/* Disable all TX/RX interrupts */
if (ctrl->r->family_id == RTL9300_FAMILY_ID || ctrl->r->family_id == RTL9310_FAMILY_ID) {
- sw_w32(0x00000000, ctrl->r->dma_if_intr_rx_runout_msk);
- sw_w32(0xffffffff, ctrl->r->dma_if_intr_rx_runout_sts);
+ sw_w32(0x00000000, ctrl->r->dma_if_intr_msk);
+ sw_w32(0xffffffff, ctrl->r->dma_if_intr_sts);
sw_w32(0x00000000, ctrl->r->dma_if_intr_rx_done_msk);
sw_w32(0xffffffff, ctrl->r->dma_if_intr_rx_done_sts);
sw_w32(0x00000000, ctrl->r->dma_if_intr_tx_done_msk);
@@ -1449,8 +1449,8 @@ static const struct rteth_config rteth_838x_cfg = {
.qm_pkt2cpu_intpri_map = RTETH_838X_QM_PKT2CPU_INTPRI_MAP,
.qm_rsn2cpuqid_ctrl = RTETH_838X_QM_PKT2CPU_INTPRI_0,
.qm_rsn2cpuqid_cnt = RTETH_838X_QM_PKT2CPU_INTPRI_CNT,
- .dma_if_intr_sts = RTL838X_DMA_IF_INTR_STS,
- .dma_if_intr_msk = RTL838X_DMA_IF_INTR_MSK,
+ .dma_if_intr_sts = RTETH_838X_DMA_IF_INTR_STS,
+ .dma_if_intr_msk = RTETH_838X_DMA_IF_INTR_MSK,
.dma_if_ctrl = RTL838X_DMA_IF_CTRL,
.mac_force_mode_ctrl = RTL838X_MAC_FORCE_MODE_CTRL,
.dma_rx_base = RTL838X_DMA_RX_BASE,
@@ -1496,8 +1496,8 @@ static const struct rteth_config rteth_839x_cfg = {
.qm_pkt2cpu_intpri_map = RTETH_839X_QM_PKT2CPU_INTPRI_MAP,
.qm_rsn2cpuqid_ctrl = RTETH_839X_QM_PKT2CPU_INTPRI_0,
.qm_rsn2cpuqid_cnt = RTETH_839X_QM_PKT2CPU_INTPRI_CNT,
- .dma_if_intr_sts = RTL839X_DMA_IF_INTR_STS,
- .dma_if_intr_msk = RTL839X_DMA_IF_INTR_MSK,
+ .dma_if_intr_sts = RTETH_839X_DMA_IF_INTR_STS,
+ .dma_if_intr_msk = RTETH_839X_DMA_IF_INTR_MSK,
.dma_if_ctrl = RTL839X_DMA_IF_CTRL,
.mac_force_mode_ctrl = RTL839X_MAC_FORCE_MODE_CTRL,
.dma_rx_base = RTL839X_DMA_RX_BASE,
@@ -1542,10 +1542,10 @@ static const struct rteth_config rteth_930x_cfg = {
.mac_l2_port_ctrl = RTETH_930X_MAC_L2_PORT_CTRL,
.qm_rsn2cpuqid_ctrl = RTETH_930X_QM_RSN2CPUQID_CTRL_0,
.qm_rsn2cpuqid_cnt = RTETH_930X_QM_RSN2CPUQID_CTRL_CNT,
- .dma_if_intr_rx_runout_sts = RTL930X_DMA_IF_INTR_RX_RUNOUT_STS,
+ .dma_if_intr_sts = RTETH_930X_DMA_IF_INTR_STS,
.dma_if_intr_rx_done_sts = RTL930X_DMA_IF_INTR_RX_DONE_STS,
.dma_if_intr_tx_done_sts = RTL930X_DMA_IF_INTR_TX_DONE_STS,
- .dma_if_intr_rx_runout_msk = RTL930X_DMA_IF_INTR_RX_RUNOUT_MSK,
+ .dma_if_intr_msk = RTETH_930X_DMA_IF_INTR_MSK,
.dma_if_intr_rx_done_msk = RTL930X_DMA_IF_INTR_RX_DONE_MSK,
.dma_if_intr_tx_done_msk = RTL930X_DMA_IF_INTR_TX_DONE_MSK,
.l2_ntfy_if_intr_sts = RTL930X_L2_NTFY_IF_INTR_STS,
@@ -1593,10 +1593,10 @@ static const struct rteth_config rteth_931x_cfg = {
.mac_l2_port_ctrl = RTETH_931X_MAC_L2_PORT_CTRL,
.qm_rsn2cpuqid_ctrl = RTETH_931X_QM_RSN2CPUQID_CTRL_0,
.qm_rsn2cpuqid_cnt = RTETH_931X_QM_RSN2CPUQID_CTRL_CNT,
- .dma_if_intr_rx_runout_sts = RTL931X_DMA_IF_INTR_RX_RUNOUT_STS,
+ .dma_if_intr_sts = RTETH_931X_DMA_IF_INTR_STS,
.dma_if_intr_rx_done_sts = RTL931X_DMA_IF_INTR_RX_DONE_STS,
.dma_if_intr_tx_done_sts = RTL931X_DMA_IF_INTR_TX_DONE_STS,
- .dma_if_intr_rx_runout_msk = RTL931X_DMA_IF_INTR_RX_RUNOUT_MSK,
+ .dma_if_intr_msk = RTETH_931X_DMA_IF_INTR_MSK,
.dma_if_intr_rx_done_msk = RTL931X_DMA_IF_INTR_RX_DONE_MSK,
.dma_if_intr_tx_done_msk = RTL931X_DMA_IF_INTR_TX_DONE_MSK,
.l2_ntfy_if_intr_sts = RTL931X_L2_NTFY_IF_INTR_STS,
diff --git a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h
index 780751689d..09acd61d96 100644
--- a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h
+++ b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.h
@@ -6,20 +6,28 @@
/* Register definition */
#define RTETH_838X_CPU_PORT 28
+#define RTETH_838X_DMA_IF_INTR_MSK (0x9f50)
+#define RTETH_838X_DMA_IF_INTR_STS (0x9f54)
#define RTETH_838X_QM_PKT2CPU_INTPRI_MAP (0x5f10)
#define RTETH_838X_QM_PKT2CPU_INTPRI_0 (0x5f04)
#define RTETH_838X_QM_PKT2CPU_INTPRI_CNT 3
#define RTETH_839X_CPU_PORT 52
+#define RTETH_839X_DMA_IF_INTR_MSK (0x7864)
+#define RTETH_839X_DMA_IF_INTR_STS (0x7868)
#define RTETH_839X_QM_PKT2CPU_INTPRI_MAP (0x1154)
#define RTETH_839X_QM_PKT2CPU_INTPRI_0 (0x1148)
#define RTETH_839X_QM_PKT2CPU_INTPRI_CNT 3
#define RTETH_930X_CPU_PORT 28
+#define RTETH_930X_DMA_IF_INTR_MSK (0xe010)
+#define RTETH_930X_DMA_IF_INTR_STS (0xe01c)
#define RTETH_930X_QM_RSN2CPUQID_CTRL_0 (0xa344)
#define RTETH_930X_QM_RSN2CPUQID_CTRL_CNT 11
#define RTETH_931X_CPU_PORT 56
+#define RTETH_931X_DMA_IF_INTR_MSK (0x0910)
+#define RTETH_931X_DMA_IF_INTR_STS (0x091c)
#define RTETH_931X_QM_RSN2CPUQID_CTRL_0 (0xa9f4)
#define RTETH_931X_QM_RSN2CPUQID_CTRL_CNT 14
@@ -49,18 +57,12 @@
/* DMA interrupt control and status registers */
#define RTL838X_DMA_IF_CTRL (0x9f58)
-#define RTL838X_DMA_IF_INTR_STS (0x9f54)
-#define RTL838X_DMA_IF_INTR_MSK (0x9f50)
#define RTL839X_DMA_IF_CTRL (0x786c)
-#define RTL839X_DMA_IF_INTR_STS (0x7868)
-#define RTL839X_DMA_IF_INTR_MSK (0x7864)
#define RTL930X_DMA_IF_CTRL (0xe028)
-#define RTL930X_DMA_IF_INTR_RX_RUNOUT_STS (0xe01C)
#define RTL930X_DMA_IF_INTR_RX_DONE_STS (0xe020)
#define RTL930X_DMA_IF_INTR_TX_DONE_STS (0xe024)
-#define RTL930X_DMA_IF_INTR_RX_RUNOUT_MSK (0xe010)
#define RTL930X_DMA_IF_INTR_RX_DONE_MSK (0xe014)
#define RTL930X_DMA_IF_INTR_TX_DONE_MSK (0xe018)
#define RTL930X_L2_NTFY_IF_INTR_MSK (0xe04C)
@@ -68,10 +70,8 @@
/* TODO: RTL931X_DMA_IF_CTRL has different bits meanings */
#define RTL931X_DMA_IF_CTRL (0x0928)
-#define RTL931X_DMA_IF_INTR_RX_RUNOUT_STS (0x091c)
#define RTL931X_DMA_IF_INTR_RX_DONE_STS (0x0920)
#define RTL931X_DMA_IF_INTR_TX_DONE_STS (0x0924)
-#define RTL931X_DMA_IF_INTR_RX_RUNOUT_MSK (0x0910)
#define RTL931X_DMA_IF_INTR_RX_DONE_MSK (0x0914)
#define RTL931X_DMA_IF_INTR_TX_DONE_MSK (0x0918)
#define RTL931X_L2_NTFY_IF_INTR_MSK (0x09E4)
@@ -429,10 +429,8 @@ struct rteth_config {
int qm_rsn2cpuqid_cnt;
int dma_if_intr_sts;
int dma_if_intr_msk;
- int dma_if_intr_rx_runout_sts;
int dma_if_intr_rx_done_sts;
int dma_if_intr_tx_done_sts;
- int dma_if_intr_rx_runout_msk;
int dma_if_intr_rx_done_msk;
int dma_if_intr_tx_done_msk;
int l2_ntfy_if_intr_sts;
More information about the lede-commits
mailing list