Merge tag 'mt76-for-kvalo-2020-03-17' of https://github.com/nbd168/wireless (48346a95) · Commits · 戴 / test

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -9,14 +9,16 @@ struct sk_buff *
		mt76_mcu_msg_alloc(const void *data, int head_len,
		int data_len, int tail_len)
		{
		int length = head_len + data_len + tail_len;
		struct sk_buff *skb;

		skb = alloc_skb(head_len + data_len + tail_len,
		GFP_KERNEL);
		skb = alloc_skb(length, GFP_KERNEL);
		if (!skb)
		return NULL;

		memset(skb->head, 0, length);
		skb_reserve(skb, head_len);

		if (data && data_len)
		skb_put_data(skb, data, data_len);

+4 −1

Original line number	Diff line number	Diff line
		@@ -139,6 +139,8 @@ struct mt76_sw_queue {
		struct mt76_mcu_ops {
		int (mcu_send_msg)(struct mt76_dev dev, int cmd, const void *data,
		int len, bool wait_resp);
		int (mcu_skb_send_msg)(struct mt76_dev dev, struct sk_buff *skb,
		int cmd, bool wait_resp);
		int (mcu_wr_rp)(struct mt76_dev dev, u32 base,
		const struct mt76_reg_pair *rp, int len);
		int (mcu_rd_rp)(struct mt76_dev dev, u32 base,
		@@ -403,7 +405,6 @@ struct mt76_mcu {
		#define MCU_RESP_URB_SIZE 1024
		struct mt76_usb {
		struct mutex usb_ctrl_mtx;
		__le32 reg_val;
		u8 *data;
		u16 data_len;

		@@ -589,7 +590,9 @@ enum mt76_phy_type {
		#define mt76_rd_rp(dev, ...) (dev)->mt76.bus->rd_rp(&((dev)->mt76), __VA_ARGS__)

		#define mt76_mcu_send_msg(dev, ...) (dev)->mt76.mcu_ops->mcu_send_msg(&((dev)->mt76), __VA_ARGS__)

		#define __mt76_mcu_send_msg(dev, ...) (dev)->mcu_ops->mcu_send_msg((dev), __VA_ARGS__)
		#define __mt76_mcu_skb_send_msg(dev, ...) (dev)->mcu_ops->mcu_skb_send_msg((dev), __VA_ARGS__)
		#define mt76_mcu_restart(dev, ...) (dev)->mt76.mcu_ops->mcu_restart(&((dev)->mt76))
		#define __mt76_mcu_restart(dev, ...) (dev)->mcu_ops->mcu_restart((dev))

+4 −0

Original line number	Diff line number	Diff line
		@@ -121,4 +121,8 @@ void mt7603_init_debugfs(struct mt7603_dev *dev)
		mt7603_reset_read);
		debugfs_create_devm_seqfile(dev->mt76.dev, "radio", dir,
		mt7603_radio_read);
		debugfs_create_u8("sensitivity_limit", 0600, dir,
		&dev->sensitivity_limit);
		debugfs_create_bool("dynamic_sensitivity", 0600, dir,
		&dev->dynamic_sensitivity);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -540,6 +540,8 @@ int mt7603_register_device(struct mt7603_dev *dev)
		dev->mphy.antenna_mask = 1;

		dev->slottime = 9;
		dev->sensitivity_limit = 28;
		dev->dynamic_sensitivity = true;

		ret = mt7603_init_hardware(dev);
		if (ret)

+5 −1

Original line number	Diff line number	Diff line
		@@ -1727,6 +1727,9 @@ mt7603_false_cca_check(struct mt7603_dev *dev)
		int min_signal;
		u32 val;

		if (!dev->dynamic_sensitivity)
		return;

		val = mt76_rr(dev, MT_PHYCTRL_STAT_PD);
		pd_cck = FIELD_GET(MT_PHYCTRL_STAT_PD_CCK, val);
		pd_ofdm = FIELD_GET(MT_PHYCTRL_STAT_PD_OFDM, val);
		@@ -1750,7 +1753,8 @@ mt7603_false_cca_check(struct mt7603_dev *dev)
		min_signal -= 15;

		false_cca = dev->false_cca_ofdm + dev->false_cca_cck;
		if (false_cca > 600) {
		if (false_cca > 600 &&
		dev->sensitivity < -100 + dev->sensitivity_limit) {
		if (!dev->sensitivity)
		dev->sensitivity = -92;
		else