| Message ID | 1562079961-15527-4-git-send-email-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | mt76: usb: alignment and endianes improvements | expand |
On Tue, Jul 02, 2019 at 05:06:01PM +0200, Stanislaw Gruszka wrote: > Instead of use several 4 bytes usb requests, use full 32 bytes buffer > to copy data to device. With the change we use less requests and copy > exact data size to the device regardless size is multiple of 4 or not. And this does not work correctly on some usb hosts, request which are not multiple of 4 do not ended being written to hardware, what results in original problem of having last part of beacon corrupted. I would prefer to drop this set - and I would post 2 patches (first patch fixed and third dropped). But since this is now in Felix's wireless tree I guess I need to post fixes on top of this set? Stanislaw
On 2019-07-09 12:12, Stanislaw Gruszka wrote: > On Tue, Jul 02, 2019 at 05:06:01PM +0200, Stanislaw Gruszka wrote: >> Instead of use several 4 bytes usb requests, use full 32 bytes buffer >> to copy data to device. With the change we use less requests and copy >> exact data size to the device regardless size is multiple of 4 or not. > > And this does not work correctly on some usb hosts, request which > are not multiple of 4 do not ended being written to hardware, > what results in original problem of having last part of beacon > corrupted. > > I would prefer to drop this set - and I would post 2 patches > (first patch fixed and third dropped). But since this is now in > Felix's wireless tree I guess I need to post fixes on top of this > set? I haven't sent out a pull request yet, so I can still drop those patches and apply replacements. - Felix
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c index a61bb8171557..7c564cc68c7c 100644 --- a/drivers/net/wireless/mediatek/mt76/usb.c +++ b/drivers/net/wireless/mediatek/mt76/usb.c @@ -160,19 +160,24 @@ static void mt76u_copy(struct mt76_dev *dev, u32 offset, const void *data, int len) { struct mt76_usb *usb = &dev->usb; - const u32 *val = data; - int i, ret; + int ret, req_len; mutex_lock(&usb->usb_ctrl_mtx); - for (i = 0; i < DIV_ROUND_UP(len, 4); i++) { - put_unaligned(val[i], usb->data); + do { + req_len = min_t(int, len, sizeof(usb->data)); + + memcpy(usb->data, data, req_len); + ret = __mt76u_vendor_request(dev, MT_VEND_MULTI_WRITE, USB_DIR_OUT | USB_TYPE_VENDOR, - 0, offset + i * 4, usb->data, - sizeof(u32)); + 0, offset, usb->data, req_len); if (ret < 0) break; - } + + data += req_len; + offset += req_len; + len -= req_len; + } while (len > 0); mutex_unlock(&usb->usb_ctrl_mtx); }
Instead of use several 4 bytes usb requests, use full 32 bytes buffer to copy data to device. With the change we use less requests and copy exact data size to the device regardless size is multiple of 4 or not. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/mediatek/mt76/usb.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)