From 2741c7afbfa2b5523455f6e14c58151cc70b3bf2 Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Thu, 29 Mar 2018 18:40:55 +0800 Subject: [PATCH] qcacld-3.0: disable mailbox swap for FTM mode It shouldn't swap mailbox in FTM mode, or WMI commands will be stuck. Change-Id: I5d3760100f3c8e1d2c3bfbe88fd5a84deb0bc1ff CRs-Fixed: 2208876 --- core/bmi/src/ol_fw_common.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/bmi/src/ol_fw_common.c b/core/bmi/src/ol_fw_common.c index 2799ff0aee5a..6e06036d3095 100644 --- a/core/bmi/src/ol_fw_common.c +++ b/core/bmi/src/ol_fw_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -164,8 +164,11 @@ QDF_STATUS ol_sdio_extra_initialization(struct ol_context *ol_ctx) goto exit; } - param |= (HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET | - HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE); + param |= HI_ACS_FLAGS_ALT_DATA_CREDIT_SIZE; + + /* disable swap mailbox for FTM */ + if (cds_get_conparam() != QDF_GLOBAL_FTM_MODE) + param |= HI_ACS_FLAGS_SDIO_SWAP_MAILBOX_SET; if (!cds_is_ptp_tx_opt_enabled()) param |= HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET;