Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17507157 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: usb: use common helpers for mcu_alloc_msg()/mcu_send_msg() 



Use mcu common helpers instead of usb specific routines.
Add static qualifier to the following functions:
- mt76u_mcu_msg_alloc
- __mt76u_mcu_send_msg
- mt76u_mcu_send_msg
- mt76u_mcu_wr_rp
- mt76u_mcu_rd_rp
- mt76u_wr_rp
- mt76u_rd_rp
This is a preliminary patch to move mt76x02 usb mcu code in
mt76x02-usb module

Acked-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 6da5a291

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

+0 −13
Original line number Diff line number Diff line
@@ -655,19 +655,6 @@ int mt76u_skb_dma_info(struct sk_buff *skb, int port, u32 flags); 
int mt76u_mcu_fw_send_data(struct mt76_dev *dev, const void *data,

			   int data_len, u32 max_payload, u32 offset);

void mt76u_mcu_complete_urb(struct urb *urb);

struct sk_buff *mt76u_mcu_msg_alloc(const void *data, int len);

int __mt76u_mcu_send_msg(struct mt76_dev *dev, struct sk_buff *skb,

			 int cmd, bool wait_resp);

int mt76u_mcu_send_msg(struct mt76_dev *dev, struct sk_buff *skb,

		       int cmd, bool wait_resp);

int mt76u_mcu_wr_rp(struct mt76_dev *dev, u32 base,

		    const struct mt76_reg_pair *data, int n);

int mt76u_mcu_rd_rp(struct mt76_dev *dev, u32 base,

		    struct mt76_reg_pair *data, int n);

int mt76u_wr_rp(struct mt76_dev *dev, u32 base,

		const struct mt76_reg_pair *data, int n);

int mt76u_rd_rp(struct mt76_dev *dev, u32 base,

		struct mt76_reg_pair *data, int n);

void mt76u_mcu_fw_reset(struct mt76_dev *dev);

int mt76u_mcu_init_rx(struct mt76_dev *dev);

void mt76u_mcu_deinit(struct mt76_dev *dev);

drivers/net/wireless/mediatek/mt76/mt76x0/init.c

+3 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static void mt76x0_init_usb_dma(struct mt76x0_dev *dev) 
}



#define RANDOM_WRITE(dev, tab)			\

	mt76u_wr_rp(&(dev)->mt76, MT_MCU_MEMMAP_WLAN,	\

	mt76_wr_rp(dev, MT_MCU_MEMMAP_WLAN,	\

		   tab, ARRAY_SIZE(tab))



static int mt76x0_init_bbp(struct mt76x0_dev *dev)

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

+5 −8
Original line number Diff line number Diff line
@@ -52,11 +52,10 @@ int mt76x0_mcu_function_select(struct mt76x0_dev *dev, 
		.value = cpu_to_le32(val),

	};



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_FUN_SET_OP,

				  func == 5);

	return mt76_mcu_send_msg(dev, skb, CMD_FUN_SET_OP, func == 5);

}



int
@@ -71,11 +70,10 @@ mt76x0_mcu_calibrate(struct mt76x0_dev *dev, enum mcu_calibrate cal, u32 val) 
		.value = cpu_to_le32(val),

	};



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_CALIBRATION_OP,

				  true);

	return mt76_mcu_send_msg(dev, skb, CMD_CALIBRATION_OP, true);

}



