Commit 64537a02 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: make mcu_ops->mcu_send_msg optional 



Remove it from mt7615 and mt7915 and implement it in core code instead

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent e452c6eb

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

+16 −0
Original line number Diff line number Diff line
@@ -51,6 +51,22 @@ void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb) 
}

EXPORT_SYMBOL_GPL(mt76_mcu_rx_event);



int mt76_mcu_send_msg(struct mt76_dev *dev, int cmd, const void *data,

		      int len, bool wait_resp)

{

	struct sk_buff *skb;



	if (dev->mcu_ops->mcu_send_msg)

		return dev->mcu_ops->mcu_send_msg(dev, cmd, data, len, wait_resp);



	skb = mt76_mcu_msg_alloc(dev, data, len);

	if (!skb)

		return -ENOMEM;



	return mt76_mcu_skb_send_msg(dev, skb, cmd, wait_resp);

}

EXPORT_SYMBOL_GPL(mt76_mcu_send_msg);



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

			  int cmd, bool wait_resp)

{

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

+2 −1
Original line number Diff line number Diff line
@@ -689,7 +689,6 @@ 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)->mcu_ops->mcu_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))
@@ -1068,6 +1067,8 @@ mt76_mcu_msg_alloc(struct mt76_dev *dev, const void *data, 
void mt76_mcu_rx_event(struct mt76_dev *dev, struct sk_buff *skb);

struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,

				      unsigned long expires);

int mt76_mcu_send_msg(struct mt76_dev *dev, int cmd, const void *data,

		      int len, bool wait_resp);

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

			  int cmd, bool wait_resp);

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

+0 −14
Original line number Diff line number Diff line
@@ -242,19 +242,6 @@ mt7615_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, 
	return mt76_tx_queue_skb_raw(dev, qid, skb, 0);

}



int mt7615_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,

			int len, bool wait_resp)

{

	struct sk_buff *skb;



	skb = mt76_mcu_msg_alloc(mdev, data, len);

	if (!skb)

		return -ENOMEM;



	return mt76_mcu_skb_send_msg(mdev, skb, cmd, wait_resp);

}

EXPORT_SYMBOL_GPL(mt7615_mcu_msg_send);



u32 mt7615_rf_rr(struct mt7615_dev *dev, u32 wf, u32 reg)

{

	struct {
@@ -2429,7 +2416,6 @@ int mt7615_mcu_init(struct mt7615_dev *dev) 
	static const struct mt76_mcu_ops mt7615_mcu_ops = {

		.headroom = sizeof(struct mt7615_mcu_txd),

		.mcu_skb_send_msg = mt7615_mcu_send_message,

		.mcu_send_msg = mt7615_mcu_msg_send,

		.mcu_parse_response = mt7615_mcu_parse_response,

		.mcu_restart = mt7615_mcu_restart,

	};

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

+0 −2
Original line number Diff line number Diff line
@@ -589,8 +589,6 @@ int mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, 
void mt7615_mac_reset_work(struct work_struct *work);

u32 mt7615_mac_get_sta_tid_sn(struct mt7615_dev *dev, int wcid, u8 tid);



int mt7615_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,

			int len, bool wait_resp);

int mt7615_mcu_parse_response(struct mt76_dev *mdev, int cmd,

			      struct sk_buff *skb, int seq);

u32 mt7615_rf_rr(struct mt7615_dev *dev, u32 wf, u32 reg);

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

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ int mt7663s_mcu_init(struct mt7615_dev *dev) 
		.headroom = sizeof(struct mt7615_mcu_txd),

		.tailroom = MT_USB_TAIL_SIZE,

		.mcu_skb_send_msg = mt7663s_mcu_send_message,

		.mcu_send_msg = mt7615_mcu_msg_send,

		.mcu_parse_response = mt7615_mcu_parse_response,

		.mcu_restart = mt7615_mcu_restart,

		.mcu_rr = mt7615_mcu_reg_rr,