Commit f320d812 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: implement .mcu_parse_response in struct mt76_mcu_ops 



Do not free skb inside that function
Preparation for further cleanup

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

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

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ struct mt76_mcu_ops { 
			    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_parse_response)(struct mt76_dev *dev, int cmd,

				  struct sk_buff *skb, int seq);

	u32 (*mcu_rr)(struct mt76_dev *dev, u32 offset);

	void (*mcu_wr)(struct mt76_dev *dev, u32 offset, u32 val);

	int (*mcu_wr_rp)(struct mt76_dev *dev, u32 base,

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

+15 −9
Original line number Diff line number Diff line
@@ -13,6 +13,18 @@ struct mt7603_fw_trailer { 
	__le32 dl_len;

} __packed;



static int

mt7603_mcu_parse_response(struct mt76_dev *mdev, int cmd,

			  struct sk_buff *skb, int seq)

{

	struct mt7603_mcu_rxd *rxd = (struct mt7603_mcu_rxd *)skb->data;



	if (seq != rxd->seq)

		return -EAGAIN;



	return 0;

}



static int

__mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb,

		      int cmd, int *wait_seq)
@@ -58,7 +70,6 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
{

	struct mt7603_dev *dev = container_of(mdev, struct mt7603_dev, mt76);

	unsigned long expires = jiffies + 3 * HZ;

	struct mt7603_mcu_rxd *rxd;

	struct sk_buff *skb;

	int ret, seq;
@@ -73,8 +84,6 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
		goto out;



	while (wait_resp) {

		bool check_seq = false;



		skb = mt76_mcu_get_response(&dev->mt76, expires);

		if (!skb) {

			dev_err(mdev->dev,
@@ -85,13 +94,9 @@ mt7603_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, 
			break;

		}



		rxd = (struct mt7603_mcu_rxd *)skb->data;

		if (seq == rxd->seq)

			check_seq = true;



		ret = mt7603_mcu_parse_response(mdev, cmd, skb, seq);

		dev_kfree_skb(skb);



		if (check_seq)

		if (ret != -EAGAIN)

			break;

	}
@@ -266,6 +271,7 @@ int mt7603_mcu_init(struct mt7603_dev *dev) 
	static const struct mt76_mcu_ops mt7603_mcu_ops = {

		.headroom = sizeof(struct mt7603_mcu_txd),

		.mcu_send_msg = mt7603_mcu_msg_send,

		.mcu_parse_response = mt7603_mcu_parse_response,

		.mcu_restart = mt7603_mcu_restart,

	};

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

+8 −10
Original line number Diff line number Diff line
@@ -179,17 +179,14 @@ static int __mt7615_mcu_msg_send(struct mt7615_dev *dev, struct sk_buff *skb, 
	return mt76_tx_queue_skb_raw(dev, qid, skb, 0);

}



static int

mt7615_mcu_parse_response(struct mt7615_dev *dev, int cmd,

int mt7615_mcu_parse_response(struct mt76_dev *mdev, int cmd,

			      struct sk_buff *skb, int seq)

{

	struct mt7615_mcu_rxd *rxd = (struct mt7615_mcu_rxd *)skb->data;

	int ret = 0;



	if (seq != rxd->seq) {

		ret = -EAGAIN;

		goto out;

	}

	if (seq != rxd->seq)

		return -EAGAIN;



	switch (cmd) {

	case MCU_CMD_PATCH_SEM_CONTROL:
@@ -228,11 +225,10 @@ mt7615_mcu_parse_response(struct mt7615_dev *dev, int cmd, 
	default:

		break;

	}

out:

	dev_kfree_skb(skb);



	return ret;

}

EXPORT_SYMBOL_GPL(mt7615_mcu_parse_response);



int mt7615_mcu_wait_response(struct mt7615_dev *dev, int cmd, int seq)

{
@@ -248,7 +244,8 @@ int mt7615_mcu_wait_response(struct mt7615_dev *dev, int cmd, int seq) 
			return -ETIMEDOUT;

		}



		ret = mt7615_mcu_parse_response(dev, cmd, skb, seq);

		ret = mt7615_mcu_parse_response(&dev->mt76, cmd, skb, seq);

		dev_kfree_skb(skb);

		if (ret != -EAGAIN)

			break;

	}
@@ -2467,6 +2464,7 @@ int mt7615_mcu_init(struct mt7615_dev *dev) 
		.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,

	};

	int ret;

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

+2 −0
Original line number Diff line number Diff line
@@ -592,6 +592,8 @@ u32 mt7615_mac_get_sta_tid_sn(struct mt7615_dev *dev, int wcid, u8 tid); 
int mt7615_mcu_wait_response(struct mt7615_dev *dev, int cmd, int seq);

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);

int mt7615_rf_wr(struct mt7615_dev *dev, u32 wf, u32 reg, u32 val);

int mt7615_mcu_set_dbdc(struct mt7615_dev *dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ int mt7663s_mcu_init(struct mt7615_dev *dev) 
		.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,

		.mcu_wr = mt7615_mcu_reg_wr,