mt76: add rd_rp and wr_rp to bus_ops/mcu_ops

Add callbacks for reading and writing reg pairs tables.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 3576418f696cb953d1af5ca2da025e1eafd2679b..1d70be8dec321fd091493271be6cb875e2ee2032 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -33,12 +33,21 @@
 struct mt76_dev;
 struct mt76_wcid;
 
+struct mt76_reg_pair {
+       u32 reg;
+       u32 value;
+};
+
 struct mt76_bus_ops {
        u32 (*rr)(struct mt76_dev *dev, u32 offset);
        void (*wr)(struct mt76_dev *dev, u32 offset, u32 val);
        u32 (*rmw)(struct mt76_dev *dev, u32 offset, u32 mask, u32 val);
        void (*copy)(struct mt76_dev *dev, u32 offset, const void *data,
                     int len);
+       int (*wr_rp)(struct mt76_dev *dev, u32 base,
+                    const struct mt76_reg_pair *rp, int len);
+       int (*rd_rp)(struct mt76_dev *dev, u32 base,
+                    struct mt76_reg_pair *rp, int len);
 };
 
 enum mt76_txq_id {
@@ -53,11 +62,6 @@ enum mt76_txq_id {
        __MT_TXQ_MAX
 };
 
-struct mt76_reg_pair {
-       u32 reg;
-       u32 value;
-};
-
 enum mt76_rxq_id {
        MT_RXQ_MAIN,
        MT_RXQ_MCU,
@@ -123,6 +127,10 @@ struct mt76_mcu_ops {
        struct sk_buff *(*mcu_msg_alloc)(const void *data, int len);
        int (*mcu_send_msg)(struct mt76_dev *dev, struct sk_buff *skb,
                            int cmd, bool wait_resp);
+       int (*mcu_wr_rp)(struct mt76_dev *dev, u32 base,
+                        const struct mt76_reg_pair *rp, int len);
+       int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base,
+                        struct mt76_reg_pair *rp, int len);
 };
 
 struct mt76_queue_ops {
@@ -442,6 +450,8 @@ struct mt76_rx_status {
 #define mt76_wr(dev, ...)      (dev)->mt76.bus->wr(&((dev)->mt76), __VA_ARGS__)
 #define mt76_rmw(dev, ...)     (dev)->mt76.bus->rmw(&((dev)->mt76), __VA_ARGS__)
 #define mt76_wr_copy(dev, ...) (dev)->mt76.bus->copy(&((dev)->mt76), __VA_ARGS__)
+#define mt76_wr_rp(dev, ...)   (dev)->mt76.bus->wr_rp(&((dev)->mt76), __VA_ARGS__)
+#define mt76_rd_rp(dev, ...)   (dev)->mt76.bus->rd_rp(&((dev)->mt76), __VA_ARGS__)
 
 #define mt76_mcu_msg_alloc(dev, ...)   (dev)->mt76.mcu_ops->mcu_msg_alloc(__VA_ARGS__)
 #define mt76_mcu_send_msg(dev, ...)    (dev)->mt76.mcu_ops->mcu_send_msg(&((dev)->mt76), __VA_ARGS__)

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index cd4d48594aafef8ceabe97cdb98b5fa7db4b1f9e..fe36c4adbd38f5494856b725c1c812221e83957a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -876,6 +876,8 @@ int mt76u_init(struct mt76_dev *dev,
                .wr = mt76u_wr,
                .rmw = mt76u_rmw,
                .copy = mt76u_copy,
+               .wr_rp = mt76u_wr_rp,
+               .rd_rp = mt76u_rd_rp,
        };
        struct mt76_usb *usb = &dev->usb;
 

diff --git a/drivers/net/wireless/mediatek/mt76/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/usb_mcu.c
index 622d7d6da32ec115e769c567e06a06cdf39362ea..7cbc02d8ec35cee9d1b8219a02135ba7f32e9b2c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/usb_mcu.c
@@ -381,6 +381,8 @@ void mt76u_init_mcu_ops(struct mt76_dev *dev)
        static const struct mt76_mcu_ops mt76u_mcu_ops = {
                .mcu_msg_alloc = mt76u_mcu_msg_alloc,
                .mcu_send_msg = mt76u_mcu_send_msg,
+               .mcu_wr_rp = mt76u_mcu_wr_rp,
+               .mcu_rd_rp = mt76u_mcu_rd_rp,
        };
 
        dev->mcu_ops = &mt76u_mcu_ops;