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

Commit 3e0c1abe authored by Iwo Mergler's avatar Iwo Mergler Committed by John W. Linville
Browse files

rt2x00: Large vendor requests for rt73usb firmware upload and beacons 



Switches rt73usb to use large vendor requests for firmware
and beacons. This also fixes the garbled beacon bug.

Signed-off-by: default avatarIwo Mergler <Iwo@call-direct.com.au>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ed0dbeeb

drivers/net/wireless/rt2x00/rt2x00usb.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ 
 * Cache size

 */

#define CSR_CACHE_SIZE			64

#define CSR_CACHE_SIZE_FIRMWARE		64



/*

 * USB request types.

drivers/net/wireless/rt2x00/rt73usb.c

+9 −31
Original line number Diff line number Diff line
@@ -890,9 +890,6 @@ static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data, 
	unsigned int i;

	int status;

	u32 reg;

	const char *ptr = data;

	char *cache;

	int buflen;



	/*

	 * Wait for stable hardware.
@@ -911,31 +908,12 @@ static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data, 


	/*

	 * Write firmware to device.

	 * We setup a seperate cache for this action,

	 * since we are going to write larger chunks of data

	 * then normally used cache size.

	 */

	cache = kmalloc(CSR_CACHE_SIZE_FIRMWARE, GFP_KERNEL);

	if (!cache) {

		ERROR(rt2x00dev, "Failed to allocate firmware cache.\n");

		return -ENOMEM;

	}



	for (i = 0; i < len; i += CSR_CACHE_SIZE_FIRMWARE) {

		buflen = min_t(int, len - i, CSR_CACHE_SIZE_FIRMWARE);



		memcpy(cache, ptr, buflen);



		rt2x00usb_vendor_request(rt2x00dev, USB_MULTI_WRITE,

	rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,

					    USB_VENDOR_REQUEST_OUT,

					 FIRMWARE_IMAGE_BASE + i, 0,

					 cache, buflen,

					 REGISTER_TIMEOUT32(buflen));



		ptr += buflen;

	}



	kfree(cache);

					    FIRMWARE_IMAGE_BASE,

					    data, len,

					    REGISTER_TIMEOUT32(len));



	/*

	 * Send firmware request to device to load firmware,
@@ -1374,8 +1352,8 @@ static void rt73usb_write_beacon(struct queue_entry *entry) 
	 * Write entire beacon with descriptor to register.

	 */

	beacon_base = HW_BEACON_OFFSET(entry->entry_idx);

	rt2x00usb_vendor_request(rt2x00dev, USB_MULTI_WRITE,

				 USB_VENDOR_REQUEST_OUT, beacon_base, 0,

	rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE,

					    USB_VENDOR_REQUEST_OUT, beacon_base,

					    entry->skb->data, entry->skb->len,

					    REGISTER_TIMEOUT32(entry->skb->len));