int mt76x0_burst_write_regs(struct mt76x0_dev *dev, u32 offset,
@@ -99,8 +97,7 @@ int mt76x0_burst_write_regs(struct mt76x0_dev *dev, u32 offset, 
	for (i = 0; i < cnt; i++)

		skb_put_le32(skb, data[i]);



	ret = mt76u_mcu_send_msg(&dev->mt76, skb, CMD_BURST_WRITE,

				 cnt == n);

	ret = mt76_mcu_send_msg(dev, skb, CMD_BURST_WRITE, cnt == n);

	if (ret)

		return ret;

drivers/net/wireless/mediatek/mt76/mt76x0/phy.c

+5 −5
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ rf_wr(struct mt76x0_dev *dev, u32 offset, u8 val) 
			.value = val,

		};



		return mt76u_wr_rp(&dev->mt76, MT_MCU_MEMMAP_RF, &pair, 1);

		return mt76_wr_rp(dev, MT_MCU_MEMMAP_RF, &pair, 1);

	} else {

		WARN_ON_ONCE(1);

		return mt76x0_rf_csr_wr(dev, offset, val);
@@ -135,7 +135,7 @@ rf_rr(struct mt76x0_dev *dev, u32 offset) 
			.reg = offset,

		};



		ret = mt76u_rd_rp(&dev->mt76, MT_MCU_MEMMAP_RF, &pair, 1);

		ret = mt76_rd_rp(dev, MT_MCU_MEMMAP_RF, &pair, 1);

		val = pair.value;

	} else {

		WARN_ON_ONCE(1);
@@ -176,7 +176,7 @@ rf_clear(struct mt76x0_dev *dev, u32 offset, u8 mask) 
#endif



#define RF_RANDOM_WRITE(dev, tab)		\

	mt76u_wr_rp(&(dev)->mt76, MT_MCU_MEMMAP_RF,	\

	mt76_wr_rp(dev, MT_MCU_MEMMAP_RF,	\

		   tab, ARRAY_SIZE(tab))



int mt76x0_wait_bbp_ready(struct mt76x0_dev *dev)

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

+20 −20
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ mt76x2u_mcu_function_select(struct mt76x2_dev *dev, enum mcu_function func, 
	};

	struct sk_buff *skb;



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_FUN_SET_OP,

	return mt76_mcu_send_msg(dev, skb, CMD_FUN_SET_OP,

				 func != Q_SELECT);

}
@@ -59,10 +59,10 @@ int mt76x2u_mcu_set_radio_state(struct mt76x2_dev *dev, bool val) 
	};

	struct sk_buff *skb;



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_POWER_SAVING_OP,

	return mt76_mcu_send_msg(dev, skb, CMD_POWER_SAVING_OP,

				 false);

}
@@ -89,10 +89,10 @@ int mt76x2u_mcu_load_cr(struct mt76x2_dev *dev, u8 type, u8 temp_level, 
	msg.cfg = cpu_to_le32(val);



	/* first set the channel without the extension channel info */

	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_LOAD_CR, true);

	return mt76_mcu_send_msg(dev, skb, CMD_LOAD_CR, true);

}



int mt76x2u_mcu_set_channel(struct mt76x2_dev *dev, u8 channel, u8 bw,
@@ -117,20 +117,20 @@ int mt76x2u_mcu_set_channel(struct mt76x2_dev *dev, u8 channel, u8 bw, 
	struct sk_buff *skb;



	/* first set the channel without the extension channel info */

	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;



	mt76u_mcu_send_msg(&dev->mt76, skb, CMD_SWITCH_CHANNEL_OP, true);

	mt76_mcu_send_msg(dev, skb, CMD_SWITCH_CHANNEL_OP, true);



	usleep_range(5000, 10000);



	msg.ext_chan = 0xe0 + bw_index;

	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;



	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_SWITCH_CHANNEL_OP, true);

	return mt76_mcu_send_msg(dev, skb, CMD_SWITCH_CHANNEL_OP, true);

}



int mt76x2u_mcu_calibrate(struct mt76x2_dev *dev, enum mcu_calibration type,
@@ -145,10 +145,10 @@ int mt76x2u_mcu_calibrate(struct mt76x2_dev *dev, enum mcu_calibration type, 
	};

	struct sk_buff *skb;



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_CALIBRATION_OP, true);

	return mt76_mcu_send_msg(dev, skb, CMD_CALIBRATION_OP, true);

}



int mt76x2u_mcu_init_gain(struct mt76x2_dev *dev, u8 channel, u32 gain,
@@ -166,10 +166,10 @@ int mt76x2u_mcu_init_gain(struct mt76x2_dev *dev, u8 channel, u32 gain, 
	if (force)

		msg.channel |= cpu_to_le32(BIT(31));



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_INIT_GAIN_OP, true);

	return mt76_mcu_send_msg(dev, skb, CMD_INIT_GAIN_OP, true);

}



int mt76x2u_mcu_set_dynamic_vga(struct mt76x2_dev *dev, u8 channel, bool ap,
@@ -192,10 +192,10 @@ int mt76x2u_mcu_set_dynamic_vga(struct mt76x2_dev *dev, u8 channel, bool ap, 
		val |= BIT(30);

	msg.channel = cpu_to_le32(val);



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_DYNC_VGA_OP, true);

	return mt76_mcu_send_msg(dev, skb, CMD_DYNC_VGA_OP, true);

}



int mt76x2u_mcu_tssi_comp(struct mt76x2_dev *dev,
@@ -210,10 +210,10 @@ int mt76x2u_mcu_tssi_comp(struct mt76x2_dev *dev, 
	};

	struct sk_buff *skb;



	skb = mt76u_mcu_msg_alloc(&msg, sizeof(msg));

	skb = mt76_mcu_msg_alloc(dev, &msg, sizeof(msg));

	if (!skb)

		return -ENOMEM;

	return mt76u_mcu_send_msg(&dev->mt76, skb, CMD_CALIBRATION_OP, true);

	return mt76_mcu_send_msg(dev, skb, CMD_CALIBRATION_OP, true);

}



static void mt76x2u_mcu_load_ivb(struct mt76x2_dev *dev)