mt76: move mcu_txd/mcu_rxd structures in shared code

This is a preliminary patch to add mt7990 chipset support.

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index d65b3cb..4d29345 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -33,6 +33,91 @@
 #define PATCH_SEC_ENC_SCRAMBLE_INFO_MASK       GENMASK(15, 0)
 #define PATCH_SEC_ENC_AES_KEY_MASK             GENMASK(7, 0)
 
+struct mt76_connac2_mcu_txd {
+       __le32 txd[8];
+
+       __le16 len;
+       __le16 pq_id;
+
+       u8 cid;
+       u8 pkt_type;
+       u8 set_query; /* FW don't care */
+       u8 seq;
+
+       u8 uc_d2b0_rev;
+       u8 ext_cid;
+       u8 s2d_index;
+       u8 ext_cid_ack;
+
+       u32 rsv[5];
+} __packed __aligned(4);
+
+/**
+ * struct mt76_connac2_mcu_uni_txd - mcu command descriptor for firmware v3
+ * @txd: hardware descriptor
+ * @len: total length not including txd
+ * @cid: command identifier
+ * @pkt_type: must be 0xa0 (cmd packet by long format)
+ * @frag_n: fragment number
+ * @seq: sequence number
+ * @checksum: 0 mean there is no checksum
+ * @s2d_index: index for command source and destination
+ *  Definition              | value | note
+ *  CMD_S2D_IDX_H2N         | 0x00  | command from HOST to WM
+ *  CMD_S2D_IDX_C2N         | 0x01  | command from WA to WM
+ *  CMD_S2D_IDX_H2C         | 0x02  | command from HOST to WA
+ *  CMD_S2D_IDX_H2N_AND_H2C | 0x03  | command from HOST to WA and WM
+ *
+ * @option: command option
+ *  BIT[0]: UNI_CMD_OPT_BIT_ACK
+ *          set to 1 to request a fw reply
+ *          if UNI_CMD_OPT_BIT_0_ACK is set and UNI_CMD_OPT_BIT_2_SET_QUERY
+ *          is set, mcu firmware will send response event EID = 0x01
+ *          (UNI_EVENT_ID_CMD_RESULT) to the host.
+ *  BIT[1]: UNI_CMD_OPT_BIT_UNI_CMD
+ *          0: original command
+ *          1: unified command
+ *  BIT[2]: UNI_CMD_OPT_BIT_SET_QUERY
+ *          0: QUERY command
+ *          1: SET command
+ */
+struct mt76_connac2_mcu_uni_txd {
+       __le32 txd[8];
+
+       /* DW1 */
+       __le16 len;
+       __le16 cid;
+
+       /* DW2 */
+       u8 rsv;
+       u8 pkt_type;
+       u8 frag_n;
+       u8 seq;
+
+       /* DW3 */
+       __le16 checksum;
+       u8 s2d_index;
+       u8 option;
+
+       /* DW4 */
+       u8 rsv1[4];
+} __packed __aligned(4);
+
+struct mt76_connac2_mcu_rxd {
+       __le32 rxd[6];
+
+       __le16 len;
+       __le16 pkt_type_id;
+
+       u8 eid;
+       u8 seq;
+       u8 rsv[2];
+
+       u8 ext_eid;
+       u8 rsv1[2];
+       u8 s2d_index;
+};
+
 struct mt76_connac2_patch_hdr {
        char build_date[16];
        char platform[4];

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 3a70518..c8cc60c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -150,7 +150,7 @@ static int
 mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,
                          struct sk_buff *skb, int seq)
 {
-       struct mt7915_mcu_rxd *rxd;
+       struct mt76_connac2_mcu_rxd *rxd;
        int ret = 0;
 
        if (!skb) {
@@ -159,7 +159,7 @@ mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,
                return -ETIMEDOUT;
        }
 
-       rxd = (struct mt7915_mcu_rxd *)skb->data;
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
        if (seq != rxd->seq)
                return -EAGAIN;
 
@@ -170,7 +170,7 @@ mt7915_mcu_parse_response(struct mt76_dev *mdev, int cmd,
                skb_pull(skb, sizeof(*rxd) + 4);
                ret = le32_to_cpu(*(__le32 *)skb->data);
        } else {
-               skb_pull(skb, sizeof(struct mt7915_mcu_rxd));
+               skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
        }
 
        return ret;
@@ -181,7 +181,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
                        int cmd, int *wait_seq)
 {
        struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);
