• Tony Lindgren's avatar
    serial: omap: Fix missing pm_runtime_resume handling by simplifying code · d758c9c1
    Tony Lindgren authored
    The lack of pm_runtime_resume handling for the device state leads into
    device wake-up interrupts not working after a while for runtime PM.
    
    Also, serial-omap is confused about the use of device_may_wakeup.
    The checks for device_may_wakeup should only be done for suspend and
    resume, not for pm_runtime_suspend and pm_runtime_resume. The wake-up
    events for PM runtime should always be enabled.
    
    The lack of pm_runtime_resume handling leads into device wake-up
    interrupts not working after a while for runtime PM.
    
    Rather than try to patch over the issue of adding complex tests to
    the pm_runtime_resume, let's fix the issues properly:
    
    1. Make serial_omap_enable_wakeup deal with all internal PM state
       handling so we don't need to test for up->wakeups_enabled elsewhere.
    
       Later on once omap3 boots in device tree only mode we can also
       remove the up->wakeups_enabled flag and rely on the wake-up
       interrupt enable/disable state alone.
    
    2. Do the device_may_wakeup checks in suspend and resume only,
       for runtime PM the wake-up events need to be always enabled.
    
    3. Finally just call serial_omap_enable_wakeup and make sure we
       call it also in pm_runtime_resume.
    
    4. Note that we also have to use disable_irq_nosync as serial_omap_irq
       calls pm_runtime_get_sync.
    
    Fixes: 2a0b965c (serial: omap: Add support for optional wake-up)
    Cc: stable@vger.kernel.org # v3.13+
    Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
    Acked-by: default avatarFelipe Balbi <balbi@ti.com>
    Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
    d758c9c1
omap-serial.c 50.1 KB