bluez: Correct the timer count for bcm43xx firmware download

bcm43xx failed as time out for firmware downloading.
The root cause is that it need wait 50ms to download firmware,
but the value of 50us is set to the timer.

(From OE-Core rev: bb8bc17ab8d71e3a30e2f0b655c42434dd968ea4)

Signed-off-by: Jun Zhu <junzhu@nxp.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jun Zhu
2017-06-29 10:14:55 +08:00
committed by Richard Purdie
parent 5422b0cc38
commit 1b09ea3690
2 changed files with 37 additions and 0 deletions

View File

@@ -49,6 +49,7 @@ SRC_URI = "\
file://run-ptest \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
file://0001-hciattach-bcm43xx-fix-the-delay-timer-for-firmware-d.patch \
"
S = "${WORKDIR}/bluez-${PV}"

View File

@@ -0,0 +1,36 @@
From 3b341fb421ef61db7782bf1314ec693828467de9 Mon Sep 17 00:00:00 2001
From: Andy Duan <fugang.duan@nxp.com>
Date: Wed, 23 Nov 2016 17:12:12 +0800
Subject: [PATCH] hciattach: bcm43xx: fix the delay timer for firmware download
From the log in .bcm43xx_load_firmware():
/* Wait 50ms to let the firmware placed in download mode */
nanosleep(&tm_mode, NULL);
But timespec tm_mode is real is 50us. Correct the delayed timer count.
Upstream-Status: Pending
Signed-off-by: Fugang Duan <fugang.duan@nxp.com>
---
tools/hciattach_bcm43xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c
index 81f38cb..ac1b3c1 100644
--- a/tools/hciattach_bcm43xx.c
+++ b/tools/hciattach_bcm43xx.c
@@ -228,8 +228,8 @@ static int bcm43xx_set_speed(int fd, struct termios *ti, uint32_t speed)
static int bcm43xx_load_firmware(int fd, const char *fw)
{
unsigned char cmd[] = { HCI_COMMAND_PKT, 0x2e, 0xfc, 0x00 };
- struct timespec tm_mode = { 0, 50000 };
- struct timespec tm_ready = { 0, 2000000 };
+ struct timespec tm_mode = { 0, 50000000 };
+ struct timespec tm_ready = { 0, 200000000 };
unsigned char resp[CC_MIN_SIZE];
unsigned char tx_buf[1024];
int len, fd_fw, n;
--
1.9.1