Use proper buffer size for mcu messages in mt7615_mcu_set_tx_ba routine.
Allocate the mcu buffer relying on kmalloc instead of putting it on the
stack
Signed-off-by: Lorenzo Bianconi <lorenzo@xxxxxxxxxx>
---
.../net/wireless/mediatek/mt76/mt7615/mcu.c | 77 +++++++++++--------
.../net/wireless/mediatek/mt76/mt7615/mcu.h | 6 ++
2 files changed, 49 insertions(+), 34 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 7218a3041ead..fd01c24c48e2 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -1696,49 +1696,54 @@ int mt7615_mcu_set_tx_ba(struct mt7615_dev *dev,
{
struct mt7615_sta *msta = (struct mt7615_sta *)params->sta->drv_priv;
struct mt7615_vif *mvif = msta->vif;
- struct {
- struct sta_req_hdr hdr;
- struct sta_rec_ba ba;
- u8 buf[MT7615_WTBL_UPDATE_MAX_SIZE];
- } __packed req = {
- .hdr = {
- .bss_idx = mvif->idx,
- .wlan_idx = msta->wcid.idx,
- .tlv_num = cpu_to_le16(1),
- .is_tlv_append = 1,
- .muar_idx = mvif->omac_idx,
- },
- .ba = {
- .tag = cpu_to_le16(STA_REC_BA),
- .len = cpu_to_le16(sizeof(struct sta_rec_ba)),
- .tid = params->tid,
- .ba_type = MT_BA_TYPE_ORIGINATOR,
- .amsdu = params->amsdu,
- .ba_en = add << params->tid,
- .ssn = cpu_to_le16(params->ssn),
- .winsize = cpu_to_le16(params->buf_size),
- },
- };
struct sta_rec_wtbl *wtbl = NULL;
struct wtbl_req_hdr *wtbl_hdr;
+ struct sta_req_hdr *sta_hdr;
+ struct sta_rec_ba *sta_ba;
struct wtbl_ba *wtbl_ba;
- u8 *buf = req.buf;
+ int wtbl_len, err;
+ u8 *data, *buf;
+
+ buf = kzalloc(MT7615_MCU_BA_BUF_SIZE, GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;
+
+ data = buf;
+ sta_hdr = (struct sta_req_hdr *)data;
+ data += sizeof(*sta_hdr);
+ sta_hdr->bss_idx = mvif->idx;
+ sta_hdr->wlan_idx = msta->wcid.idx;
+ sta_hdr->tlv_num = cpu_to_le16(1);
+ sta_hdr->is_tlv_append = 1;
+ sta_hdr->muar_idx = mvif->omac_idx;
+
+ sta_ba = (struct sta_rec_ba *)data;
+ data += sizeof(*sta_ba);
+ sta_ba->tag = cpu_to_le16(STA_REC_BA);
+ sta_ba->len = cpu_to_le16(sizeof(*sta_ba));
+ sta_ba->tid = params->tid;
+ sta_ba->ba_type = MT_BA_TYPE_ORIGINATOR;
+ sta_ba->amsdu = params->amsdu;
+ sta_ba->ba_en = add << params->tid;
+ sta_ba->ssn = cpu_to_le16(params->ssn);
+ sta_ba->winsize = cpu_to_le16(params->buf_size);
if (dev->fw_ver > MT7615_FIRMWARE_V1) {
- req.hdr.tlv_num = cpu_to_le16(2);
- wtbl = (struct sta_rec_wtbl *)buf;
+ sta_hdr->tlv_num = cpu_to_le16(2);
+
+ wtbl = (struct sta_rec_wtbl *)data;
+ data += sizeof(*wtbl);
wtbl->tag = cpu_to_le16(STA_REC_WTBL);
- buf += sizeof(*wtbl);
}
- wtbl_hdr = (struct wtbl_req_hdr *)buf;
- buf += sizeof(*wtbl_hdr);
+ wtbl_hdr = (struct wtbl_req_hdr *)data;
+ data += sizeof(*wtbl_hdr);
wtbl_hdr->wlan_idx = msta->wcid.idx;
wtbl_hdr->operation = WTBL_SET;
wtbl_hdr->tlv_num = cpu_to_le16(1);
- wtbl_ba = (struct wtbl_ba *)buf;
- buf += sizeof(*wtbl_ba);
+ wtbl_ba = (struct wtbl_ba *)data;
+ data += sizeof(*wtbl_ba);
wtbl_ba->tag = cpu_to_le16(WTBL_BA);
wtbl_ba->len = cpu_to_le16(sizeof(*wtbl_ba));
wtbl_ba->tid = params->tid;
@@ -1757,11 +1762,15 @@ int mt7615_mcu_set_tx_ba(struct mt7615_dev *dev,
wtbl_ba->ba_winsize_idx = idx;
}
+ wtbl_len = sizeof(*wtbl_hdr) + sizeof(*wtbl_ba);
if (wtbl)
- wtbl->len = cpu_to_le16(buf - (u8 *)wtbl_hdr);
+ wtbl->len = cpu_to_le16(wtbl_len);
- return mt7615_mcu_send_sta_rec(dev, (u8 *)&req, (u8 *)wtbl_hdr,
- buf - (u8 *)wtbl_hdr, true);
+ err = mt7615_mcu_send_sta_rec(dev, buf, (u8 *)wtbl_hdr, wtbl_len,
+ true);
+ kfree(buf);
+
+ return err;
}
int mt7615_mcu_set_rx_ba(struct mt7615_dev *dev,
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h
index db0199e60cb8..62da62981138 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.h
@@ -496,6 +496,12 @@ struct wtbl_raw {
sizeof(struct wtbl_pn) + \
sizeof(struct wtbl_spe))
+#define MT7615_MCU_BA_BUF_SIZE (sizeof(struct sta_req_hdr) + \
+ sizeof(struct sta_rec_ba) + \
+ sizeof(struct sta_rec_wtbl) + \
+ sizeof(struct wtbl_req_hdr) + \
+ sizeof(struct wtbl_ba))
+
enum {
WTBL_GENERIC,
WTBL_RX,
--
2.24.1
