Commit 40e89ff5 authored by Prashanth K's avatar Prashanth K Committed by Greg Kroah-Hartman
Browse files

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: 5e5caf4f ("usb: gadget: composite: Inform controller driver of self-powered")
Signed-off-by: default avatarPrashanth K <prashanth.k@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250217120328.2446639-1-prashanth.k@oss.qualcomm.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17c2c87c

drivers/usb/gadget/composite.c

+11 −5
Original line number Diff line number Diff line
@@ -1050,10 +1050,11 @@ static int set_config(struct usb_composite_dev *cdev, 
	else

		usb_gadget_set_remote_wakeup(gadget, 0);

done:

	if (power <= USB_SELF_POWER_VBUS_MAX_DRAW)

		usb_gadget_set_selfpowered(gadget);

	else

	if (power > USB_SELF_POWER_VBUS_MAX_DRAW ||

	    !(c->bmAttributes & USB_CONFIG_ATT_SELFPOWER))

		usb_gadget_clear_selfpowered(gadget);

	else

		usb_gadget_set_selfpowered(gadget);



	usb_gadget_vbus_draw(gadget, power);

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


	cdev->suspended = 1;



	if (cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)

		usb_gadget_set_selfpowered(gadget);



	usb_gadget_vbus_draw(gadget, 2);

}
@@ -2649,8 +2652,11 @@ void composite_resume(struct usb_gadget *gadget) 
		else

			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);

		else

			usb_gadget_set_selfpowered(gadget);



		usb_gadget_vbus_draw(gadget, maxpower);

	} else {