Skip to content

L
linux
Commit a3a2c2e7 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files
Options

mt7615: initialize mt76_mcu_ops data structure 

Use __mt76_mcu_send_msg wrapper instead of mt7615_mcu_msg_send.
This is a preliminary patch for mt7615-mt7603 mcu code unification
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 516c3e38
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 34 deletions
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
View file @ a3a2c2e7
...@@ -113,9 +113,10 @@ static int __mt7615_mcu_msg_send(struct mt7615_dev *dev, struct sk_buff *skb, ...@@ -113,9 +113,10 @@ static int __mt7615_mcu_msg_send(struct mt7615_dev *dev, struct sk_buff *skb,
} }
static int static int
mt7615_mcu_msg_send(struct mt7615_dev *dev, int cmd, const void *data, mt7615_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,
int len, bool wait_resp) int len, bool wait_resp)
{ {
struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76);
unsigned long expires = jiffies + 10 * HZ; unsigned long expires = jiffies + 10 * HZ;
struct mt7615_mcu_rxd *rxd; struct mt7615_mcu_rxd *rxd;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -125,16 +126,16 @@ mt7615_mcu_msg_send(struct mt7615_dev *dev, int cmd, const void *data, ...@@ -125,16 +126,16 @@ mt7615_mcu_msg_send(struct mt7615_dev *dev, int cmd, const void *data,
if (!skb) if (!skb)
return -ENOMEM; return -ENOMEM;
mutex_lock(&dev->mt76.mmio.mcu.mutex); mutex_lock(&mdev->mmio.mcu.mutex);
ret = __mt7615_mcu_msg_send(dev, skb, cmd, &seq); ret = __mt7615_mcu_msg_send(dev, skb, cmd, &seq);
if (ret) if (ret)
goto out; goto out;
while (wait_resp) { while (wait_resp) {
skb = mt76_mcu_get_response(&dev->mt76, expires); skb = mt76_mcu_get_response(mdev, expires);
if (!skb) { if (!skb) {
dev_err(dev->mt76.dev, "Message %d (seq %d) timeout\n", dev_err(mdev->dev, "Message %d (seq %d) timeout\n",
cmd, seq); cmd, seq);
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
break; break;
...@@ -153,7 +154,7 @@ mt7615_mcu_msg_send(struct mt7615_dev *dev, int cmd, const void *data, ...@@ -153,7 +154,7 @@ mt7615_mcu_msg_send(struct mt7615_dev *dev, int cmd, const void *data,
} }
out: out:
mutex_unlock(&dev->mt76.mmio.mcu.mutex); mutex_unlock(&mdev->mmio.mcu.mutex);
return ret; return ret;
} }
...@@ -171,7 +172,7 @@ static int mt7615_mcu_init_download(struct mt7615_dev *dev, u32 addr, ...@@ -171,7 +172,7 @@ static int mt7615_mcu_init_download(struct mt7615_dev *dev, u32 addr,
.mode = cpu_to_le32(mode), .mode = cpu_to_le32(mode),
}; };
return mt7615_mcu_msg_send(dev, -MCU_CMD_TARGET_ADDRESS_LEN_REQ, return __mt76_mcu_send_msg(&dev->mt76, -MCU_CMD_TARGET_ADDRESS_LEN_REQ,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -212,13 +213,13 @@ static int mt7615_mcu_start_firmware(struct mt7615_dev *dev, u32 addr, ...@@ -212,13 +213,13 @@ static int mt7615_mcu_start_firmware(struct mt7615_dev *dev, u32 addr,
.addr = cpu_to_le32(addr), .addr = cpu_to_le32(addr),
}; };
return mt7615_mcu_msg_send(dev, -MCU_CMD_FW_START_REQ, return __mt76_mcu_send_msg(&dev->mt76, -MCU_CMD_FW_START_REQ,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
static int mt7615_mcu_restart(struct mt7615_dev *dev) static int mt7615_mcu_restart(struct mt7615_dev *dev)
{ {
return mt7615_mcu_msg_send(dev, -MCU_CMD_RESTART_DL_REQ, return __mt76_mcu_send_msg(&dev->mt76, -MCU_CMD_RESTART_DL_REQ,
NULL, 0, true); NULL, 0, true);
} }
...@@ -230,7 +231,7 @@ static int mt7615_mcu_patch_sem_ctrl(struct mt7615_dev *dev, bool get) ...@@ -230,7 +231,7 @@ static int mt7615_mcu_patch_sem_ctrl(struct mt7615_dev *dev, bool get)
.op = cpu_to_le32(get ? PATCH_SEM_GET : PATCH_SEM_RELEASE), .op = cpu_to_le32(get ? PATCH_SEM_GET : PATCH_SEM_RELEASE),
}; };
return mt7615_mcu_msg_send(dev, -MCU_CMD_PATCH_SEM_CONTROL, return __mt76_mcu_send_msg(&dev->mt76, -MCU_CMD_PATCH_SEM_CONTROL,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -243,7 +244,7 @@ static int mt7615_mcu_start_patch(struct mt7615_dev *dev) ...@@ -243,7 +244,7 @@ static int mt7615_mcu_start_patch(struct mt7615_dev *dev)
.check_crc = 0, .check_crc = 0,
}; };
return mt7615_mcu_msg_send(dev, -MCU_CMD_PATCH_FINISH_REQ, return __mt76_mcu_send_msg(&dev->mt76, -MCU_CMD_PATCH_FINISH_REQ,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -480,8 +481,13 @@ static int mt7615_load_firmware(struct mt7615_dev *dev) ...@@ -480,8 +481,13 @@ static int mt7615_load_firmware(struct mt7615_dev *dev)
int mt7615_mcu_init(struct mt7615_dev *dev) int mt7615_mcu_init(struct mt7615_dev *dev)
{ {
static const struct mt76_mcu_ops mt7615_mcu_ops = {
.mcu_send_msg = mt7615_mcu_msg_send,
};
int ret; int ret;
dev->mt76.mcu_ops = &mt7615_mcu_ops,
ret = mt7615_driver_own(dev); ret = mt7615_driver_own(dev);
if (ret) if (ret)
return ret; return ret;
...@@ -523,7 +529,7 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev) ...@@ -523,7 +529,7 @@ int mt7615_mcu_set_eeprom(struct mt7615_dev *dev)
memcpy(req + sizeof(req_hdr), eep + MT_EE_NIC_CONF_0, memcpy(req + sizeof(req_hdr), eep + MT_EE_NIC_CONF_0,
__MT_EE_MAX - MT_EE_NIC_CONF_0); __MT_EE_MAX - MT_EE_NIC_CONF_0);
ret = mt7615_mcu_msg_send(dev, MCU_EXT_CMD_EFUSE_BUFFER_MODE, ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_EFUSE_BUFFER_MODE,
req, len, true); req, len, true);
kfree(req); kfree(req);
...@@ -541,7 +547,7 @@ int mt7615_mcu_init_mac(struct mt7615_dev *dev) ...@@ -541,7 +547,7 @@ int mt7615_mcu_init_mac(struct mt7615_dev *dev)
.band = 0, .band = 0,
}; };
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_MAC_INIT_CTRL, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_MAC_INIT_CTRL,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -560,7 +566,7 @@ int mt7615_mcu_set_rts_thresh(struct mt7615_dev *dev, u32 val) ...@@ -560,7 +566,7 @@ int mt7615_mcu_set_rts_thresh(struct mt7615_dev *dev, u32 val)
.pkt_thresh = cpu_to_le32(0x2), .pkt_thresh = cpu_to_le32(0x2),
}; };
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_PROTECT_CTRL, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_PROTECT_CTRL,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -597,7 +603,7 @@ int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue, ...@@ -597,7 +603,7 @@ int mt7615_mcu_set_wmm(struct mt7615_dev *dev, u8 queue,
req.cw_max = cpu_to_le16(params->cw_max); req.cw_max = cpu_to_le16(params->cw_max);
} }
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_EDCA_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_EDCA_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -627,7 +633,7 @@ int mt7615_mcu_ctrl_pm_state(struct mt7615_dev *dev, int enter) ...@@ -627,7 +633,7 @@ int mt7615_mcu_ctrl_pm_state(struct mt7615_dev *dev, int enter)
.band_idx = 0, .band_idx = 0,
}; };
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_PM_STATE_CTRL, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_PM_STATE_CTRL,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -666,7 +672,7 @@ int mt7615_mcu_set_dev_info(struct mt7615_dev *dev, ...@@ -666,7 +672,7 @@ int mt7615_mcu_set_dev_info(struct mt7615_dev *dev,
}; };
memcpy(data.tlv.omac_addr, vif->addr, ETH_ALEN); memcpy(data.tlv.omac_addr, vif->addr, ETH_ALEN);
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_DEV_INFO_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_DEV_INFO_UPDATE,
&data, sizeof(data), true); &data, sizeof(data), true);
} }
...@@ -812,7 +818,7 @@ int mt7615_mcu_set_bss_info(struct mt7615_dev *dev, ...@@ -812,7 +818,7 @@ int mt7615_mcu_set_bss_info(struct mt7615_dev *dev,
} }
} }
ret = mt7615_mcu_msg_send(dev, MCU_EXT_CMD_BSS_INFO_UPDATE, ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_BSS_INFO_UPDATE,
buf, len, true); buf, len, true);
kfree(buf); kfree(buf);
...@@ -886,7 +892,7 @@ int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid, ...@@ -886,7 +892,7 @@ int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid,
req.key.key_len = sizeof(req.key.key_material); req.key.key_len = sizeof(req.key.key_material);
} }
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -919,7 +925,7 @@ mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev, ...@@ -919,7 +925,7 @@ mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev,
}; };
eth_broadcast_addr(req.g_wtbl.peer_addr); eth_broadcast_addr(req.g_wtbl.peer_addr);
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -934,7 +940,7 @@ int mt7615_mcu_wtbl_bmc(struct mt7615_dev *dev, ...@@ -934,7 +940,7 @@ int mt7615_mcu_wtbl_bmc(struct mt7615_dev *dev,
.operation = WTBL_RESET_AND_SET, .operation = WTBL_RESET_AND_SET,
}; };
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -973,7 +979,7 @@ int mt7615_mcu_add_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif, ...@@ -973,7 +979,7 @@ int mt7615_mcu_add_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif,
}; };
memcpy(req.g_wtbl.peer_addr, sta->addr, ETH_ALEN); memcpy(req.g_wtbl.peer_addr, sta->addr, ETH_ALEN);
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -986,7 +992,7 @@ int mt7615_mcu_del_wtbl(struct mt7615_dev *dev, ...@@ -986,7 +992,7 @@ int mt7615_mcu_del_wtbl(struct mt7615_dev *dev,
.operation = WTBL_RESET_AND_SET, .operation = WTBL_RESET_AND_SET,
}; };
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -996,7 +1002,7 @@ int mt7615_mcu_del_wtbl_all(struct mt7615_dev *dev) ...@@ -996,7 +1002,7 @@ int mt7615_mcu_del_wtbl_all(struct mt7615_dev *dev)
.operation = WTBL_RESET_ALL, .operation = WTBL_RESET_ALL,
}; };
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -1032,7 +1038,7 @@ int mt7615_mcu_set_sta_rec_bmc(struct mt7615_dev *dev, ...@@ -1032,7 +1038,7 @@ int mt7615_mcu_set_sta_rec_bmc(struct mt7615_dev *dev,
req.basic.extra_info = cpu_to_le16(EXTRA_INFO_VER); req.basic.extra_info = cpu_to_le16(EXTRA_INFO_VER);
} }
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_STA_REC_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_STA_REC_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -1092,7 +1098,7 @@ int mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, struct ieee80211_vif *vif, ...@@ -1092,7 +1098,7 @@ int mt7615_mcu_set_sta_rec(struct mt7615_dev *dev, struct ieee80211_vif *vif,
req.basic.extra_info = cpu_to_le16(EXTRA_INFO_VER); req.basic.extra_info = cpu_to_le16(EXTRA_INFO_VER);
} }
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_STA_REC_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_STA_REC_UPDATE,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -1145,7 +1151,7 @@ int mt7615_mcu_set_bcn(struct mt7615_dev *dev, struct ieee80211_vif *vif, ...@@ -1145,7 +1151,7 @@ int mt7615_mcu_set_bcn(struct mt7615_dev *dev, struct ieee80211_vif *vif,
dev_kfree_skb(skb); dev_kfree_skb(skb);
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_BCN_OFFLOAD, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_BCN_OFFLOAD,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -1208,12 +1214,12 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev) ...@@ -1208,12 +1214,12 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev)
} }
memset(req.txpower_sku, 0x3f, 49); memset(req.txpower_sku, 0x3f, 49);
ret = mt7615_mcu_msg_send(dev, MCU_EXT_CMD_CHANNEL_SWITCH, ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_CHANNEL_SWITCH,
&req, sizeof(req), true); &req, sizeof(req), true);
if (ret) if (ret)
return ret; return ret;
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_SET_RX_PATH, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_SET_RX_PATH,
&req, sizeof(req), true); &req, sizeof(req), true);
} }
...@@ -1299,7 +1305,7 @@ int mt7615_mcu_set_ht_cap(struct mt7615_dev *dev, struct ieee80211_vif *vif, ...@@ -1299,7 +1305,7 @@ int mt7615_mcu_set_ht_cap(struct mt7615_dev *dev, struct ieee80211_vif *vif,
wtbl_raw->val = cpu_to_le32(val); wtbl_raw->val = cpu_to_le32(val);
wtbl_hdr->tlv_num = cpu_to_le16(ntlv); wtbl_hdr->tlv_num = cpu_to_le16(ntlv);
ret = mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
buf, buf_len, true); buf, buf_len, true);
if (ret) if (ret)
goto out; goto out;
...@@ -1335,7 +1341,7 @@ int mt7615_mcu_set_ht_cap(struct mt7615_dev *dev, struct ieee80211_vif *vif, ...@@ -1335,7 +1341,7 @@ int mt7615_mcu_set_ht_cap(struct mt7615_dev *dev, struct ieee80211_vif *vif,
cpu_to_le16(sta->vht_cap.vht_mcs.tx_mcs_map); cpu_to_le16(sta->vht_cap.vht_mcs.tx_mcs_map);
} }
ret = mt7615_mcu_msg_send(dev, MCU_EXT_CMD_STA_REC_UPDATE, ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_STA_REC_UPDATE,
buf, buf_len, true); buf, buf_len, true);
out: out:
kfree(buf); kfree(buf);
...@@ -1402,12 +1408,12 @@ int mt7615_mcu_set_tx_ba(struct mt7615_dev *dev, ...@@ -1402,12 +1408,12 @@ int mt7615_mcu_set_tx_ba(struct mt7615_dev *dev,
wtbl_req.ba.ba_winsize_idx = idx; wtbl_req.ba.ba_winsize_idx = idx;
} }
ret = mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&wtbl_req, sizeof(wtbl_req), true); &wtbl_req, sizeof(wtbl_req), true);
if (ret) if (ret)
return ret; return ret;
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_STA_REC_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_STA_REC_UPDATE,
&sta_req, sizeof(sta_req), true); &sta_req, sizeof(sta_req), true);
} }
...@@ -1462,12 +1468,12 @@ int mt7615_mcu_set_rx_ba(struct mt7615_dev *dev, ...@@ -1462,12 +1468,12 @@ int mt7615_mcu_set_rx_ba(struct mt7615_dev *dev,
memcpy(wtbl_req.ba.peer_addr, params->sta->addr, ETH_ALEN); memcpy(wtbl_req.ba.peer_addr, params->sta->addr, ETH_ALEN);
ret = mt7615_mcu_msg_send(dev, MCU_EXT_CMD_STA_REC_UPDATE, ret = __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_STA_REC_UPDATE,
&sta_req, sizeof(sta_req), true); &sta_req, sizeof(sta_req), true);
if (ret || !add) if (ret || !add)
return ret; return ret;
return mt7615_mcu_msg_send(dev, MCU_EXT_CMD_WTBL_UPDATE, return __mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_WTBL_UPDATE,
&wtbl_req, sizeof(wtbl_req), true); &wtbl_req, sizeof(wtbl_req), true);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7