samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: At interface down disconnect IPA WDI pipes

Browse Source 
Currently IPA WDI TX and RX pipes are set up when the interface is
up but during interface down there is no disconnect of the IPA WDI
pipes. So again when interface up after interface down IPA driver
returns error that endpoints are already have allocated. As a result
the TX and RX WDI pipe handle values will be zero which is invalid.

In this change disconnect WDI pipes at interface down instead of
during wlan exit or ssr deinit.

Change-Id: I1fb7520467f1b5a6c43bab3b16b002fa0f534d75
CRs-fixed: 2033329
This commit is contained in:
Sravan Kumar Kairam
2017-04-15 00:34:42 +05:30
committed by snandini
parent 67141e8589
commit 71121713be
3 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/hdd/inc/wlan_hdd_ipa.h
View File

@@ -122,6 +122,7 @@ bool hdd_ipa_is_present(hdd_context_t *hdd_ctx);
void hdd_ipa_dump_info(hdd_context_t *hdd_ctx); void hdd_ipa_dump_info(hdd_context_t *hdd_ctx);
QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx); QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx);
void hdd_ipa_set_tx_flow_info(void); void hdd_ipa_set_tx_flow_info(void);
int hdd_ipa_uc_ol_deinit(hdd_context_t *hdd_ctx);
#else #else
static inline QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx) static inline QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx)
{ {
@@ -262,5 +263,15 @@ static inline void hdd_ipa_set_tx_flow_info(void)
return; return;
} }
/**
* hdd_ipa_uc_ol_deinit() - Disconnect IPA TX and RX pipes
* @hdd_ctx: Global HDD context
*
* Return: 0 on success, negativer errno on error
*/
static int hdd_ipa_uc_ol_deinit(hdd_context_t *hdd_ctx)
{
return 0;
}
#endif /* IPA_OFFLOAD */ #endif /* IPA_OFFLOAD */
#endif /* #ifndef HDD_IPA_H__ */ #endif /* #ifndef HDD_IPA_H__ */

48
core/hdd/src/wlan_hdd_ipa.c
View File

@@ -3123,6 +3123,34 @@ fail_return:
return stat; return stat;
} }
/**
* hdd_ipa_uc_ol_deinit() - Disconnect IPA TX and RX pipes
* @hdd_ctx: Global HDD context
*
* Return: 0 on success, negativer errno on error
*/
int hdd_ipa_uc_ol_deinit(hdd_context_t *hdd_ctx)
{
struct hdd_ipa_priv *hdd_ipa = hdd_ctx->hdd_ipa;
int ret = 0;
if (!hdd_ipa_uc_is_enabled(hdd_ctx))
return ret;
if (true == hdd_ipa->uc_loaded) {
HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
"%s: Disconnect TX PIPE tx_pipe_handle=0x%x",
__func__, hdd_ipa->tx_pipe_handle);
ret = ipa_disconnect_wdi_pipe(hdd_ipa->tx_pipe_handle);
HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
"%s: Disconnect RX PIPE rx_pipe_handle=0x%x",
__func__, hdd_ipa->rx_pipe_handle);
ret = ipa_disconnect_wdi_pipe(hdd_ipa->rx_pipe_handle);
}
return ret;
}
/** /**
* __hdd_ipa_uc_force_pipe_shutdown() - Force shutdown IPA pipe * __hdd_ipa_uc_force_pipe_shutdown() - Force shutdown IPA pipe
* @hdd_ctx: hdd main context * @hdd_ctx: hdd main context
@@ -3386,16 +3414,6 @@ static int __hdd_ipa_uc_ssr_deinit(void)
} }
qdf_mutex_release(&hdd_ipa->ipa_lock); qdf_mutex_release(&hdd_ipa->ipa_lock);
HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG,
"%s: Disconnect TX PIPE tx_pipe_handle=0x%x",
__func__, hdd_ipa->tx_pipe_handle);
ipa_disconnect_wdi_pipe(hdd_ipa->tx_pipe_handle);
HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG,
"%s: Disconnect RX PIPE rx_pipe_handle=0x%x",
__func__, hdd_ipa->rx_pipe_handle);
ipa_disconnect_wdi_pipe(hdd_ipa->rx_pipe_handle);
if (hdd_ipa_uc_sta_is_enabled(hdd_ipa->hdd_ctx)) if (hdd_ipa_uc_sta_is_enabled(hdd_ipa->hdd_ctx))
hdd_ipa_uc_sta_reset_sta_connected(hdd_ipa); hdd_ipa_uc_sta_reset_sta_connected(hdd_ipa);
@@ -6257,16 +6275,6 @@ static QDF_STATUS __hdd_ipa_cleanup(hdd_context_t *hdd_ctx)
HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
"UC Ready CB deregister fail"); "UC Ready CB deregister fail");
hdd_ipa_uc_rt_debug_deinit(hdd_ctx); hdd_ipa_uc_rt_debug_deinit(hdd_ctx);
if (true == hdd_ipa->uc_loaded) {
HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG,
"%s: Disconnect TX PIPE tx_pipe_handle=0x%x",
__func__, hdd_ipa->tx_pipe_handle);
ipa_disconnect_wdi_pipe(hdd_ipa->tx_pipe_handle);
HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG,
"%s: Disconnect RX PIPE rx_pipe_handle=0x%x",
__func__, hdd_ipa->rx_pipe_handle);
ipa_disconnect_wdi_pipe(hdd_ipa->rx_pipe_handle);
}
qdf_mutex_destroy(&hdd_ipa->event_lock); qdf_mutex_destroy(&hdd_ipa->event_lock);
qdf_mutex_destroy(&hdd_ipa->ipa_lock); qdf_mutex_destroy(&hdd_ipa->ipa_lock);
hdd_ipa_cleanup_pending_event(hdd_ipa); hdd_ipa_cleanup_pending_event(hdd_ipa);

5
core/hdd/src/wlan_hdd_main.c
View File

@@ -9050,6 +9050,11 @@ static int hdd_deconfigure_cds(hdd_context_t *hdd_ctx)
ret = -EINVAL; ret = -EINVAL;
} }
if (hdd_ipa_uc_ol_deinit(hdd_ctx)) {
hdd_err("Failed to disconnect pipes");
ret = -EINVAL;
}
EXIT(); EXIT();
return ret; return ret;
} }