Merge "msm:ipa: continue ODL logging on MHIP post modem SSR"

This commit is contained in:
qctecmdr 2020-01-09 23:08:15 -08:00 • committed by Gerrit - the friendly Code Review server
commit 35ad67c68d

View file

@ -2391,12 +2391,19 @@ static int ipa_mpm_mhi_probe_cb(struct mhi_device *mhi_dev,
}
atomic_inc(&ipa_mpm_ctx->probe_cnt);
/* Check if ODL pipe is connected to MHIP DPL pipe before probe */
if (probe_id == IPA_MPM_MHIP_CH_ID_2 &&
ipa3_is_odl_connected()) {
IPA_MPM_DBG("setting DPL DMA to ODL\n");
ret = ipa_mpm_set_dma_mode(IPA_CLIENT_MHI_PRIME_DPL_PROD,
IPA_CLIENT_USB_DPL_CONS, false);
/* Check if ODL/USB DPL pipe is connected before probe */
if (probe_id == IPA_MPM_MHIP_CH_ID_2) {
if (ipa3_is_odl_connected())
ret = ipa_mpm_set_dma_mode(
IPA_CLIENT_MHI_PRIME_DPL_PROD,
IPA_CLIENT_ODL_DPL_CONS, false);
else if (atomic_read(&ipa_mpm_ctx->adpl_over_usb_available))
ret = ipa_mpm_set_dma_mode(
IPA_CLIENT_MHI_PRIME_DPL_PROD,
IPA_CLIENT_USB_DPL_CONS, false);
if (ret)
IPA_MPM_ERR("DPL DMA to ODL/USB failed, ret = %d\n",
ret);
}
mutex_lock(&ipa_mpm_ctx->md[probe_id].mhi_mutex);
ipa_mpm_ctx->md[probe_id].init_complete = true;