eternalwrt/eternalwrt-mt798x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

realtek: eth: regmap refactoring

Browse Source 
Refactor rteth_setup_cpu_rx_rings() and rteth_838x_hw_en_rxtx().

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/23006
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Markus Stockhausen
2026-04-21 10:40:04 +02:00
committed by Robert Marko
parent 39f528e440
commit 007e3b7cfe
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/realtek/files-6.18/drivers/net/ethernet/rtl838x_eth.c
+10 -7
View File
@@ -481,10 +481,11 @@ static void rteth_setup_cpu_rx_rings(struct rteth_ctrl *ctrl)
if (ctrl->r->qm_pkt2cpu_intpri_map) {
for (int priority = 0; priority < 8; priority++) {
int reg = ctrl->r->qm_pkt2cpu_intpri_map;
int ring = priority % RTETH_RX_RINGS;
int shift = priority * 3;
sw_w32_mask(0x7 << shift, ring << shift, ctrl->r->qm_pkt2cpu_intpri_map);
regmap_update_bits(ctrl->map, reg, 0x7 << shift, ring << shift);
}
}
@@ -502,7 +503,7 @@ static void rteth_setup_cpu_rx_rings(struct rteth_ctrl *ctrl)
int shift = (reason % fields_per_reg) * bits_per_field;
int ring = reason % RTETH_RX_RINGS;
sw_w32_mask(mask << shift, ring << shift, reg);
regmap_update_bits(ctrl->map, reg, mask << shift, ring << shift);
}
}
}
@@ -523,24 +524,26 @@ static void rteth_hw_ring_setup(struct rteth_ctrl *ctrl)
static void rteth_838x_hw_en_rxtx(struct rteth_ctrl *ctrl)
{
/* Truncate RX buffer to DEFAULT_MTU bytes, pad TX */
sw_w32((DEFAULT_MTU << 16) | RX_TRUNCATE_EN_83XX | TX_PAD_EN_838X, ctrl->r->dma_if_ctrl);
regmap_write(ctrl->map, ctrl->r->dma_if_ctrl,
(DEFAULT_MTU << 16) | RX_TRUNCATE_EN_83XX | TX_PAD_EN_838X);
rteth_enable_all_rx_irqs(ctrl);
/* Enable DMA, engine expects empty FCS field */
sw_w32_mask(0, ctrl->r->tx_rx_enable, ctrl->r->dma_if_ctrl);
regmap_update_bits(ctrl->map, ctrl->r->dma_if_ctrl,
ctrl->r->tx_rx_enable, ctrl->r->tx_rx_enable);
/* Restart TX/RX to CPU port */
sw_w32_mask(0x0, 0x3, ctrl->r->mac_l2_port_ctrl);
regmap_update_bits(ctrl->map, ctrl->r->dma_if_ctrl, 0x3, 0x3);
/* Set Speed, duplex, flow control
* FORCE_EN | LINK_EN | NWAY_EN | DUP_SEL
* | SPD_SEL = 0b10 | FORCE_FC_EN | PHY_MASTER_SLV_MANUAL_EN
* | MEDIA_SEL
*/
sw_w32(0x6192F, ctrl->r->mac_force_mode_ctrl);
regmap_write(ctrl->map, ctrl->r->mac_force_mode_ctrl, 0x6192F);
/* Enable CRC checks on CPU-port */
sw_w32_mask(0, BIT(3), ctrl->r->mac_l2_port_ctrl);
regmap_update_bits(ctrl->map, ctrl->r->mac_l2_port_ctrl, BIT(3), BIT(3));
}
static void rteth_839x_hw_en_rxtx(struct rteth_ctrl *ctrl)