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

mt76: usb: add req_type to ___mt76u_rr signature 



This is a preliminary patch to add usb support to mt7921 driver.

Tested-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 51f9325c

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

+10 −8
Original line number Diff line number Diff line
@@ -62,16 +62,15 @@ int mt76u_vendor_request(struct mt76_dev *dev, u8 req, 
}

EXPORT_SYMBOL_GPL(mt76u_vendor_request);



static u32 ___mt76u_rr(struct mt76_dev *dev, u8 req, u32 addr)

static u32 ___mt76u_rr(struct mt76_dev *dev, u8 req, u8 req_type,

		       u32 addr)

{

	struct mt76_usb *usb = &dev->usb;

	u32 data = ~0;

	int ret;



	ret = __mt76u_vendor_request(dev, req,

				     USB_DIR_IN | USB_TYPE_VENDOR,

				     addr >> 16, addr, usb->data,

				     sizeof(__le32));

	ret = __mt76u_vendor_request(dev, req, req_type, addr >> 16,

				     addr, usb->data, sizeof(__le32));

	if (ret == sizeof(__le32))

		data = get_unaligned_le32(usb->data);

	trace_usb_reg_rr(dev, addr, data);
@@ -95,7 +94,8 @@ static u32 __mt76u_rr(struct mt76_dev *dev, u32 addr) 
		break;

	}



	return ___mt76u_rr(dev, req, addr & ~MT_VEND_TYPE_MASK);

	return ___mt76u_rr(dev, req, USB_DIR_IN | USB_TYPE_VENDOR,

			   addr & ~MT_VEND_TYPE_MASK);

}



static u32 mt76u_rr(struct mt76_dev *dev, u32 addr)
@@ -114,7 +114,8 @@ static u32 mt76u_rr_ext(struct mt76_dev *dev, u32 addr) 
	u32 ret;



	mutex_lock(&dev->usb.usb_ctrl_mtx);

	ret = ___mt76u_rr(dev, MT_VEND_READ_EXT, addr);

	ret = ___mt76u_rr(dev, MT_VEND_READ_EXT,

			  USB_DIR_IN | USB_TYPE_VENDOR, addr);

	mutex_unlock(&dev->usb.usb_ctrl_mtx);



	return ret;
@@ -177,7 +178,8 @@ static u32 mt76u_rmw_ext(struct mt76_dev *dev, u32 addr, 
			 u32 mask, u32 val)

{

	mutex_lock(&dev->usb.usb_ctrl_mtx);

	val |= ___mt76u_rr(dev, MT_VEND_READ_EXT, addr) & ~mask;

	val |= ___mt76u_rr(dev, MT_VEND_READ_EXT,

			   USB_DIR_IN | USB_TYPE_VENDOR, addr) & ~mask;

	___mt76u_wr(dev, MT_VEND_WRITE_EXT, addr, val);

	mutex_unlock(&dev->usb.usb_ctrl_mtx);