mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-08 12:40:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: gadget: Set self-powered based on MaxPower and bmAttributes

Browse source 
Currently the USB gadget will be set as bus-powered based solely
on whether its bMaxPower is greater than 100mA, but this may miss
devices that may legitimately draw less than 100mA but still want
to report as bus-powered. Similarly during suspend & resume, USB
gadget is incorrectly marked as bus/self powered without checking
the bmAttributes field. Fix these by configuring the USB gadget
as self or bus powered based on bmAttributes, and explicitly set
it as bus-powered if it draws more than 100mA.

Cc: stable <stable@kernel.org>
Fixes: 5e5caf4fa8 ("usb: gadget: composite: Inform controller driver of self-powered")
Signed-off-by: Prashanth K <prashanth.k@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250217120328.2446639-1-prashanth.k@oss.qualcomm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Prashanth K 2025-02-17 17:33:28 +05:30 committed by Greg Kroah-Hartman
parent 17c2c87c37
commit 40e89ff575
1 changed files with 11 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/usb/gadget/composite.c
View file

@ -1050,10 +1050,11 @@ static int set_config(struct usb_composite_dev *cdev,
else else
usb_gadget_set_remote_wakeup(gadget, 0); usb_gadget_set_remote_wakeup(gadget, 0);
done: done:
if (power <= USB_SELF_POWER_VBUS_MAX_DRAW) if (power > USB_SELF_POWER_VBUS_MAX_DRAW ||
usb_gadget_set_selfpowered(gadget); !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
else
usb_gadget_clear_selfpowered(gadget); usb_gadget_clear_selfpowered(gadget);
else
usb_gadget_set_selfpowered(gadget);
usb_gadget_vbus_draw(gadget, power); usb_gadget_vbus_draw(gadget, power);
if (result >= 0 && cdev->delayed_status) if (result >= 0 && cdev->delayed_status)
@ -2615,7 +2616,9 @@ void composite_suspend(struct usb_gadget *gadget)
cdev->suspended = 1; cdev->suspended = 1;
usb_gadget_set_selfpowered(gadget); if (cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)
usb_gadget_set_selfpowered(gadget);
usb_gadget_vbus_draw(gadget, 2); usb_gadget_vbus_draw(gadget, 2);
} }
@ -2649,8 +2652,11 @@ void composite_resume(struct usb_gadget *gadget)
else else
maxpower = min(maxpower, 900U); maxpower = min(maxpower, 900U);
if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW) if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW ||
!(cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
usb_gadget_clear_selfpowered(gadget); usb_gadget_clear_selfpowered(gadget);
else
usb_gadget_set_selfpowered(gadget);
usb_gadget_vbus_draw(gadget, maxpower); usb_gadget_vbus_draw(gadget, maxpower);
} else { } else {