-       struct mt7915_mcu_txd *mcu_txd;
+       struct mt76_connac2_mcu_txd *mcu_txd;
        enum mt76_mcuq_id qid;
        __le32 *txd;
        u32 val;
@@ -199,7 +199,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
                goto exit;
        }
 
-       mcu_txd = (struct mt7915_mcu_txd *)skb_push(skb, sizeof(*mcu_txd));
+       mcu_txd = (struct mt76_connac2_mcu_txd *)skb_push(skb, sizeof(*mcu_txd));
        if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state))
                qid = MT_MCUQ_WA;
        else
@@ -326,10 +326,12 @@ mt7915_mcu_rx_radar_detected(struct mt7915_dev *dev, struct sk_buff *skb)
 static void
 mt7915_mcu_rx_log_message(struct mt7915_dev *dev, struct sk_buff *skb)
 {
-       struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb->data;
-       const char *data = (char *)&rxd[1];
-       const char *type;
+       struct mt76_connac2_mcu_rxd *rxd;
        int len = skb->len - sizeof(*rxd);
+       const char *data, *type;
+
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
+       data = (char *)&rxd[1];
 
        switch (rxd->s2d_index) {
        case 0:
@@ -377,8 +379,9 @@ mt7915_mcu_rx_bcc_notify(struct mt7915_dev *dev, struct sk_buff *skb)
 static void
 mt7915_mcu_rx_ext_event(struct mt7915_dev *dev, struct sk_buff *skb)
 {
-       struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb->data;
+       struct mt76_connac2_mcu_rxd *rxd;
 
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
        switch (rxd->ext_eid) {
        case MCU_EXT_EVENT_THERMAL_PROTECT:
                mt7915_mcu_rx_thermal_notify(dev, skb);
@@ -403,8 +406,9 @@ mt7915_mcu_rx_ext_event(struct mt7915_dev *dev, struct sk_buff *skb)
 static void
 mt7915_mcu_rx_unsolicited_event(struct mt7915_dev *dev, struct sk_buff *skb)
 {
-       struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb->data;
+       struct mt76_connac2_mcu_rxd *rxd;
 
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
        switch (rxd->eid) {
        case MCU_EVENT_EXT:
                mt7915_mcu_rx_ext_event(dev, skb);
@@ -417,8 +421,9 @@ mt7915_mcu_rx_unsolicited_event(struct mt7915_dev *dev, struct sk_buff *skb)
 
 void mt7915_mcu_rx_event(struct mt7915_dev *dev, struct sk_buff *skb)
 {
-       struct mt7915_mcu_rxd *rxd = (struct mt7915_mcu_rxd *)skb->data;
+       struct mt76_connac2_mcu_rxd *rxd;
 
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
        if (rxd->ext_eid == MCU_EXT_EVENT_THERMAL_PROTECT ||
            rxd->ext_eid == MCU_EXT_EVENT_FW_LOG_2_HOST ||
            rxd->ext_eid == MCU_EXT_EVENT_ASSERT_DUMP ||
@@ -2275,7 +2280,7 @@ mt7915_mcu_init_rx_airtime(struct mt7915_dev *dev)
 int mt7915_mcu_init(struct mt7915_dev *dev)
 {
        static const struct mt76_mcu_ops mt7915_mcu_ops = {
-               .headroom = sizeof(struct mt7915_mcu_txd),
+               .headroom = sizeof(struct mt76_connac2_mcu_txd),
                .mcu_skb_send_msg = mt7915_mcu_send_message,
                .mcu_parse_response = mt7915_mcu_parse_response,
                .mcu_restart = mt76_connac_mcu_restart,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
index 5abde48..e1919e0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
@@ -6,25 +6,6 @@
 
 #include "../mt76_connac_mcu.h"
 
-struct mt7915_mcu_txd {
-       __le32 txd[8];
-
-       __le16 len;
-       __le16 pq_id;
-
-       u8 cid;
-       u8 pkt_type;
-       u8 set_query; /* FW don't care */
-       u8 seq;
-
-       u8 uc_d2b0_rev;
-       u8 ext_cid;
-       u8 s2d_index;
-       u8 ext_cid_ack;
-
-       u32 reserved[5];
-} __packed __aligned(4);
-
 enum {
        MCU_ATE_SET_TRX = 0x1,
        MCU_ATE_SET_FREQ_OFFSET = 0xa,
@@ -32,21 +13,6 @@ enum {
        MCU_ATE_CLEAN_TXQUEUE = 0x1c,
 };
 
-struct mt7915_mcu_rxd {
-       __le32 rxd[6];
-
-       __le16 len;
-       __le16 pkt_type_id;
-
-       u8 eid;
-       u8 seq;
-       __le16 __rsv;
-
-       u8 ext_eid;
-       u8 __rsv1[2];
-       u8 s2d_index;
-};
-
 struct mt7915_mcu_thermal_ctrl {
        u8 ctrl_id;
        u8 band_idx;
@@ -63,7 +29,7 @@ struct mt7915_mcu_thermal_ctrl {
 } __packed;
 
 struct mt7915_mcu_thermal_notify {
-       struct mt7915_mcu_rxd rxd;
+       struct mt76_connac2_mcu_rxd rxd;
 
        struct mt7915_mcu_thermal_ctrl ctrl;
        __le32 temperature;
@@ -71,7 +37,7 @@ struct mt7915_mcu_thermal_notify {
 } __packed;
 
 struct mt7915_mcu_csa_notify {
-       struct mt7915_mcu_rxd rxd;
+       struct mt76_connac2_mcu_rxd rxd;
 
        u8 omac_idx;
        u8 csa_count;
@@ -80,7 +46,7 @@ struct mt7915_mcu_csa_notify {
 } __packed;
 
 struct mt7915_mcu_bcc_notify {
-       struct mt7915_mcu_rxd rxd;
+       struct mt76_connac2_mcu_rxd rxd;
 
        u8 band_idx;
        u8 omac_idx;
@@ -89,7 +55,7 @@ struct mt7915_mcu_bcc_notify {
 } __packed;
 
 struct mt7915_mcu_rdd_report {
-       struct mt7915_mcu_rxd rxd;
+       struct mt76_connac2_mcu_rxd rxd;
 
        u8 band_idx;
        u8 long_detected;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index b8fe613..eb1bfb6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -970,7 +970,7 @@ void mt7921_coredump_work(struct work_struct *work)
                if (!skb)
                        break;
 
-               skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+               skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
                if (!dump || data + skb->len - dump > MT76_CONNAC_COREDUMP_SZ) {
                        dev_kfree_skb(skb);
                        continue;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 4be488d..f2f29ec 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -1168,7 +1168,7 @@ void mt7921_scan_work(struct work_struct *work)
                                                scan_work.work);
 
        while (true) {
-               struct mt7921_mcu_rxd *rxd;
+               struct mt76_connac2_mcu_rxd *rxd;
                struct sk_buff *skb;
 
                spin_lock_bh(&phy->dev->mt76.lock);
@@ -1178,7 +1178,7 @@ void mt7921_scan_work(struct work_struct *work)
                if (!skb)
                        break;
 
-               rxd = (struct mt7921_mcu_rxd *)skb->data;
+               rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
                if (rxd->eid == MCU_EVENT_SCHED_SCAN_DONE) {
                        ieee80211_sched_scan_results(phy->mt76->hw);
                } else if (test_and_clear_bit(MT76_HW_SCANNING,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index bc434e6..6eab038 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -19,7 +19,7 @@ mt7921_mcu_parse_eeprom(struct mt76_dev *dev, struct sk_buff *skb)
        if (!skb)
                return -EINVAL;
 
-       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
 
        res = (struct mt7921_mcu_eeprom_info *)skb->data;
        buf = dev->eeprom.data + le32_to_cpu(res->addr);
@@ -32,7 +32,7 @@ int mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,
                              struct sk_buff *skb, int seq)
 {
        int mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);
-       struct mt7921_mcu_rxd *rxd;
+       struct mt76_connac2_mcu_rxd *rxd;
        int ret = 0;
 
        if (!skb) {
@@ -43,7 +43,7 @@ int mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,
                return -ETIMEDOUT;
        }
 
-       rxd = (struct mt7921_mcu_rxd *)skb->data;
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
        if (seq != rxd->seq)
                return -EAGAIN;
 
@@ -77,7 +77,7 @@ int mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,
                event = (struct mt7921_mcu_reg_event *)skb->data;
                ret = (int)le32_to_cpu(event->val);
        } else {
-               skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+               skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
        }
 
        return ret;
@@ -89,8 +89,8 @@ int mt7921_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,
 {
        struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);
        int txd_len, mcu_cmd = FIELD_GET(__MCU_CMD_FIELD_ID, cmd);
-       struct mt7921_uni_txd *uni_txd;
-       struct mt7921_mcu_txd *mcu_txd;
+       struct mt76_connac2_mcu_uni_txd *uni_txd;
+       struct mt76_connac2_mcu_txd *mcu_txd;
        __le32 *txd;
        u32 val;
        u8 seq;
@@ -122,7 +122,7 @@ int mt7921_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,
        txd[1] = cpu_to_le32(val);
 
        if (cmd & __MCU_CMD_FIELD_UNI) {
-               uni_txd = (struct mt7921_uni_txd *)txd;
+               uni_txd = (struct mt76_connac2_mcu_uni_txd *)txd;
                uni_txd->len = cpu_to_le16(skb->len - sizeof(uni_txd->txd));
                uni_txd->option = MCU_CMD_UNI_EXT_ACK;
                uni_txd->cid = cpu_to_le16(mcu_cmd);
@@ -133,7 +133,7 @@ int mt7921_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,
                goto exit;
        }
 
-       mcu_txd = (struct mt7921_mcu_txd *)txd;
+       mcu_txd = (struct mt76_connac2_mcu_txd *)txd;
        mcu_txd->len = cpu_to_le16(skb->len - sizeof(mcu_txd->txd));
        mcu_txd->pq_id = cpu_to_le16(MCU_PQ_ID(MT_TX_PORT_IDX_MCU,
                                               MT_TX_MCU_PORT_RX_Q0));
@@ -241,7 +241,7 @@ mt7921_mcu_connection_loss_event(struct mt7921_dev *dev, struct sk_buff *skb)
        struct mt76_connac_beacon_loss_event *event;
        struct mt76_phy *mphy = &dev->mt76.phy;
 
-       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
        event = (struct mt76_connac_beacon_loss_event *)skb->data;
 
        ieee80211_iterate_active_interfaces_atomic(mphy->hw,
@@ -255,7 +255,7 @@ mt7921_mcu_bss_event(struct mt7921_dev *dev, struct sk_buff *skb)
        struct mt76_phy *mphy = &dev->mt76.phy;
        struct mt76_connac_mcu_bss_event *event;
 
-       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
        event = (struct mt76_connac_mcu_bss_event *)skb->data;
        if (event->is_absent)
                ieee80211_stop_queues(mphy->hw);
@@ -275,7 +275,7 @@ mt7921_mcu_debug_msg_event(struct mt7921_dev *dev, struct sk_buff *skb)
                u8 content[512];
        } __packed * msg;
 
-       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
        msg = (struct mt7921_debug_msg *)skb->data;
 
        if (msg->type == 3) { /* fw log */
@@ -298,7 +298,7 @@ mt7921_mcu_low_power_event(struct mt7921_dev *dev, struct sk_buff *skb)
                u8 reserved[3];
        } __packed * event;
 
-       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
        event = (struct mt7921_mcu_lp_event *)skb->data;
 
        trace_lp_event(dev, event->state);
@@ -309,7 +309,7 @@ mt7921_mcu_tx_done_event(struct mt7921_dev *dev, struct sk_buff *skb)
 {
        struct mt7921_mcu_tx_done_event *event;
 
-       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       skb_pull(skb, sizeof(struct mt76_connac2_mcu_rxd));
        event = (struct mt7921_mcu_tx_done_event *)skb->data;
 
        mt7921_mac_add_txs(dev, event->txs);
@@ -318,8 +318,9 @@ mt7921_mcu_tx_done_event(struct mt7921_dev *dev, struct sk_buff *skb)
 static void
 mt7921_mcu_rx_unsolicited_event(struct mt7921_dev *dev, struct sk_buff *skb)
 {
-       struct mt7921_mcu_rxd *rxd = (struct mt7921_mcu_rxd *)skb->data;
+       struct mt76_connac2_mcu_rxd *rxd;
 
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
        switch (rxd->eid) {
        case MCU_EVENT_BSS_BEACON_LOSS:
                mt7921_mcu_connection_loss_event(dev, skb);
@@ -353,12 +354,12 @@ mt7921_mcu_rx_unsolicited_event(struct mt7921_dev *dev, struct sk_buff *skb)
 
 void mt7921_mcu_rx_event(struct mt7921_dev *dev, struct sk_buff *skb)
 {
-       struct mt7921_mcu_rxd *rxd;
+       struct mt76_connac2_mcu_rxd *rxd;
 
        if (skb_linearize(skb))
                return;
 
-       rxd = (struct mt7921_mcu_rxd *)skb->data;
+       rxd = (struct mt76_connac2_mcu_rxd *)skb->data;
 
        if (rxd->eid == 0x6) {
                mt76_mcu_rx_event(&dev->mt76, skb);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
index 77cc0cc..a420821 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.h
@@ -6,76 +6,6 @@
 
 #include "../mt76_connac_mcu.h"
 
-struct mt7921_mcu_txd {
-       __le32 txd[8];
-
-       __le16 len;
-       __le16 pq_id;
-
-       u8 cid;
-       u8 pkt_type;
-       u8 set_query; /* FW don't care */
-       u8 seq;
-
-       u8 uc_d2b0_rev;
-       u8 ext_cid;
-       u8 s2d_index;
-       u8 ext_cid_ack;
-
-       u32 reserved[5];
-} __packed __aligned(4);
-
-/**
- * struct mt7921_uni_txd - mcu command descriptor for firmware v3
- * @txd: hardware descriptor
- * @len: total length not including txd
- * @cid: command identifier
- * @pkt_type: must be 0xa0 (cmd packet by long format)
- * @frag_n: fragment number
- * @seq: sequence number
- * @checksum: 0 mean there is no checksum
- * @s2d_index: index for command source and destination
- *  Definition              | value | note
- *  CMD_S2D_IDX_H2N         | 0x00  | command from HOST to WM
- *  CMD_S2D_IDX_C2N         | 0x01  | command from WA to WM
- *  CMD_S2D_IDX_H2C         | 0x02  | command from HOST to WA
- *  CMD_S2D_IDX_H2N_AND_H2C | 0x03  | command from HOST to WA and WM
- *
- * @option: command option
- *  BIT[0]: UNI_CMD_OPT_BIT_ACK
- *          set to 1 to request a fw reply
- *          if UNI_CMD_OPT_BIT_0_ACK is set and UNI_CMD_OPT_BIT_2_SET_QUERY
- *          is set, mcu firmware will send response event EID = 0x01
- *          (UNI_EVENT_ID_CMD_RESULT) to the host.
- *  BIT[1]: UNI_CMD_OPT_BIT_UNI_CMD
- *          0: original command
- *          1: unified command
- *  BIT[2]: UNI_CMD_OPT_BIT_SET_QUERY
- *          0: QUERY command
- *          1: SET command
- */
-struct mt7921_uni_txd {
-       __le32 txd[8];
-
-       /* DW1 */
-       __le16 len;
-       __le16 cid;
-
-       /* DW2 */
-       u8 reserved;
-       u8 pkt_type;
-       u8 frag_n;
-       u8 seq;
-
-       /* DW3 */
-       __le16 checksum;
-       u8 s2d_index;
-       u8 option;
-
-       /* DW4 */
-       u8 reserved2[4];
-} __packed __aligned(4);
-
 struct mt7921_mcu_tx_done_event {
        u8 pid;
        u8 status;
@@ -108,21 +38,6 @@ enum {
        MCU_EXT_EVENT_RATE_REPORT = 0x87,
 };
 
-struct mt7921_mcu_rxd {
-       __le32 rxd[6];
-
-       __le16 len;
-       __le16 pkt_type_id;
-
-       u8 eid;
-       u8 seq;
-       __le16 __rsv;
-
-       u8 ext_eid;
-       u8 __rsv1[2];
-       u8 s2d_index;
-};
-
 struct mt7921_mcu_eeprom_info {
        __le32 addr;
        __le32 valid;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
index a1ab5f8..07d970e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
@@ -39,7 +39,7 @@ mt7921_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
 int mt7921e_mcu_init(struct mt7921_dev *dev)
 {
        static const struct mt76_mcu_ops mt7921_mcu_ops = {
-               .headroom = sizeof(struct mt7921_mcu_txd),
+               .headroom = sizeof(struct mt76_connac2_mcu_txd),
                .mcu_skb_send_msg = mt7921_mcu_send_message,
                .mcu_parse_response = mt7921_mcu_parse_response,
                .mcu_restart = mt76_connac_mcu_restart,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
index efcbe06..ba4fdff 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio_mcu.c
@@ -72,7 +72,8 @@ static u32 mt7921s_clear_rm3r_drv_own(struct mt7921_dev *dev)
 int mt7921s_mcu_init(struct mt7921_dev *dev)
 {
        static const struct mt76_mcu_ops mt7921s_mcu_ops = {
-               .headroom = MT_SDIO_HDR_SIZE + sizeof(struct mt7921_mcu_txd),
+               .headroom = MT_SDIO_HDR_SIZE +
+                           sizeof(struct mt76_connac2_mcu_txd),
                .tailroom = MT_SDIO_TAIL_SIZE,
                .mcu_skb_send_msg = mt7921s_mcu_send_message,
                .mcu_parse_response = mt7921_mcu_parse_response,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
index 4e4cd2d..2966b20 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
@@ -125,7 +125,8 @@ mt7921u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb,
 static int mt7921u_mcu_init(struct mt7921_dev *dev)
 {
        static const struct mt76_mcu_ops mcu_ops = {
-               .headroom = MT_SDIO_HDR_SIZE + sizeof(struct mt7921_mcu_txd),
+               .headroom = MT_SDIO_HDR_SIZE +
+                           sizeof(struct mt76_connac2_mcu_txd),
                .tailroom = MT_USB_TAIL_SIZE,
                .mcu_skb_send_msg = mt7921u_mcu_send_message,
                .mcu_parse_response = mt7921_mcu_parse_response,