wifi: mt76: mt792x: move mt7921_skb_add_usb_sdio_hdr in mt792x module

Since mt7921_skb_add_usb_sdio_hdr is shared between mt7925 and mt7921
drivers, move it in mt792x module.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 21f93745422900d09e4aa4550aaf380264a48306..867e14f6b93a0679079c57f463b8a9b7fc2c7c95 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -794,7 +794,7 @@ int mt7921_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        mt7921_usb_sdio_write_txwi(dev, wcid, qid, sta, key, pktid, skb);
 
        type = mt76_is_sdio(mdev) ? MT7921_SDIO_DATA : 0;
-       mt7921_skb_add_usb_sdio_hdr(dev, skb, type);
+       mt792x_skb_add_usb_sdio_hdr(dev, skb, type);
        pad = round_up(skb->len, 4) - skb->len;
        if (mt76_is_usb(mdev))
                pad += 4;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 87dd06855f68521afeef4fb0209f0ef39f527a5c..d454b5e4363612ce7543d715a479fe6efd0833e6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -23,9 +23,6 @@
 #define MT7921_SKU_MAX_DELTA_IDX       MT7921_SKU_RATE_NUM
 #define MT7921_SKU_TABLE_SIZE          (MT7921_SKU_RATE_NUM + 1)
 
-#define MT7921_SDIO_HDR_TX_BYTES       GENMASK(15, 0)
-#define MT7921_SDIO_HDR_PKT_TYPE       GENMASK(17, 16)
-
 #define MCU_UNI_EVENT_ROC  0x27
 
 enum {
@@ -235,19 +232,6 @@ mt7921_l1_rmw(struct mt792x_dev *dev, u32 addr, u32 mask, u32 val)
 #define mt7921_l1_set(dev, addr, val)  mt7921_l1_rmw(dev, addr, 0, val)
 #define mt7921_l1_clear(dev, addr, val)        mt7921_l1_rmw(dev, addr, val, 0)
 
-static inline void
-mt7921_skb_add_usb_sdio_hdr(struct mt792x_dev *dev, struct sk_buff *skb,
-                           int type)
-{
-       u32 hdr, len;
-
-       len = mt76_is_usb(&dev->mt76) ? skb->len : skb->len + sizeof(hdr);
-       hdr = FIELD_PREP(MT7921_SDIO_HDR_TX_BYTES, len) |
-             FIELD_PREP(MT7921_SDIO_HDR_PKT_TYPE, type);
-
-       put_unaligned_le32(hdr, skb_push(skb, sizeof(hdr)));
-}
-
 void mt7921_stop(struct ieee80211_hw *hw);
 int mt7921_mac_init(struct mt792x_dev *dev);
 bool mt7921_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
index 310eeca024ad8ef153b338bfc6b5cc057730c56c..5e4501d7f1c0fcd16595c98a4fae808ea2605164 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
@@ -38,7 +38,7 @@ mt7921s_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
        if (cmd == MCU_CMD(FW_SCATTER))
                type = MT7921_SDIO_FWDL;
 
-       mt7921_skb_add_usb_sdio_hdr(dev, skb, type);
+       mt792x_skb_add_usb_sdio_hdr(dev, skb, type);
        pad = round_up(skb->len, 4) - skb->len;
        __skb_put_zero(skb, pad);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
index 59cd3d98bf9086c46f77cdb5e56c65ec4e0df381..33a87f447dca7337fd7edef8094fd2bcb7c11f01 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
@@ -43,7 +43,7 @@ mt7921u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
        else
                ep = MT_EP_OUT_AC_BE;
 
-       mt7921_skb_add_usb_sdio_hdr(dev, skb, 0);
+       mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);
        pad = round_up(skb->len, 4) + 4 - skb->len;
        __skb_put_zero(skb, pad);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
index 2b27611c7f4bf8e0a308c95acf9edbbd4c46d34e..1b9fbd9a140d8a5d912aceeab5a7bba17eecd6b2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mac.c
@@ -1378,7 +1378,7 @@ int mt7925_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
        pktid = mt76_tx_status_skb_add(&dev->mt76, wcid, skb);
        mt7925_usb_sdio_write_txwi(dev, wcid, qid, sta, key, pktid, skb);
 
