realtek: eth: regmap refactoring

Refactor rteth_hw_ring_setup() and rteth_839x_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>

diff --git a/target/linux/realtek/files-6.18/drivers/net/ethernet/rtl838x_eth.c b/target/linux/realtek/files-6.18/drivers/net/ethernet/rtl838x_eth.c
index bdf636a4cc17115aad94abcc25b5822109b870a8..1a0300a53a41241e8fa077adbace49afa00b958a 100644 (file)
--- a/target/linux/realtek/files-6.18/drivers/net/ethernet/rtl838x_eth.c
+++ b/target/linux/realtek/files-6.18/drivers/net/ethernet/rtl838x_eth.c
@@ -511,14 +511,14 @@ static void rteth_setup_cpu_rx_rings(struct rteth_ctrl *ctrl)
 static void rteth_hw_ring_setup(struct rteth_ctrl *ctrl)
 {
        for (int r = 0; r < RTETH_RX_RINGS; r++)
-               sw_w32(ctrl->rx_data_dma +
-                      r * sizeof(struct rteth_rx) + offsetof(struct rteth_rx, ring),
-                      ctrl->r->dma_rx_base + r * 4);
+               regmap_write(ctrl->map, ctrl->r->dma_rx_base + r * 4,
+                            ctrl->rx_data_dma +
+                            r * sizeof(struct rteth_rx) + offsetof(struct rteth_rx, ring));
 
        for (int r = 0; r < RTETH_TX_RINGS; r++)
-               sw_w32(ctrl->tx_dma +
-                      r * sizeof(struct rteth_tx) + offsetof(struct rteth_tx, ring),
-                      ctrl->r->dma_tx_base + r * 4);
+               regmap_write(ctrl->map, ctrl->r->dma_tx_base + r * 4,
+                            ctrl->tx_dma +
+                            r * sizeof(struct rteth_tx) + offsetof(struct rteth_tx, ring));
 }
 
 static void rteth_838x_hw_en_rxtx(struct rteth_ctrl *ctrl)
@@ -549,24 +549,25 @@ static void rteth_838x_hw_en_rxtx(struct rteth_ctrl *ctrl)
 static void rteth_839x_hw_en_rxtx(struct rteth_ctrl *ctrl)
 {
        /* Setup CPU-Port: RX Buffer */
-       sw_w32((DEFAULT_MTU << 5) | RX_TRUNCATE_EN_83XX, ctrl->r->dma_if_ctrl);
+       regmap_write(ctrl->map, ctrl->r->dma_if_ctrl, (DEFAULT_MTU << 5) | RX_TRUNCATE_EN_83XX);
 
        rteth_enable_all_rx_irqs(ctrl);
 
        /* Enable DMA */
-       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, enable CRC checking */
-       sw_w32_mask(0x0, 0x3 | BIT(3), ctrl->r->mac_l2_port_ctrl);
+       regmap_update_bits(ctrl->map, ctrl->r->mac_l2_port_ctrl, 0x3 | BIT(3), 0x3 | BIT(3));
 
        /* CPU port joins Lookup Miss Flooding Portmask */
        /* TODO: The code below should also work for the RTL838x */
-       sw_w32(0x28000, RTL839X_TBL_ACCESS_L2_CTRL);
-       sw_w32_mask(0, 0x80000000, RTL839X_TBL_ACCESS_L2_DATA(0));
-       sw_w32(0x38000, RTL839X_TBL_ACCESS_L2_CTRL);
+       regmap_write(ctrl->map, RTL839X_TBL_ACCESS_L2_CTRL, 0x28000);
+       regmap_update_bits(ctrl->map, RTL839X_TBL_ACCESS_L2_DATA(0), BIT(31), BIT(31));
+       regmap_write(ctrl->map, RTL839X_TBL_ACCESS_L2_CTRL, 0x38000);
 
        /* Force CPU port link up */
-       sw_w32_mask(0, 3, ctrl->r->mac_force_mode_ctrl);
+       regmap_update_bits(ctrl->map, ctrl->r->mac_force_mode_ctrl, 0x3, 0x3);
 }
 
 static void rteth_930x_hw_en_rxtx(struct rteth_ctrl *ctrl)