Commit 923eaf9d authored Feb 03, 2020 by Thinh Nguyen Committed by Mayank Rana Jun 25, 2020

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: Thinh Nguyen <thinhn@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Git-commit: 5e5caf4fa8d3039140b4548b6ab23dd17fce9b2c
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Change-Id: I96588f97d32c9b6d80302e601cb0cc8d771c1296
Signed-off-by: Mayank Rana <mrana@codeaurora.org>

parent 9faf140c

drivers/usb/gadget/composite.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -906,6 +906,11 @@ static int set_config(struct usb_composite_dev *cdev,
		else
		power = min(power, 900U);
		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);
		if (result >= 0 && cdev->delayed_status)
		result = USB_GADGET_DELAYED_STATUS;
		@@ -2330,6 +2335,7 @@ void composite_suspend(struct usb_gadget *gadget)

		cdev->suspended = 1;

		usb_gadget_set_selfpowered(gadget);
		usb_gadget_vbus_draw(gadget, 2);
		}

		@@ -2358,6 +2364,9 @@ void composite_resume(struct usb_gadget *gadget)
		else
		maxpower = min(maxpower, 900U);

		if (maxpower > USB_SELF_POWER_VBUS_MAX_DRAW)
		usb_gadget_clear_selfpowered(gadget);

		usb_gadget_vbus_draw(gadget, maxpower);
		}