Commit 5e5caf4f authored by Thinh Nguyen's avatar Thinh Nguyen Committed by Felipe Balbi

usb: gadget: composite: Inform controller driver of self-powered

Different configuration/condition may draw different power. Inform the
controller driver of the change so it can respond properly (e.g.
GET_STATUS request). This fixes an issue with setting MaxPower from
configfs. The composite driver doesn't check this value when setting
self-powered.

Cc: stable@vger.kernel.org
Fixes: 88af8bbe ("usb: gadget: the start of the configfs interface")
Signed-off-by: default avatarThinh Nguyen <thinhn@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent eeead847
...@@ -861,6 +861,11 @@ static int set_config(struct usb_composite_dev *cdev, ...@@ -861,6 +861,11 @@ static int set_config(struct usb_composite_dev *cdev,
else else
power = min(power, 900U); power = min(power, 900U);
done: done:
if (power <= USB_SELF_POWER_VBUS_MAX_DRAW)
usb_gadget_set_selfpowered(gadget);
else
usb_gadget_clear_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)
result = USB_GADGET_DELAYED_STATUS; result = USB_GADGET_DELAYED_STATUS;
...@@ -2279,6 +2284,7 @@ void composite_suspend(struct usb_gadget *gadget) ...@@ -2279,6 +2284,7 @@ void composite_suspend(struct usb_gadget *gadget)
cdev->suspended = 1; cdev->suspended = 1;
usb_gadget_set_selfpowered(gadget);
usb_gadget_vbus_draw(gadget, 2); usb_gadget_vbus_draw(gadget, 2);
} }
...@@ -2307,6 +2313,9 @@ void composite_resume(struct usb_gadget *gadget) ...@@ -2307,6 +2313,9 @@ 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)
usb_gadget_clear_selfpowered(gadget);
usb_gadget_vbus_draw(gadget, maxpower); usb_gadget_vbus_draw(gadget, maxpower);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment