catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

realtek: eth: convert to regmap/msleep

Browse Source 
Convert some coding

- from sw() macros to regmap and
- from mdelay() to msleep()

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/22853
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Markus Stockhausen 2026-04-08 20:28:08 +02:00 committed by Robert Marko
parent ccfa908ad3
commit 0ab3b047f1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target/linux/realtek/files-6.18/drivers/net/ethernet/rtl838x_eth.c
View File

@ -244,7 +244,7 @@ static void rteth_93xx_update_counter(struct rteth_ctrl *ctrl, int ring, int rel
int pos = (ring % 3) * 10;
/* writing x to the ring counter increases ring free space by x */
sw_w32(released << pos, ctrl->r->dma_if_rx_ring_cntr(ring));
regmap_write(ctrl->map, ctrl->r->dma_if_rx_ring_cntr(ring), released << pos);
}
struct dsa_tag {
@ -392,16 +392,18 @@ static irqreturn_t rteth_net_irq(int irq, void *dev_id)
static void rteth_nic_reset(struct rteth_ctrl *ctrl, int reset_mask)
{
int val;
pr_info("RESETTING CPU_PORT %d\n", ctrl->r->cpu_port);
sw_w32_mask(0x3, 0, ctrl->r->mac_l2_port_ctrl);
mdelay(100);
regmap_update_bits(ctrl->map, ctrl->r->mac_l2_port_ctrl, 0x3, 0x0);
msleep(100);
/* Reset NIC (SW_NIC_RST) and queues (SW_Q_RST) */
sw_w32_mask(0, reset_mask, ctrl->r->rst_glb_ctrl);
while (sw_r32(ctrl->r->rst_glb_ctrl) & reset_mask)
udelay(20);
regmap_update_bits(ctrl->map, ctrl->r->rst_glb_ctrl, reset_mask, reset_mask);
regmap_read_poll_timeout(ctrl->map, ctrl->r->rst_glb_ctrl, val,
!(val & reset_mask), 1000, 1000000);
mdelay(100);
msleep(100);
}
static void rteth_838x_hw_reset(struct rteth_ctrl *ctrl)
@ -409,7 +411,7 @@ static void rteth_838x_hw_reset(struct rteth_ctrl *ctrl)
rteth_nic_reset(ctrl, 0xc);
/* Free floating rings without space tracking */
sw_w32(0, RTL838X_DMA_IF_RX_RING_SIZE);
regmap_write(ctrl->map, RTL838X_DMA_IF_RX_RING_SIZE, 0);
}
static void rteth_839x_hw_reset(struct rteth_ctrl *ctrl)