summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Zhang <lukez@codeaurora.org>2016-01-25 16:45:29 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-02-16 02:15:40 -0800
commit8d45c59708eeb47953c0d071e71dc4fd292c3be5 (patch)
treea27a7cb96d34ec02703784f9124214f6d39d21f9
parent2a304f2362a41017dfe91255d221186182436a81 (diff)
downloadandroid_hardware_qcom_bt-8d45c59708eeb47953c0d071e71dc4fd292c3be5.tar.gz
android_hardware_qcom_bt-8d45c59708eeb47953c0d071e71dc4fd292c3be5.tar.bz2
android_hardware_qcom_bt-8d45c59708eeb47953c0d071e71dc4fd292c3be5.zip
Fixed the problem of ADSP crash while Fuzzing BT
During Fuzzing BT test, BT cannot recover after SSR was triggered due to command timed out. The reason is that during this test, the property of wc_transport.force_special_byte was not set, so SOC stayed in suspend mode. Change-Id: I41f9dae5ec4c771e078d09213b0d19f23ec9de1f CRs-fixed: 964802
-rw-r--r--libbt-vendor/src/bt_vendor_qcom.c27
1 files changed, 25 insertions, 2 deletions
diff --git a/libbt-vendor/src/bt_vendor_qcom.c b/libbt-vendor/src/bt_vendor_qcom.c
index 464defd..294c0c3 100644
--- a/libbt-vendor/src/bt_vendor_qcom.c
+++ b/libbt-vendor/src/bt_vendor_qcom.c
@@ -52,6 +52,7 @@
#define CMD_TIMEOUT 0x22
static void wait_for_patch_download(bool is_ant_req);
+static bool is_debug_force_special_bytes(void);
/******************************************************************************
** Externs
@@ -1087,13 +1088,19 @@ static void ssr_cleanup(int reason) {
trig_ssr = 0xEE;
ret = write (vnd_userial.fd, &trig_ssr, 1);
ALOGI("Trig_ssr is being sent to BT socket, retval(%d) :errno: %s", ret, strerror(errno));
- return;
+
+ if (is_debug_force_special_bytes()) {
+ //Then we should send special byte to crash SOC in WCNSS_Filter, so we do not
+ //need to power off UART here.
+ return;
+ }
}
+
/*Close both ANT channel*/
op(BT_VND_OP_ANT_USERIAL_CLOSE, NULL);
#endif
#endif
- /*Close both ANT channel*/
+ /*Close both BT channel*/
op(BT_VND_OP_USERIAL_CLOSE, NULL);
/*CTRL OFF twice to make sure hw
* turns off*/
@@ -1144,6 +1151,22 @@ void wait_for_patch_download(bool is_ant_req) {
}
}
+static bool is_debug_force_special_bytes() {
+ int ret = 0;
+ char value[PROPERTY_VALUE_MAX] = {'\0'};
+ bool enabled = false;
+
+ ret = property_get("wc_transport.force_special_byte", value, NULL);
+
+ if (ret) {
+ enabled = (strcmp(value, "false") ==0) ? false : true;
+ ALOGV("%s: wc_transport.force_special_byte: %s, enabled: %d ",
+ __func__, value, enabled);
+ }
+
+ return enabled;
+}
+
// Entry point of DLib
const bt_vendor_interface_t BLUETOOTH_VENDOR_LIB_INTERFACE = {
sizeof(bt_vendor_interface_t),