Skip to content

Commit 40e89ff

Browse files
Prashanth Kgregkh
authored andcommitted
usb: gadget: Set self-powered based on MaxPower and bmAttributes
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: 5e5caf4 ("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>
1 parent 17c2c87 commit 40e89ff

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

drivers/usb/gadget/composite.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,10 +1050,11 @@ static int set_config(struct usb_composite_dev *cdev,
10501050
else
10511051
usb_gadget_set_remote_wakeup(gadget, 0);
10521052
done:
1053-
if (power <= USB_SELF_POWER_VBUS_MAX_DRAW)
1054-
usb_gadget_set_selfpowered(gadget);
1055-
else
1053+
if (power > USB_SELF_POWER_VBUS_MAX_DRAW ||
1054+
!(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
10561055
usb_gadget_clear_selfpowered(gadget);
1056+
else
1057+
usb_gadget_set_selfpowered(gadget);
10571058

10581059
usb_gadget_vbus_draw(gadget, power);
10591060
if (result >= 0 && cdev->delayed_status)
@@ -2615,7 +2616,9 @@ void composite_suspend(struct usb_gadget *gadget)
26152616

26162617
cdev->suspended = 1;
26172618

2618-
usb_gadget_set_selfpowered(gadget);
2619+
if (cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)
2620+
usb_gadget_set_selfpowered(gadget);
2621+
26192622
usb_gadget_vbus_draw(gadget, 2);
26202623
}
26212624

@@ -2649,8 +2652,11 @@ void composite_resume(struct usb_gadget *gadget)
26492652
else
26502653
maxpower = min(maxpower, 900U);
26512654

2652-
if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW)
2655+
if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW ||
2656+
!(cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER))
26532657
usb_gadget_clear_selfpowered(gadget);
2658+
else
2659+
usb_gadget_set_selfpowered(gadget);
26542660

26552661
usb_gadget_vbus_draw(gadget, maxpower);
26562662
} else {

0 commit comments

Comments
 (0)