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-09 21:59:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

modules: muc_uart: fix low power panic

Browse source 
Could potentially sleep with a spinlock if
we try to wake the muc while holding the queue
spinlock. This reworks the wake code to no longer
call the power mode set ioctl with a spinlock.

Also fixes -11 errors seen on the first transmit
attempt after coming out of low power mode.

Change-Id: Ibc86420bea042d0e1118588519fb32f635248769
Signed-off-by: Ryan Lattrel <ryanl@motorola.com>
Reviewed-on: https://gerrit.mot.com/1219179
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Ryan Lattrel 2018-08-01 12:06:28 -05:00
commit 8a5ebd949b
1 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

39
drivers/mmi_muc_uart/muc_uart.c
View file

@ -255,13 +255,8 @@ static inline void clear_sleep_req_pending(struct mod_muc_data_t *mm_data)
atomic_set(&mm_data->sleep_req_pending, 0);
}
static int muc_uart_sync_wake(struct mod_muc_data_t *mm_data)
static int muc_uart_wake_muc(struct mod_muc_data_t *mm_data)
{
if (!mm_data->uart_pm_state) {
mmi_uart_do_pm(mm_data->uart_data, true);
mm_data->uart_pm_state = 1;
}
gpio_direction_output(mm_data->wake_out_gpio, 0);
/* Only toggle the line if the muc isn't awake */
@ -269,6 +264,7 @@ static int muc_uart_sync_wake(struct mod_muc_data_t *mm_data)
gpio_set_value(mm_data->wake_out_gpio, 1);
mdelay(1);
gpio_set_value(mm_data->wake_out_gpio, 0);
mdelay(1);
return 1;
}
@ -313,8 +309,16 @@ static int muc_uart_send(struct mod_muc_data_t *mm_data,
return -EBUSY;
}
/* If powered off, try to wake. */
if (muc_uart_sync_wake(mm_data)) {
/* If we are in low power mode that needs to change
* else just try to wake the muc
*/
if (!mm_data->uart_pm_state) {
cancel_delayed_work(&mm_data->wake_work);
schedule_delayed_work(&mm_data->wake_work, msecs_to_jiffies(0));
mmi_uart_clear_tx_busy(mm_data->uart_data);
mmi_uart_report_tx_err(mm_data->uart_data);
return -EAGAIN;
} else if (muc_uart_wake_muc(mm_data)) {
mmi_uart_clear_tx_busy(mm_data->uart_data);
mmi_uart_report_tx_err(mm_data->uart_data);
return -EAGAIN;
@ -462,8 +466,17 @@ static void muc_uart_send_work(struct work_struct *w)
/* Wake the muc up here if it isn't already awake
* Send will wake it too, but hopefully this will
* reduce the chances it returns an error.
*
* Also wake up the uart if it is in low power mode.
*/
muc_uart_sync_wake(mm_data);
mmi_uart_set_tx_busy(mm_data->uart_data);
if (!mm_data->uart_pm_state) {
mmi_uart_do_pm(mm_data->uart_data, true);
mm_data->uart_pm_state = 1;
}
mmi_uart_clear_tx_busy(mm_data->uart_data);
muc_uart_wake_muc(mm_data);
mutex_lock(&tx_lock);
ret = muc_uart_send(mm_data,
write_data->cmd,
@ -801,7 +814,13 @@ static void muc_uart_wake_work(struct work_struct *w)
schedule_delayed_work(&mm_data->wake_work, msecs_to_jiffies(500));
else {
pr_info("muc_uart_wake_work: on.\n");
muc_uart_sync_wake(mm_data);
if (!mm_data->uart_pm_state) {
mmi_uart_do_pm(mm_data->uart_data, true);
mm_data->uart_pm_state = 1;
}
muc_uart_wake_muc(mm_data);
mmi_uart_clear_tx_busy(mm_data->uart_data);
/* Send boot mode on initial wake */