-       mt7925_skb_add_usb_sdio_hdr(dev, skb, 0);
+       mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);
        pad = round_up(skb->len, 4) - skb->len;
        if (mt76_is_usb(mdev))
                pad += 4;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
index 1133d95383cad194813aa1d96d669d156997d305..9a2d38a2b2bde79016a86c6e16562b10648892ea 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
@@ -25,9 +25,6 @@
 #define MT7925_SKU_MAX_DELTA_IDX       MT7925_SKU_RATE_NUM
 #define MT7925_SKU_TABLE_SIZE          (MT7925_SKU_RATE_NUM + 1)
 
-#define MT7925_SDIO_HDR_TX_BYTES       GENMASK(15, 0)
-#define MT7925_SDIO_HDR_PKT_TYPE       GENMASK(17, 16)
-
 #define MCU_UNI_EVENT_ROC  0x27
 
 enum {
@@ -210,18 +207,6 @@ void mt7925_mcu_rx_event(struct mt792x_dev *dev, struct sk_buff *skb);
 int mt7925_mcu_chip_config(struct mt792x_dev *dev, const char *cmd);
 int mt7925_mcu_set_rxfilter(struct mt792x_dev *dev, u32 fif,
                            u8 bit_op, u32 bit_map);
-static inline void
-mt7925_skb_add_usb_sdio_hdr(struct mt792x_dev *dev, struct sk_buff *skb,
-                           int type)
-{
-       u32 hdr, len;
-
-       len = mt76_is_usb(&dev->mt76) ? skb->len : skb->len + sizeof(hdr);
-       hdr = FIELD_PREP(MT7925_SDIO_HDR_TX_BYTES, len) |
-             FIELD_PREP(MT7925_SDIO_HDR_PKT_TYPE, type);
-
-       put_unaligned_le32(hdr, skb_push(skb, sizeof(hdr)));
-}
 
 void mt7925_stop(struct ieee80211_hw *hw);
 int mt7925_mac_init(struct mt792x_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/usb.c b/drivers/net/wireless/mediatek/mt76/mt7925/usb.c
index 6cbcecabf40ead39cbab11c60f8a1e08fad61506..ea09b9b9d303db01ad7e610d73933ed71a6f2b7c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/usb.c
@@ -34,7 +34,7 @@ mt7925u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
        else
                ep = MT_EP_OUT_AC_BE;
 
-       mt7925_skb_add_usb_sdio_hdr(dev, skb, 0);
+       mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);
        pad = round_up(skb->len, 4) + 4 - skb->len;
        __skb_put_zero(skb, pad);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 548e89fad4d9f93a62b69631231b2e1cbb74d9fa..fd1614e4926b650adc699fa7ea66dfaf949a5b0a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -42,6 +42,9 @@
 #define MT7922_ROM_PATCH       "mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin"
 #define MT7925_ROM_PATCH       "mediatek/mt7925/WIFI_MT7925_PATCH_MCU_1_1_hdr.bin"
 
+#define MT792x_SDIO_HDR_TX_BYTES       GENMASK(15, 0)
+#define MT792x_SDIO_HDR_PKT_TYPE       GENMASK(17, 16)
+
 struct mt792x_vif;
 struct mt792x_sta;
 
@@ -343,6 +346,19 @@ u32 mt792xu_rmw(struct mt76_dev *dev, u32 addr, u32 mask, u32 val);
 void mt792xu_copy(struct mt76_dev *dev, u32 offset, const void *data, int len);
 void mt792xu_disconnect(struct usb_interface *usb_intf);
 
+static inline void
+mt792x_skb_add_usb_sdio_hdr(struct mt792x_dev *dev, struct sk_buff *skb,
+                           int type)
+{
+       u32 hdr, len;
+
+       len = mt76_is_usb(&dev->mt76) ? skb->len : skb->len + sizeof(hdr);
+       hdr = FIELD_PREP(MT792x_SDIO_HDR_TX_BYTES, len) |
+             FIELD_PREP(MT792x_SDIO_HDR_PKT_TYPE, type);
+
+       put_unaligned_le32(hdr, skb_push(skb, sizeof(hdr)));
+}
+
 int __mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev);
 int mt792xe_mcu_drv_pmctrl(struct mt792x_dev *dev);
 int mt792xe_mcu_fw_pmctrl(struct mt792x_dev *dev);