Commit a427aca0 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'mt76-for-kvalo-2021-10-23' of https://github.com/nbd168/wireless 

mt76 patches for 5.16

* fix a compile error with !CONFIG_PM
* cleanups
* MT7915 DBDC fixes
* endian warning fixes
parents d3c6daa1 52a99a13

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

+4 −1
Original line number Diff line number Diff line
@@ -65,8 +65,11 @@ int mt76_get_of_eeprom(struct mt76_dev *dev, void *eep, int offset, int len) 
	offset = be32_to_cpup(list);

	ret = mtd_read(mtd, offset, len, &retlen, eep);

	put_mtd_device(mtd);

	if (ret)

	if (ret) {

		dev_err(dev->dev, "reading EEPROM from mtd %s failed: %i\n",

			part, ret);

		goto out_put_node;

	}



	if (retlen < len) {

		ret = -EINVAL;

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

+20 −2
Original line number Diff line number Diff line
@@ -1698,6 +1698,19 @@ int mt7615_mcu_fw_log_2_host(struct mt7615_dev *dev, u8 ctrl) 
				 sizeof(data), true);

}



static int mt7615_mcu_cal_cache_apply(struct mt7615_dev *dev)

{

	struct {

		bool cache_enable;

		u8 pad[3];

	} data = {

		.cache_enable = true

	};



	return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_CAL_CACHE, &data,

				 sizeof(data), false);

}



static int mt7663_load_n9(struct mt7615_dev *dev, const char *name)

{

	u32 offset = 0, override_addr = 0, flag = FW_START_DLYCAL;
@@ -1906,9 +1919,14 @@ int mt7615_mcu_init(struct mt7615_dev *dev) 
	mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[MT_MCUQ_FWDL], false);

	dev_dbg(dev->mt76.dev, "Firmware init done\n");

	set_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state);

	mt7615_mcu_fw_log_2_host(dev, 0);



	return 0;

	if (dev->dbdc_support) {

		ret = mt7615_mcu_cal_cache_apply(dev);

		if (ret)

			return ret;

	}



	return mt7615_mcu_fw_log_2_host(dev, 0);

}

EXPORT_SYMBOL_GPL(mt7615_mcu_init);

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

+1 −1
Original line number Diff line number Diff line
@@ -2477,6 +2477,7 @@ void mt76_connac_mcu_set_suspend_iter(void *priv, u8 *mac, 
	mt76_connac_mcu_set_wow_ctrl(phy, vif, suspend, wowlan);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_suspend_iter);

#endif /* CONFIG_PM */



u32 mt76_connac_mcu_reg_rr(struct mt76_dev *dev, u32 offset)

{
@@ -2505,7 +2506,6 @@ void mt76_connac_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val) 
	mt76_mcu_send_msg(dev, MCU_CMD_REG_WRITE, &req, sizeof(req), false);

}

EXPORT_SYMBOL_GPL(mt76_connac_mcu_reg_wr);

#endif /* CONFIG_PM */



MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");

MODULE_LICENSE("Dual BSD/GPL");

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

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ enum { 
	MCU_EXT_CMD_TX_POWER_FEATURE_CTRL = 0x58,

	MCU_EXT_CMD_RXDCOC_CAL = 0x59,

	MCU_EXT_CMD_TXDPD_CAL = 0x60,

	MCU_EXT_CMD_CAL_CACHE = 0x67,

	MCU_EXT_CMD_SET_RDD_TH = 0x7c,

	MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d,

};

drivers/net/wireless/mediatek/mt76/mt7915/debugfs.c

+149 −18
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(fops_radar_trigger, NULL, 
			 mt7915_radar_trigger, "%lld\n");



static int

mt7915_fw_debug_set(void *data, u64 val)

mt7915_fw_debug_wm_set(void *data, u64 val)

{

	struct mt7915_dev *dev = data;

	enum {
@@ -92,29 +92,103 @@ mt7915_fw_debug_set(void *data, u64 val) 
		DEBUG_SPL,

		DEBUG_RPT_RX,

	} debug;

	int ret;



	dev->fw_debug = !!val;

	dev->fw_debug_wm = val ? MCU_FW_LOG_TO_HOST : 0;



	mt7915_mcu_fw_log_2_host(dev, dev->fw_debug ? 2 : 0);

	ret = mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WM, dev->fw_debug_wm);

	if (ret)

		return ret;



	for (debug = DEBUG_TXCMD; debug <= DEBUG_RPT_RX; debug++) {

		ret = mt7915_mcu_fw_dbg_ctrl(dev, debug, !!dev->fw_debug_wm);

		if (ret)

			return ret;

	}



	/* WM CPU info record control */

	mt76_clear(dev, MT_CPU_UTIL_CTRL, BIT(0));

	mt76_wr(dev, MT_DIC_CMD_REG_CMD, BIT(2) | BIT(13) | !dev->fw_debug_wm);

	mt76_wr(dev, MT_MCU_WM_CIRQ_IRQ_MASK_CLR_ADDR, BIT(5));

	mt76_wr(dev, MT_MCU_WM_CIRQ_IRQ_SOFT_ADDR, BIT(5));



	return 0;

}



static int

mt7915_fw_debug_wm_get(void *data, u64 *val)

{

	struct mt7915_dev *dev = data;



	for (debug = DEBUG_TXCMD; debug <= DEBUG_RPT_RX; debug++)

		mt7915_mcu_fw_dbg_ctrl(dev, debug, dev->fw_debug);

	*val = dev->fw_debug_wm;



	return 0;

}



DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug_wm, mt7915_fw_debug_wm_get,

			 mt7915_fw_debug_wm_set, "%lld\n");



static int

mt7915_fw_debug_get(void *data, u64 *val)

mt7915_fw_debug_wa_set(void *data, u64 val)

{

	struct mt7915_dev *dev = data;

	int ret;



	dev->fw_debug_wa = val ? MCU_FW_LOG_TO_HOST : 0;



	ret = mt7915_mcu_fw_log_2_host(dev, MCU_FW_LOG_WA, dev->fw_debug_wa);

	if (ret)

		return ret;



	return mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(SET), MCU_WA_PARAM_PDMA_RX,

				 !!dev->fw_debug_wa, 0);

}



static int

mt7915_fw_debug_wa_get(void *data, u64 *val)

{

	struct mt7915_dev *dev = data;



	*val = dev->fw_debug_wa;



	*val = dev->fw_debug;

	return 0;

}



DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug_wa, mt7915_fw_debug_wa_get,

			 mt7915_fw_debug_wa_set, "%lld\n");



static int

mt7915_fw_util_wm_show(struct seq_file *file, void *data)

{

	struct mt7915_dev *dev = file->private;



	if (dev->fw_debug_wm) {

		seq_printf(file, "Busy: %u%%  Peak busy: %u%%\n",

			   mt76_rr(dev, MT_CPU_UTIL_BUSY_PCT),

			   mt76_rr(dev, MT_CPU_UTIL_PEAK_BUSY_PCT));

		seq_printf(file, "Idle count: %u  Peak idle count: %u\n",

			   mt76_rr(dev, MT_CPU_UTIL_IDLE_CNT),

			   mt76_rr(dev, MT_CPU_UTIL_PEAK_IDLE_CNT));

	}



	return 0;

}



DEFINE_SHOW_ATTRIBUTE(mt7915_fw_util_wm);



static int

mt7915_fw_util_wa_show(struct seq_file *file, void *data)

{

	struct mt7915_dev *dev = file->private;



	if (dev->fw_debug_wa)

		return mt7915_mcu_wa_cmd(dev, MCU_WA_PARAM_CMD(QUERY),

					 MCU_WA_PARAM_CPU_UTIL, 0, 0);



	return 0;

}



DEFINE_DEBUGFS_ATTRIBUTE(fops_fw_debug, mt7915_fw_debug_get,

			 mt7915_fw_debug_set, "%lld\n");

DEFINE_SHOW_ATTRIBUTE(mt7915_fw_util_wa);



static void

