From: Todd Poynor <[email protected]> usb: phy: Temporarily hold timed wakeup source on charger and disconnect events
It temporarily holds a timed wakeup source on USB disconnect events, to allow the rest of the system time to react to the USB disconnection (dropping host sessions, updating charger status, etc.) prior to re-allowing suspend Cc: Felipe Balbi <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: [email protected] Cc: [email protected] Cc: Android Kernel Team <[email protected]> Cc: John Stultz <[email protected]> Cc: Sumit Semwal <[email protected]> Signed-off-by: Todd Poynor <[email protected]> [kiran: Added context to commit message and addressed community feedback] Signed-off-by: Kiran Raparthy <[email protected]> --- v3: * Modified the commit log. * Remove indirect function usb_temporary_hold_wsource and call __pm_wakeup_even directly. v2: * Implement usb_temporary_hold_wsource function in phy. v1: * Removed the refactoring logic from this integrated into main driver code. RFC: * Integrated the refactoring logic and logic to hold wakeupsource temporarily. drivers/usb/phy/otg-wakeupsource.c | 3 ++- include/linux/usb/phy.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/phy/otg-wakeupsource.c b/drivers/usb/phy/otg-wakeupsource.c index d9a1720..7bc9657 100644 --- a/drivers/usb/phy/otg-wakeupsource.c +++ b/drivers/usb/phy/otg-wakeupsource.c @@ -47,7 +47,8 @@ static void otgws_handle_event(struct usb_phy *otgws_xceiv, unsigned long event) case USB_EVENT_NONE: case USB_EVENT_ID: case USB_EVENT_CHARGER: - __pm_relax(&otgws_xceiv->wsource); + __pm_wakeup_event(&otgws_xceiv->wsource, + msecs_to_jiffies(TEMPORARY_HOLD_TIME)); break; default: diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index c71cf15..f8f9f1f 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -12,6 +12,8 @@ #include <linux/notifier.h> #include <linux/usb.h> +#define TEMPORARY_HOLD_TIME 2000 + enum usb_phy_interface { USBPHY_INTERFACE_MODE_UNKNOWN, USBPHY_INTERFACE_MODE_UTMI, -- 1.8.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
