Commit 5f606b3e authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2022-09-15' of https://github.com/nbd168/wireless 

mt76 patches for 6.1

- fixes
- suspend/resume improvements
- tx status reporting improvements
parents 2e405cff cb74c8f8

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

+28 −22
Original line number Diff line number Diff line
@@ -252,6 +252,30 @@ struct mt76_queue_ops { 
	void (*reset_q)(struct mt76_dev *dev, struct mt76_queue *q);

};



enum mt76_phy_type {

	MT_PHY_TYPE_CCK,

	MT_PHY_TYPE_OFDM,

	MT_PHY_TYPE_HT,

	MT_PHY_TYPE_HT_GF,

	MT_PHY_TYPE_VHT,

	MT_PHY_TYPE_HE_SU = 8,

	MT_PHY_TYPE_HE_EXT_SU,

	MT_PHY_TYPE_HE_TB,

	MT_PHY_TYPE_HE_MU,

	__MT_PHY_TYPE_HE_MAX,

};



struct mt76_sta_stats {

	u64 tx_mode[__MT_PHY_TYPE_HE_MAX];

	u64 tx_bw[4];		/* 20, 40, 80, 160 */

	u64 tx_nss[4];		/* 1, 2, 3, 4 */

	u64 tx_mcs[16];		/* mcs idx */

	u64 tx_bytes;

	u32 tx_packets;

	u32 tx_retries;

	u32 tx_failed;

};



enum mt76_wcid_flags {

	MT_WCID_FLAG_CHECK_PS,

	MT_WCID_FLAG_PS,
@@ -299,6 +323,8 @@ struct mt76_wcid { 


	struct list_head list;

	struct idr pktid;



	struct mt76_sta_stats stats;

};



struct mt76_txq {
@@ -342,7 +368,8 @@ struct mt76_rx_tid { 
#define MT_PACKET_ID_MASK		GENMASK(6, 0)

#define MT_PACKET_ID_NO_ACK		0

#define MT_PACKET_ID_NO_SKB		1

#define MT_PACKET_ID_FIRST		2

#define MT_PACKET_ID_WED		2

#define MT_PACKET_ID_FIRST		3

#define MT_PACKET_ID_HAS_RATE		BIT(7)

/* This is timer for when to give up when waiting for TXS callback,

 * with starting time being the time at which the DMA_DONE callback
@@ -527,7 +554,6 @@ struct mt76_usb { 
		struct mt76_reg_pair *rp;

		int rp_len;

		u32 base;

		bool burst;

	} mcu;

};
@@ -815,26 +841,6 @@ struct mt76_power_limits { 
	s8 ru[7][12];

};



enum mt76_phy_type {

	MT_PHY_TYPE_CCK,

	MT_PHY_TYPE_OFDM,

	MT_PHY_TYPE_HT,

	MT_PHY_TYPE_HT_GF,

	MT_PHY_TYPE_VHT,

	MT_PHY_TYPE_HE_SU = 8,

	MT_PHY_TYPE_HE_EXT_SU,

	MT_PHY_TYPE_HE_TB,

	MT_PHY_TYPE_HE_MU,

	__MT_PHY_TYPE_HE_MAX,

};



struct mt76_sta_stats {

	u64 tx_mode[__MT_PHY_TYPE_HE_MAX];

	u64 tx_bw[4];		/* 20, 40, 80, 160 */

	u64 tx_nss[4];		/* 1, 2, 3, 4 */

	u64 tx_mcs[16];		/* mcs idx */

};



struct mt76_ethtool_worker_info {

	u64 *data;

	int idx;

drivers/net/wireless/mediatek/mt76/mt7615/main.c

+4 −0
Original line number Diff line number Diff line
@@ -1195,12 +1195,16 @@ static void mt7615_sta_set_decap_offload(struct ieee80211_hw *hw, 
	struct mt7615_dev *dev = mt7615_hw_dev(hw);

	struct mt7615_sta *msta = (struct mt7615_sta *)sta->drv_priv;



	mt7615_mutex_acquire(dev);



	if (enabled)

		set_bit(MT_WCID_FLAG_HDR_TRANS, &msta->wcid.flags);

	else

		clear_bit(MT_WCID_FLAG_HDR_TRANS, &msta->wcid.flags);



	mt7615_mcu_set_sta_decap_offload(dev, vif, sta);



	mt7615_mutex_release(dev);

}



#ifdef CONFIG_PM

drivers/net/wireless/mediatek/mt76/mt7615/sdio.c

+4 −12
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static int mt7663s_probe(struct sdio_func *func, 
		.tx_complete_skb = mt7663_usb_sdio_tx_complete_skb,

		.tx_status_data = mt7663_usb_sdio_tx_status_data,

		.rx_skb = mt7615_queue_rx_skb,

		.rx_check = mt7615_rx_check,

		.sta_ps = mt7615_sta_ps,

		.sta_add = mt7615_mac_sta_add,

		.sta_remove = mt7615_mac_sta_remove,
@@ -180,7 +181,6 @@ static void mt7663s_remove(struct sdio_func *func) 
	mt76_free_device(&dev->mt76);

}



#ifdef CONFIG_PM

static int mt7663s_suspend(struct device *dev)

{

	struct sdio_func *func = dev_to_sdio_func(dev);
@@ -235,28 +235,20 @@ static int mt7663s_resume(struct device *dev) 
	return err;

}



static const struct dev_pm_ops mt7663s_pm_ops = {

	.suspend = mt7663s_suspend,

	.resume = mt7663s_resume,

};

#endif



MODULE_DEVICE_TABLE(sdio, mt7663s_table);

MODULE_FIRMWARE(MT7663_OFFLOAD_FIRMWARE_N9);

MODULE_FIRMWARE(MT7663_OFFLOAD_ROM_PATCH);

MODULE_FIRMWARE(MT7663_FIRMWARE_N9);

MODULE_FIRMWARE(MT7663_ROM_PATCH);



static DEFINE_SIMPLE_DEV_PM_OPS(mt7663s_pm_ops, mt7663s_suspend, mt7663s_resume);



static struct sdio_driver mt7663s_driver = {

	.name		= KBUILD_MODNAME,

	.probe		= mt7663s_probe,

	.remove		= mt7663s_remove,

	.id_table	= mt7663s_table,

#ifdef CONFIG_PM

	.drv = {

		.pm = &mt7663s_pm_ops,

	}

#endif

	.drv.pm		= pm_sleep_ptr(&mt7663s_pm_ops),

};

module_sdio_driver(mt7663s_driver);

drivers/net/wireless/mediatek/mt76/mt7615/usb.c

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ static int mt7663u_probe(struct usb_interface *usb_intf, 
		.tx_complete_skb = mt7663_usb_sdio_tx_complete_skb,

		.tx_status_data = mt7663_usb_sdio_tx_status_data,

		.rx_skb = mt7615_queue_rx_skb,

		.rx_check = mt7615_rx_check,

		.sta_ps = mt7615_sta_ps,

		.sta_add = mt7615_mac_sta_add,

		.sta_remove = mt7615_mac_sta_remove,

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

+9 −2
Original line number Diff line number Diff line
@@ -63,6 +63,12 @@ enum { 
	REPEATER_BSSID_MAX = 0x3f,

};



struct mt76_connac_reg_map {

	u32 phys;

	u32 maps;

	u32 size;

};



struct mt76_connac_pm {

	bool enable:1;

	bool enable_user:1;
@@ -348,9 +354,10 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
				 struct sk_buff *skb, struct mt76_wcid *wcid,

				 struct ieee80211_key_conf *key, int pid,

				 enum mt76_txq_id qid, u32 changed);

bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,

			       __le32 *txs_data);

bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,

				  int pid, __le32 *txs_data,

				  struct mt76_sta_stats *stats);

				  int pid, __le32 *txs_data);

void mt76_connac2_mac_decode_he_radiotap(struct mt76_dev *dev,

					 struct sk_buff *skb,

					 __le32 *rxv, u32 mode);