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-09 10:13:04 -0800
commitd0dda498b56f3a2544b2f536f29ef3cc6e126153 (patch)
tree0f96d5a1655f0a18025842a0e04d8251c2a5cfe0
parent0eb12198916fbc3ab03cce27ea41914eef447b65 (diff)
downloadandroid_hardware_qcom_bt-d0dda498b56f3a2544b2f536f29ef3cc6e126153.tar.gz
android_hardware_qcom_bt-d0dda498b56f3a2544b2f536f29ef3cc6e126153.tar.bz2
android_hardware_qcom_bt-d0dda498b56f3a2544b2f536f29ef3cc6e126153.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 d1ca184..0a36ad6 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
@@ -1093,13 +1094,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*/
@@ -1150,6 +1157,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),