ath9k_htc: avoid memcpy when downloading firmware
Subsystems (3)
PATCH 1/1 ath9k_htc: avoid memcpy when downloading firmware
From: Fred Chou <[email protected]>
The temporary buffer to hold firmware data is not really needed, and memcpy can be avoided by using data pointer instead.
--- drivers/net/wireless/ath/ath9k/hif_usb.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath9k/hif_usb.c +2 -10
@@ -986,30 +986,22 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)const void *data = hif_dev->fw_data;size_t len = hif_dev->fw_size;u32 addr =AR9271_FIRMWARE ; -u8 *buf =kzalloc (4096 ,GFP_KERNEL );u32 firm_offset; -if (!buf) -return -ENOMEM ; -while (len) { transfer =min_t (size_t, len,4096 ); -memcpy (buf, data, transfer); err =usb_control_msg (hif_dev->udev,usb_sndctrlpipe (hif_dev->udev,0 ),FIRMWARE_DOWNLOAD ,0x40 |USB_DIR_OUT , - addr >>8 ,0 , buf, transfer,HZ ); -if (err <0 ) { -kfree (buf); + addr >>8 ,0 , data, transfer,HZ ); +if (err <0 )return err; - } len -= transfer; data += transfer; addr += transfer; } -kfree (buf);if (IS_AR7010_DEVICE (hif_dev->usb_device_id->driver_info)) firm_offset =AR7010_FIRMWARE_TEXT ;
Signature · 1 line
1.9.1
Quoted 15 lines · Fred Chou
From: Fred Chou <[email protected]>
The temporary buffer to hold firmware data is not really needed, and memcpy can be avoided by using data pointer instead.
Signed-off-by Fred Chou <[email protected]>--- drivers/net/wireless/ath/ath9k/hif_usb.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)drivers/net/wireless/ath/ath9k/hif_usb.c +0
-0
drivers/net/wireless/ath/ath9k/hif_usb.c static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) · line 986
Quoted 1 line
drivers/net/wireless/ath/ath9k/hif_usb.c +0
-0@@ -986,30 +986,22 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)const void *data = hif_dev->fw_data;
Here data can be vmalloc() backed.
drivers/net/wireless/ath/ath9k/hif_usb.c static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) · line 989
Quoted 3 lines
drivers/net/wireless/ath/ath9k/hif_usb.c +0
-1size_t len = hif_dev->fw_size;u32 addr =AR9271_FIRMWARE ; -u8 *buf =kzalloc (4096 ,GFP_KERNEL );
Here buf is kmalloc() backed.
drivers/net/wireless/ath/ath9k/hif_usb.c static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) · line 1002
Quoted 13 lines
drivers/net/wireless/ath/ath9k/hif_usb.c +0
-5u32 firm_offset; -if (!buf) -return -ENOMEM ; -while (len) { transfer =min_t (size_t, len,4096 ); -memcpy (buf, data, transfer); err = usb_control_msg(hif_dev->udev, usb_sndctrlpipe(hif_dev->udev, 0), FIRMWARE_DOWNLOAD, 0x40 | USB_DIR_OUT, - addr >>8 ,0 , buf, transfer,HZ );
Are you sure usb_control_msg() accepts vmalloc()ed buffers ?
My guess is the answer is no.
Quoted 43 lines · Eric Dumazet
Quoted 15 lines · Fred Chou
From: Fred Chou <[email protected]>
The temporary buffer to hold firmware data is not really needed, and memcpy can be avoided by using data pointer instead.
Signed-off-by Fred Chou <[email protected]>--- drivers/net/wireless/ath/ath9k/hif_usb.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)drivers/net/wireless/ath/ath9k/hif_usb.c +0
-0drivers/net/wireless/ath/ath9k/hif_usb.c static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) · line 986
Quoted 1 line
drivers/net/wireless/ath/ath9k/hif_usb.c +0
-0@@ -986,30 +986,22 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)const void *data = hif_dev->fw_data;Here data can be
vmalloc()backed.drivers/net/wireless/ath/ath9k/hif_usb.c static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) · line 989
Quoted 3 lines
drivers/net/wireless/ath/ath9k/hif_usb.c +0
-1size_t len = hif_dev->fw_size;u32 addr =AR9271_FIRMWARE ; -u8 *buf =kzalloc (4096 ,GFP_KERNEL );Here buf is
kmalloc()backed.drivers/net/wireless/ath/ath9k/hif_usb.c static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev) · line 1002
Quoted 13 lines
drivers/net/wireless/ath/ath9k/hif_usb.c +0
-5u32 firm_offset; -if (!buf) -return -ENOMEM ; -while (len) { transfer =min_t (size_t, len,4096 ); -memcpy (buf, data, transfer); err = usb_control_msg(hif_dev->udev, usb_sndctrlpipe(hif_dev->udev, 0), FIRMWARE_DOWNLOAD, 0x40 | USB_DIR_OUT, - addr >>8 ,0 , buf, transfer,HZ );Are you sure
usb_control_msg()accepts vmalloc()ed buffers ?
Quoted 3 lines
My guess is the answer is no.
I agree, and I would like to drop the patch. Thanks.
Quoted 7 lines · Fred Chou
Quoted 5 lines
Are you sure
usb_control_msg()accepts vmalloc()ed buffers ?My guess is the answer is no.
I agree, and I would like to drop the patch. Thanks.
I dropped it from my queue.
Signature · 1 line
Kalle Valo