Commit dab35009 authored by Deren Wu's avatar Deren Wu Committed by Felix Fietkau
Browse files

wifi: mt76: mt7921: move connac nic capability handling to mt7921 



mt76_connac_mcu_get_nic_capability() is used by mt7921 only. It
would be better to put the code in chip folder. And we can provide
more chip capability information in mt792x_phy without making
mt76_phy much bigger.

The three functions would be moved to mt7921 folder and renamed.
mt76_connac_mcu_parse_tx_resource()
mt76_connac_mcu_parse_phy_cap()
mt76_connac_mcu_get_nic_capability()

Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent ef444ad0

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+0 −120
Original line number Diff line number Diff line
@@ -1941,126 +1941,6 @@ void mt76_connac_mcu_coredump_event(struct mt76_dev *dev, struct sk_buff *skb, 
}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_coredump_event);



static void mt76_connac_mcu_parse_tx_resource(struct mt76_dev *dev,

					      struct sk_buff *skb)

{

	struct mt76_sdio *sdio = &dev->sdio;

	struct mt76_connac_tx_resource {

		__le32 version;

		__le32 pse_data_quota;

		__le32 pse_mcu_quota;

		__le32 ple_data_quota;

		__le32 ple_mcu_quota;

		__le16 pse_page_size;

		__le16 ple_page_size;

		u8 pp_padding;

		u8 pad[3];

	} __packed * tx_res;



	tx_res = (struct mt76_connac_tx_resource *)skb->data;

	sdio->sched.pse_data_quota = le32_to_cpu(tx_res->pse_data_quota);

	sdio->sched.pse_mcu_quota = le32_to_cpu(tx_res->pse_mcu_quota);

	sdio->sched.ple_data_quota = le32_to_cpu(tx_res->ple_data_quota);

	sdio->sched.pse_page_size = le16_to_cpu(tx_res->pse_page_size);

	sdio->sched.deficit = tx_res->pp_padding;

}



static void mt76_connac_mcu_parse_phy_cap(struct mt76_dev *dev,

					  struct sk_buff *skb)

{

	struct mt76_connac_phy_cap {

		u8 ht;

		u8 vht;

		u8 _5g;

		u8 max_bw;

		u8 nss;

		u8 dbdc;

		u8 tx_ldpc;

		u8 rx_ldpc;

		u8 tx_stbc;

		u8 rx_stbc;

		u8 hw_path;

		u8 he;

	} __packed * cap;



	enum {

		WF0_24G,

		WF0_5G

	};



	cap = (struct mt76_connac_phy_cap *)skb->data;



	dev->phy.antenna_mask = BIT(cap->nss) - 1;

	dev->phy.chainmask = dev->phy.antenna_mask;

	dev->phy.cap.has_2ghz = cap->hw_path & BIT(WF0_24G);

	dev->phy.cap.has_5ghz = cap->hw_path & BIT(WF0_5G);

}



int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy)

{

	struct mt76_connac_cap_hdr {

		__le16 n_element;

		u8 rsv[2];

	} __packed * hdr;

	struct sk_buff *skb;

	int ret, i;



	ret = mt76_mcu_send_and_get_msg(phy->dev, MCU_CE_CMD(GET_NIC_CAPAB),

					NULL, 0, true, &skb);

	if (ret)

		return ret;



	hdr = (struct mt76_connac_cap_hdr *)skb->data;

	if (skb->len < sizeof(*hdr)) {

		ret = -EINVAL;

		goto out;

	}



	skb_pull(skb, sizeof(*hdr));



	for (i = 0; i < le16_to_cpu(hdr->n_element); i++) {

		struct tlv_hdr {

			__le32 type;

			__le32 len;

		} __packed * tlv = (struct tlv_hdr *)skb->data;

		int len;



		if (skb->len < sizeof(*tlv))

			break;



		skb_pull(skb, sizeof(*tlv));



		len = le32_to_cpu(tlv->len);

		if (skb->len < len)

			break;



		switch (le32_to_cpu(tlv->type)) {

		case MT_NIC_CAP_6G:

			phy->cap.has_6ghz = skb->data[0];

			break;

		case MT_NIC_CAP_MAC_ADDR:

			memcpy(phy->macaddr, (void *)skb->data, ETH_ALEN);

			break;

		case MT_NIC_CAP_PHY:

			mt76_connac_mcu_parse_phy_cap(phy->dev, skb);

			break;

		case MT_NIC_CAP_TX_RESOURCE:

			if (mt76_is_sdio(phy->dev))

				mt76_connac_mcu_parse_tx_resource(phy->dev,

								  skb);

			break;

		default:

			break;

		}

		skb_pull(skb, len);

	}

out:

	dev_kfree_skb(skb);



	return ret;

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_get_nic_capability);



static void

mt76_connac_mcu_build_sku(struct mt76_dev *dev, s8 *sku,

			  struct mt76_power_limits *limits,

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

+0 −1
Original line number Diff line number Diff line
@@ -1896,7 +1896,6 @@ int mt76_connac_mcu_init_download(struct mt76_dev *dev, u32 addr, u32 len, 
int mt76_connac_mcu_start_patch(struct mt76_dev *dev);

int mt76_connac_mcu_patch_sem_ctrl(struct mt76_dev *dev, bool get);

int mt76_connac_mcu_start_firmware(struct mt76_dev *dev, u32 addr, u32 option);

int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy);



int mt76_connac_mcu_hw_scan(struct mt76_phy *phy, struct ieee80211_vif *vif,

			    struct ieee80211_scan_request *scan_req);

drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

+121 −1
Original line number Diff line number Diff line
@@ -448,6 +448,126 @@ static int mt7921_load_clc(struct mt792x_dev *dev, const char *fw_name) 
	return ret;

}



static void mt7921_mcu_parse_tx_resource(struct mt76_dev *dev,

					 struct sk_buff *skb)

{

	struct mt76_sdio *sdio = &dev->sdio;

	struct mt7921_tx_resource {

		__le32 version;

		__le32 pse_data_quota;

		__le32 pse_mcu_quota;

		__le32 ple_data_quota;

		__le32 ple_mcu_quota;

		__le16 pse_page_size;

		__le16 ple_page_size;

		u8 pp_padding;

		u8 pad[3];

	} __packed * tx_res;



	tx_res = (struct mt7921_tx_resource *)skb->data;

	sdio->sched.pse_data_quota = le32_to_cpu(tx_res->pse_data_quota);

	sdio->sched.pse_mcu_quota = le32_to_cpu(tx_res->pse_mcu_quota);

	sdio->sched.ple_data_quota = le32_to_cpu(tx_res->ple_data_quota);

	sdio->sched.pse_page_size = le16_to_cpu(tx_res->pse_page_size);

	sdio->sched.deficit = tx_res->pp_padding;

}



static void mt7921_mcu_parse_phy_cap(struct mt76_dev *dev,

				     struct sk_buff *skb)

{

	struct mt7921_phy_cap {

		u8 ht;

		u8 vht;

		u8 _5g;

		u8 max_bw;

		u8 nss;

		u8 dbdc;

		u8 tx_ldpc;

		u8 rx_ldpc;

		u8 tx_stbc;

		u8 rx_stbc;

		u8 hw_path;

		u8 he;

	} __packed * cap;



	enum {

		WF0_24G,

		WF0_5G

	};



	cap = (struct mt7921_phy_cap *)skb->data;



	dev->phy.antenna_mask = BIT(cap->nss) - 1;

	dev->phy.chainmask = dev->phy.antenna_mask;

	dev->phy.cap.has_2ghz = cap->hw_path & BIT(WF0_24G);

	dev->phy.cap.has_5ghz = cap->hw_path & BIT(WF0_5G);

}



static int mt7921_mcu_get_nic_capability(struct mt792x_phy *mphy)

{

	struct mt76_connac_cap_hdr {

		__le16 n_element;

		u8 rsv[2];

	} __packed * hdr;

	struct sk_buff *skb;

	struct mt76_phy *phy = mphy->mt76;

	int ret, i;



	ret = mt76_mcu_send_and_get_msg(phy->dev, MCU_CE_CMD(GET_NIC_CAPAB),

					NULL, 0, true, &skb);

	if (ret)

		return ret;



	hdr = (struct mt76_connac_cap_hdr *)skb->data;

	if (skb->len < sizeof(*hdr)) {

		ret = -EINVAL;

		goto out;

	}



	skb_pull(skb, sizeof(*hdr));



	for (i = 0; i < le16_to_cpu(hdr->n_element); i++) {

		struct tlv_hdr {

			__le32 type;

			__le32 len;

		} __packed * tlv = (struct tlv_hdr *)skb->data;

		int len;



		if (skb->len < sizeof(*tlv))

			break;



		skb_pull(skb, sizeof(*tlv));



		len = le32_to_cpu(tlv->len);

		if (skb->len < len)

			break;



		switch (le32_to_cpu(tlv->type)) {

		case MT_NIC_CAP_6G:

			phy->cap.has_6ghz = skb->data[0];

			break;

		case MT_NIC_CAP_MAC_ADDR:

			memcpy(phy->macaddr, (void *)skb->data, ETH_ALEN);

			break;

		case MT_NIC_CAP_PHY:

			mt7921_mcu_parse_phy_cap(phy->dev, skb);

			break;

		case MT_NIC_CAP_TX_RESOURCE:

			if (mt76_is_sdio(phy->dev))

				mt7921_mcu_parse_tx_resource(phy->dev,

							     skb);

			break;

		default:

			break;

		}

		skb_pull(skb, len);

	}

out:

	dev_kfree_skb(skb);



	return ret;

}



int mt7921_mcu_fw_log_2_host(struct mt792x_dev *dev, u8 ctrl)

{

	struct {
@@ -469,7 +589,7 @@ int mt7921_run_firmware(struct mt792x_dev *dev) 
	if (err)

		return err;



	err = mt76_connac_mcu_get_nic_capability(&dev->mphy);

	err = mt7921_mcu_get_nic_capability(&dev->phy);

	if (err)

		return err;