mt7915_ampdu_stat_read_phy(struct mt7915_phy *phy,
@@ -460,7 +534,12 @@ int mt7915_init_debugfs(struct mt7915_phy *phy) 
	debugfs_create_file("xmit-queues", 0400, dir, phy,

			    &mt7915_xmit_queues_fops);

	debugfs_create_file("tx_stats", 0400, dir, phy, &mt7915_tx_stats_fops);

	debugfs_create_file("fw_debug", 0600, dir, dev, &fops_fw_debug);

	debugfs_create_file("fw_debug_wm", 0600, dir, dev, &fops_fw_debug_wm);

	debugfs_create_file("fw_debug_wa", 0600, dir, dev, &fops_fw_debug_wa);

	debugfs_create_file("fw_util_wm", 0400, dir, dev,

			    &mt7915_fw_util_wm_fops);

	debugfs_create_file("fw_util_wa", 0400, dir, dev,

			    &mt7915_fw_util_wa_fops);

	debugfs_create_file("implicit_txbf", 0600, dir, dev,

			    &fops_implicit_txbf);

	debugfs_create_file("txpower_sku", 0400, dir, phy,
@@ -481,19 +560,71 @@ int mt7915_init_debugfs(struct mt7915_phy *phy) 
#ifdef CONFIG_MAC80211_DEBUGFS

/** per-station debugfs **/



static int mt7915_sta_fixed_rate_set(void *data, u64 rate)

static ssize_t mt7915_sta_fixed_rate_set(struct file *file,

					 const char __user *user_buf,

					 size_t count, loff_t *ppos)

{

	struct ieee80211_sta *sta = data;

	struct ieee80211_sta *sta = file->private_data;

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

	struct mt7915_dev *dev = msta->vif->phy->dev;

	struct ieee80211_vif *vif;

	struct sta_phy phy = {};

	char buf[100];

	int ret;

	u32 field;

	u8 i, gi, he_ltf;



	if (count >= sizeof(buf))

		return -EINVAL;



	/* usage: <he ltf> <tx mode> <ldpc> <stbc> <bw> <gi> <nss> <mcs>

	 * <tx mode>: see enum mt76_phy_type

	if (copy_from_user(buf, user_buf, count))

		return -EFAULT;



	if (count && buf[count - 1] == '\n')

		buf[count - 1] = '\0';

	else

		buf[count] = '\0';



	/* mode - cck: 0, ofdm: 1, ht: 2, gf: 3, vht: 4, he_su: 8, he_er: 9

	 * bw - bw20: 0, bw40: 1, bw80: 2, bw160: 3

	 * nss - vht: 1~4, he: 1~4, others: ignore

	 * mcs - cck: 0~4, ofdm: 0~7, ht: 0~32, vht: 0~9, he_su: 0~11, he_er: 0~2

	 * gi - (ht/vht) lgi: 0, sgi: 1; (he) 0.8us: 0, 1.6us: 1, 3.2us: 2

	 * ldpc - off: 0, on: 1

	 * stbc - off: 0, on: 1

	 * he_ltf - 1xltf: 0, 2xltf: 1, 4xltf: 2

	 */

	return mt7915_mcu_set_fixed_rate(msta->vif->phy->dev, sta, rate);

	if (sscanf(buf, "%hhu %hhu %hhu %hhu %hhu %hhu %hhu %hhu",

		   &phy.type, &phy.bw, &phy.nss, &phy.mcs, &gi,

		   &phy.ldpc, &phy.stbc, &he_ltf) != 8) {

		dev_warn(dev->mt76.dev,

			 "format: Mode BW NSS MCS (HE)GI LDPC STBC HE_LTF\n");

		field = RATE_PARAM_AUTO;

		goto out;

	}



DEFINE_DEBUGFS_ATTRIBUTE(fops_fixed_rate, NULL,

			 mt7915_sta_fixed_rate_set, "%llx\n");

	phy.ldpc = (phy.bw || phy.ldpc) * GENMASK(2, 0);

	for (i = 0; i <= phy.bw; i++) {

		phy.sgi |= gi << (i << sta->he_cap.has_he);

		phy.he_ltf |= he_ltf << (i << sta->he_cap.has_he);

	}

	field = RATE_PARAM_FIXED;



out:

	vif = container_of((void *)msta->vif, struct ieee80211_vif, drv_priv);

	ret = mt7915_mcu_set_fixed_rate_ctrl(dev, vif, sta, &phy, field);

	if (ret)

		return -EFAULT;



	return count;

}



static const struct file_operations fops_fixed_rate = {

	.write = mt7915_sta_fixed_rate_set,

	.open = simple_open,

	.owner = THIS_MODULE,

	.llseek = default_llseek,

};



static int

mt7915_queues_show(struct seq_file *s, void *data)