A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "cnss2: Increase mhi timeout to 60 seconds for firmware download"

Browse source
This commit is contained in:
qctecmdr 2020-10-13 23:15:11 -07:00 • committed by Gerrit - the friendly Code Review server
commit 03db2e3c1a
3 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/wireless/cnss2/pci.c
View file

@ -70,6 +70,7 @@ static DEFINE_SPINLOCK(time_sync_lock);
#define FORCE_WAKE_DELAY_MIN_US 4000
#define FORCE_WAKE_DELAY_MAX_US 6000
#define FORCE_WAKE_DELAY_TIMEOUT_US 60000
#define CNSS_MHI_MISSION_MODE_TIMEOUT 60000
#define POWER_ON_RETRY_MAX_TIMES 3
#define POWER_ON_RETRY_DELAY_MS 200
@ -1342,6 +1343,7 @@ int cnss_pci_start_mhi(struct cnss_pci_data *pci_priv)
{
int ret = 0;
struct cnss_plat_data *plat_priv;
unsigned int timeout = 0;
if (!pci_priv) {
cnss_pr_err("pci_priv is NULL\n");
@ -1360,7 +1362,16 @@ int cnss_pci_start_mhi(struct cnss_pci_data *pci_priv)
if (ret)
return ret;
if (cnss_get_host_build_type() == QMI_HOST_BUILD_TYPE_PRIMARY_V01) {
timeout = pci_priv->mhi_ctrl->timeout_ms;
pci_priv->mhi_ctrl->timeout_ms = CNSS_MHI_MISSION_MODE_TIMEOUT;
}
ret = cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_POWER_ON);
if (cnss_get_host_build_type() == QMI_HOST_BUILD_TYPE_PRIMARY_V01)
pci_priv->mhi_ctrl->timeout_ms = timeout;
/* -ETIMEDOUT means MHI power on has succeeded but timed out
* for firmware mission mode event, so handle it properly.
*/

12
drivers/net/wireless/cnss2/qmi.c
View file

@ -165,18 +165,6 @@ qmi_registered:
return ret;
}
#ifdef CONFIG_CNSS2_DEBUG
static inline u32 cnss_get_host_build_type(void)
{
return QMI_HOST_BUILD_TYPE_PRIMARY_V01;
}
#else
static inline u32 cnss_get_host_build_type(void)
{
return QMI_HOST_BUILD_TYPE_SECONDARY_V01;
}
#endif
static int cnss_wlfw_host_cap_send_sync(struct cnss_plat_data *plat_priv)
{
struct wlfw_host_cap_req_msg_v01 *req;

12
drivers/net/wireless/cnss2/qmi.h
View file

@ -278,4 +278,16 @@ static inline int cnss_dms_init(struct cnss_plat_data *plat_priv)
static inline void cnss_dms_deinit(struct cnss_plat_data *plat_priv) {}
#endif /* CONFIG_CNSS2_QMI */
#ifdef CONFIG_CNSS2_DEBUG
static inline u32 cnss_get_host_build_type(void)
{
return QMI_HOST_BUILD_TYPE_PRIMARY_V01;
}
#else
static inline u32 cnss_get_host_build_type(void)
{
return QMI_HOST_BUILD_TYPE_SECONDARY_V01;
}
#endif
#endif /* _CNSS_QMI_H */