Commit 8c94f0e6 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: connac: extend mcu_get_nic_capability 



Extend mcu_get_nic_capability to obtain tx resource for SDIO device,
MAC address, and PHY capability.

Tested-by: default avatarDeren Wu <deren.wu@mediatek.com>
Acked-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent dacf0acf

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

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ struct mt76_sdio { 
		int pse_data_quota;

		int ple_data_quota;

		int pse_mcu_quota;

		int pse_page_size;

		int deficit;

	} sched;

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

+66 −0
Original line number Diff line number Diff line
@@ -1722,6 +1722,61 @@ 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 {
@@ -1764,6 +1819,17 @@ int mt76_connac_mcu_get_nic_capability(struct mt76_phy *phy) 
		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;

		}