Hi Marcel,
I just wonder if you had a chance to take a look at this patch.
Let me know if you have any comments.
Regards,
Tedd
On Thu, 7 May 2015 09:08:56 -0700
Tedd Ho-Jeong An <tedd.an@xxxxxxxxx> wrote:
> From: Tedd Ho-Jeong An <tedd.an@xxxxxxxxx>
>
> This patch fixes the command length alignment issue for Intel Bluetooth
> 8260.
>
> The length of parameters in the firmware downloading command must be
> multiplication of 4. If not, the command must append Intel_NOP command
> with extra parameters, zeros, at the end and the firmware file is
> already included Intel_NOP command for alignment.
>
> This patch checks the length of the parameters and if it is not aligned,
> then read the next command which is Intel_NOP command and append it to
> the first read command and send to the device together.
>
> For example, if the data from the firmware file is like this:
> 8E FC 03 11 22 33 02 FC 03 00 00 00
>
> Previously, btusb sends two commands:
> 09 FC 06 8E FC 03 11 22 33
> 09 FC 06 02 FC 03 00 00 00
>
> This will not work due to the length of parameters are 6 and the device
> failed to align the data.
>
> This patch will append them together and send one command:
> 09 FC 0B 8E FC 03 11 22 33 02 FC 03 00 00 00
>
> Signed-off-by: Tedd Ho-Jeong An <tedd.an@xxxxxxxxx>
> ---
> drivers/bluetooth/btusb.c | 35 +++++++++++++++++++++++++++++++++++
> 1 file changed, 35 insertions(+)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index d21f3b4..57f4eac 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -2541,6 +2541,41 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
>
> cmd_len = sizeof(*cmd) + cmd->plen;
>
> + /* The parameter length of secure send command should be a
> + * multiplication of 4. If it is not, it appends Intel_NOP
> + * command with arbitrary number of parameters (zeros) to meet
> + * the 4 byte alignment.
> + * The FW file has already aligned and appended Intel_NOP
> + * command. So it needs to read next Intel_NOP command and send
> + * them together.
> + */
> + if ((cmd_len % 4) != 0) {
> + /* Make sure the next command is Intel_NOP command.
> + */
> + struct hci_command_hdr *nop_cmd =
> + (void *)(fw_ptr + cmd_len);
> + if (nop_cmd->opcode != 0xfc02) {
> + BT_ERR("%s: Intel_NOP command is missing",
> + hdev->name);
> + err = -EBADF;
> + goto done;
> + }
> +
> + /* Command data is updated to include NOP command
> + */
> + cmd_len += sizeof(*nop_cmd) + nop_cmd->plen;
> +
> + /* Make sure the total length is aligned and smaller
> + * than maximum param length
> + */
> + if ((cmd_len % 4) != 0 || cmd_len > 252) {
> + BT_ERR("%s: 4 byte alignment failed",
> + hdev->name);
> + err = -EBADF;
> + goto done;
> + }
> + }
> +
> /* Send each command from the firmware data buffer as
> * a single Data fragment.
> */
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
