| Message ID | 1473686728-8101-2-git-send-email-akarwar@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 787764676f94114980d17e627b21937f4245c866 |
| Delegated to: | Kalle Valo |
| Headers | show |
Amitkumar Karwar <akarwar@marvell.com> wrote: > From: Ganapathi Bhat <gbhat@marvell.com> > > Firmware image for newer USB chipsets starts with a command 7 block > (special command). It doesn't contain data length field. This patch adds > necessary handling. > > Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> > Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Thanks, 2 patches applied to wireless-drivers-next.git: 787764676f94 mwifiex: Command 7 handling for USB chipsets b7450e248d71 mwifiex: firmware name correction for usb8997 chipset
diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c index 9213516..8a20620 100644 --- a/drivers/net/wireless/marvell/mwifiex/usb.c +++ b/drivers/net/wireless/marvell/mwifiex/usb.c @@ -1026,6 +1026,10 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter, dnld_cmd = le32_to_cpu(fwdata->fw_hdr.dnld_cmd); tlen += sizeof(struct fw_header); + /* Command 7 doesn't have data length field */ + if (dnld_cmd == FW_CMD_7) + dlen = 0; + memcpy(fwdata->data, &firmware[tlen], dlen); fwdata->seq_num = cpu_to_le32(fw_seqnum); diff --git a/drivers/net/wireless/marvell/mwifiex/usb.h b/drivers/net/wireless/marvell/mwifiex/usb.h index b4e9246..1b49c52 100644 --- a/drivers/net/wireless/marvell/mwifiex/usb.h +++ b/drivers/net/wireless/marvell/mwifiex/usb.h @@ -51,6 +51,7 @@ #define FW_DNLD_TX_BUF_SIZE 620 #define FW_DNLD_RX_BUF_SIZE 2048 #define FW_HAS_LAST_BLOCK 0x00000004 +#define FW_CMD_7 0x00000007 #define FW_DATA_XMIT_SIZE \ (sizeof(struct fw_header) + dlen + sizeof(u32))