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

Commit a18a494f authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76usb: use synchronous msg for mcu command responses 



Use usb_bulk_msg for reading MCU command responses. This simplify code
a lot.

Together with 97a3005759c ("mt76usb: allow mt76u_bulk_msg be used
for reads") it also fix possible problems with rx data buffers
not being aligned and contained within single page. After doing
page_frag_alloc(1024) consecutive page_frag_alloc(PAGE_SIZE) will
alloc PAGE_SIZE buffer at PAGE_SIZE - 1024 offset.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b63aa031

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

+1 −2
Original line number Diff line number Diff line
@@ -384,8 +384,7 @@ struct mt76_usb { 


	struct mt76u_mcu {

		struct mutex mutex;

		struct completion cmpl;

		struct mt76u_buf res;

		u8 *data;

		u32 msg_seq;



		/* multiple reads */

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

+0 −11
Original line number Diff line number Diff line
@@ -311,13 +311,11 @@ static int __maybe_unused mt76x0_suspend(struct usb_interface *usb_intf, 
					 pm_message_t state)

{

	struct mt76x02_dev *dev = usb_get_intfdata(usb_intf);

	struct mt76_usb *usb = &dev->mt76.usb;



	mt76u_stop_queues(&dev->mt76);

	mt76x0u_mac_stop(dev);

	clear_bit(MT76_STATE_MCU_RUNNING, &dev->mt76.state);

	mt76x0_chip_onoff(dev, false, false);

	usb_kill_urb(usb->mcu.res.urb);



	return 0;

}
@@ -328,15 +326,6 @@ static int __maybe_unused mt76x0_resume(struct usb_interface *usb_intf) 
	struct mt76_usb *usb = &dev->mt76.usb;

	int ret;



	reinit_completion(&usb->mcu.cmpl);

	ret = mt76u_submit_buf(&dev->mt76, USB_DIR_IN,

			       MT_EP_IN_CMD_RESP,

			       &usb->mcu.res, GFP_KERNEL,

			       mt76u_mcu_complete_urb,

			       &usb->mcu.cmpl);

	if (ret < 0)

		goto err;



	ret = mt76u_submit_rx_buffers(&dev->mt76);

	if (ret < 0)

		goto err;

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

+10 −22
Original line number Diff line number Diff line
@@ -61,33 +61,21 @@ mt76x02u_multiple_mcu_reads(struct mt76_dev *dev, u8 *data, int len) 
static int mt76x02u_mcu_wait_resp(struct mt76_dev *dev, u8 seq)

{

	struct mt76_usb *usb = &dev->usb;

	struct mt76u_buf *buf = &usb->mcu.res;

	struct urb *urb = buf->urb;

	u8 *data = buf->buf;

	int i, ret;

	u8 *data = usb->mcu.data;

	int i, len, ret;

	u32 rxfce;



	for (i = 0; i < 5; i++) {

		if (!wait_for_completion_timeout(&usb->mcu.cmpl,

						 msecs_to_jiffies(300)))

		ret = mt76u_bulk_msg(dev, data, MCU_RESP_URB_SIZE, &len, 300);

		if (ret == -ETIMEDOUT)

			continue;



		if (urb->status)

			return -EIO;

		if (ret)

			goto out;



		if (usb->mcu.rp)

			mt76x02u_multiple_mcu_reads(dev, data + 4,

						    urb->actual_length - 8);

			mt76x02u_multiple_mcu_reads(dev, data + 4, len - 8);



		rxfce = get_unaligned_le32(data);

		ret = mt76u_submit_buf(dev, USB_DIR_IN,

				       MT_EP_IN_CMD_RESP,

				       buf, GFP_KERNEL,

				       mt76u_mcu_complete_urb,

				       &usb->mcu.cmpl);

		if (ret)

			return ret;



		if (seq == FIELD_GET(MT_RX_FCE_INFO_CMD_SEQ, rxfce) &&

		    FIELD_GET(MT_RX_FCE_INFO_EVT_TYPE, rxfce) == EVT_CMD_DONE)

			return 0;
@@ -96,9 +84,9 @@ static int mt76x02u_mcu_wait_resp(struct mt76_dev *dev, u8 seq) 
			FIELD_GET(MT_RX_FCE_INFO_EVT_TYPE, rxfce),

			seq, FIELD_GET(MT_RX_FCE_INFO_CMD_SEQ, rxfce));

	}



	dev_err(dev->dev, "error: %s timed out\n", __func__);

	return -ETIMEDOUT;

out:

	dev_err(dev->dev, "error: %s failed with %d\n", __func__, ret);

	return ret;

}



static int

drivers/net/wireless/mediatek/mt76/mt76x2/usb.c

+0 −11
Original line number Diff line number Diff line
@@ -100,11 +100,9 @@ static int __maybe_unused mt76x2u_suspend(struct usb_interface *intf, 
					  pm_message_t state)

{

	struct mt76x02_dev *dev = usb_get_intfdata(intf);

	struct mt76_usb *usb = &dev->mt76.usb;



	mt76u_stop_queues(&dev->mt76);

	mt76x2u_stop_hw(dev);

	usb_kill_urb(usb->mcu.res.urb);



	return 0;

}
@@ -115,15 +113,6 @@ static int __maybe_unused mt76x2u_resume(struct usb_interface *intf) 
	struct mt76_usb *usb = &dev->mt76.usb;

	int err;



	reinit_completion(&usb->mcu.cmpl);

	err = mt76u_submit_buf(&dev->mt76, USB_DIR_IN,

			       MT_EP_IN_CMD_RESP,

			       &usb->mcu.res, GFP_KERNEL,

			       mt76u_mcu_complete_urb,

			       &usb->mcu.cmpl);

	if (err < 0)

		goto err;



	err = mt76u_submit_rx_buffers(&dev->mt76);

	if (err < 0)

		goto err;

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

+0 −1
Original line number Diff line number Diff line
@@ -933,7 +933,6 @@ int mt76u_init(struct mt76_dev *dev, 
	INIT_DELAYED_WORK(&usb->stat_work, mt76u_tx_status_data);

	skb_queue_head_init(&dev->rx_skb[MT_RXQ_MAIN]);



	init_completion(&usb->mcu.cmpl);

	mutex_init(&usb->mcu.mutex);



	mutex_init(&usb->usb_ctrl_mtx);