evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "serial: msm_serial_hs: Protect spurious irqs after wakeup irq enablement"

Browse source 
This reverts commit 545339b82c446a0509e775722b675115241c9f57.

This workaround is no longer needed because pinctrl IRQ chip driver has been fixed
to clear spurious interrupts:
https://partner-android-review.googlesource.com/c/kernel/private/msm-google/+/1070357/

Bug: 68261352
Bug: 77429706
Change-Id: I66400003a04f50f22033f80fe31ef81ce622cfc1
Signed-off-by: Petri Gynther <pgynther@google.com>
This commit is contained in:
Petri Gynther 2018-05-31 17:57:30 +00:00 • committed by Timi
parent b132a588b4
commit 73729b05ee
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/tty/serial/msm_serial_hs.c
View file

@ -2272,18 +2272,10 @@ void enable_wakeup_interrupt(struct msm_hs_port *msm_uport)
if (!(msm_uport->wakeup.enabled)) { if (!(msm_uport->wakeup.enabled)) {
spin_lock_irqsave(&uport->lock, flags); spin_lock_irqsave(&uport->lock, flags);
msm_uport->wakeup.ignore = 1; msm_uport->wakeup.ignore = 1;
/* Keep this disabled for 1 msec */ msm_uport->wakeup.enabled = true;
msm_uport->wakeup.enabled = false;
spin_unlock_irqrestore(&uport->lock, flags); spin_unlock_irqrestore(&uport->lock, flags);
disable_irq(uport->irq); disable_irq(uport->irq);
enable_irq(msm_uport->wakeup.irq); enable_irq(msm_uport->wakeup.irq);
/* Add delay before enabling wakeup irq */
udelay(1000);
spin_lock_irqsave(&uport->lock, flags);
if (msm_uport->wakeup.ignore == 1)
msm_uport->wakeup.enabled = true;
spin_unlock_irqrestore(&uport->lock, flags);
} else { } else {
MSM_HS_WARN("%s:Wake up IRQ already enabled", __func__); MSM_HS_WARN("%s:Wake up IRQ already enabled", __func__);
} }
@ -2470,10 +2462,6 @@ static irqreturn_t msm_hs_wakeup_isr(int irq, void *dev)
struct uart_port *uport = &msm_uport->uport; struct uart_port *uport = &msm_uport->uport;
struct tty_struct *tty = NULL; struct tty_struct *tty = NULL;
/* Do not serve ISR if this flag is false */
if (!msm_uport->wakeup.enabled)
return IRQ_HANDLED;
spin_lock_irqsave(&uport->lock, flags); spin_lock_irqsave(&uport->lock, flags);
if (msm_uport->wakeup.ignore) if (msm_uport->wakeup.ignore)