mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: Export usb_wakeup_enabled_descendants()

Browse Source 
In (e583d9d USB: global suspend and remote wakeup don't mix) we
introduced wakeup_enabled_descendants() as a static function.  We'd
like to use this function in USB controller drivers to know if we
should keep the controller on during suspend time, since doing so has
a power impact.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
This commit is contained in:
Douglas Anderson
2019-04-17 17:13:53 -07:00
committed by Felipe Balbi
parent 6f6d70597c
commit 7a6127e39a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/core/hub.c
View File

@@ -3174,13 +3174,14 @@ static int usb_disable_remote_wakeup(struct usb_device *udev)
} }
/* Count of wakeup-enabled devices at or below udev */ /* Count of wakeup-enabled devices at or below udev */
static unsigned wakeup_enabled_descendants(struct usb_device *udev) unsigned usb_wakeup_enabled_descendants(struct usb_device *udev)
{ {
struct usb_hub *hub = usb_hub_to_struct_hub(udev); struct usb_hub *hub = usb_hub_to_struct_hub(udev);
return udev->do_remote_wakeup + return udev->do_remote_wakeup +
(hub ? hub->wakeup_enabled_descendants : 0); (hub ? hub->wakeup_enabled_descendants : 0);
} }
EXPORT_SYMBOL_GPL(usb_wakeup_enabled_descendants);
/* /*
* usb_port_suspend - suspend a usb device's upstream port * usb_port_suspend - suspend a usb device's upstream port
@@ -3282,7 +3283,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
* Therefore we will turn on the suspend feature if udev or any of its * Therefore we will turn on the suspend feature if udev or any of its
* descendants is enabled for remote wakeup. * descendants is enabled for remote wakeup.
*/ */
else if (PMSG_IS_AUTO(msg) || wakeup_enabled_descendants(udev) > 0) else if (PMSG_IS_AUTO(msg) || usb_wakeup_enabled_descendants(udev) > 0)
status = set_port_feature(hub->hdev, port1, status = set_port_feature(hub->hdev, port1,
USB_PORT_FEAT_SUSPEND); USB_PORT_FEAT_SUSPEND);
else { else {
@@ -3687,7 +3688,7 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
} }
if (udev) if (udev)
hub->wakeup_enabled_descendants += hub->wakeup_enabled_descendants +=
wakeup_enabled_descendants(udev); usb_wakeup_enabled_descendants(udev);
} }
if (hdev->do_remote_wakeup && hub->quirk_check_port_auto_suspend) { if (hdev->do_remote_wakeup && hub->quirk_check_port_auto_suspend) {

5
include/linux/usb/hcd.h
View File

@@ -652,11 +652,16 @@ extern wait_queue_head_t usb_kill_urb_queue;
#define usb_endpoint_out(ep_dir) (!((ep_dir) & USB_DIR_IN)) #define usb_endpoint_out(ep_dir) (!((ep_dir) & USB_DIR_IN))
#ifdef CONFIG_PM #ifdef CONFIG_PM
extern unsigned usb_wakeup_enabled_descendants(struct usb_device *udev);
extern void usb_root_hub_lost_power(struct usb_device *rhdev); extern void usb_root_hub_lost_power(struct usb_device *rhdev);
extern int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg); extern int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg);
extern int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg); extern int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg);
extern void usb_hcd_resume_root_hub(struct usb_hcd *hcd); extern void usb_hcd_resume_root_hub(struct usb_hcd *hcd);
#else #else
static inline unsigned usb_wakeup_enabled_descendants(struct usb_device *udev)
{
return 0;
}
static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd) static inline void usb_hcd_resume_root_hub(struct usb_hcd *hcd)
{ {
return; return;