Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Peter Chen <peter.chen@nxp.com>
To:     Wesley Cheng <wcheng@codeaurora.org>
CC:     "balbi@kernel.org" <balbi@kernel.org>,
        "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "jackp@codeaurora.org" <jackp@codeaurora.org>
Subject: Re: [PATCH 2/3] usb: gadget: composite: Split composite reset and
 disconnect
Thread-Topic: [PATCH 2/3] usb: gadget: composite: Split composite reset and
 disconnect
Thread-Index: AQHWul46tgzH+l3JtUq0myvSjgQebKnKyGiA
Date:   Mon, 16 Nov 2020 13:44:44 +0000
Message-ID: <20201116134415.GE28313@b29397-desktop>
References: <20201114081247.25063-1-wcheng@codeaurora.org>
 <20201114081247.25063-3-wcheng@codeaurora.org>
In-Reply-To: <20201114081247.25063-3-wcheng@codeaurora.org>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <3E85BF8C3D8C6E4AB828D102E9C44787@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 99de4b26-ed5e-4129-55dc-08d88a35c6a7
X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Nov 2020 13:44:44.2784
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: dJD5z4wSEwViixBH7YoO1U4q/Qc2+/sAVRreBYkj6vNSm5risHx5FIqo6B9A8CQWspG1hZuXFSIO7LOqOqlLFg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB6715
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 20-11-14 00:12:46, Wesley Cheng wrote:
> Add a specific composite reset API to differentiate between disconnect an=
d
> reset events.  This is needed for adjusting the current draw accordingly
> based on the USB battery charging specification.  The device is only allo=
wed
> to draw the 500/900 mA (HS/SS) while in the CONFIGURED state, and only 10=
0 mA
> in the connected and UNCONFIGURED state.
>=20
> Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>

Reviewed-by: Peter Chen <peter.chen@nxp.com>

Peter
> ---
>  drivers/usb/gadget/composite.c | 21 +++++++++++++++++++--
>  include/linux/usb/composite.h  |  2 ++
>  2 files changed, 21 insertions(+), 2 deletions(-)
>=20
> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composit=
e.c
> index 05b176c82cc5..a41f7fe4b518 100644
> --- a/drivers/usb/gadget/composite.c
> +++ b/drivers/usb/gadget/composite.c
> @@ -2036,7 +2036,7 @@ composite_setup(struct usb_gadget *gadget, const st=
ruct usb_ctrlrequest *ctrl)
>  	return value;
>  }
> =20
> -void composite_disconnect(struct usb_gadget *gadget)
> +static void __composite_disconnect(struct usb_gadget *gadget)
>  {
>  	struct usb_composite_dev	*cdev =3D get_gadget_data(gadget);
>  	unsigned long			flags;
> @@ -2053,6 +2053,23 @@ void composite_disconnect(struct usb_gadget *gadge=
t)
>  	spin_unlock_irqrestore(&cdev->lock, flags);
>  }
> =20
> +void composite_disconnect(struct usb_gadget *gadget)
> +{
> +	usb_gadget_vbus_draw(gadget, 0);
> +	__composite_disconnect(gadget);
> +}
> +
> +void composite_reset(struct usb_gadget *gadget)
> +{
> +	/*
> +	 * Section 1.4.13 Standard Downstream Port of the USB battery charging
> +	 * specification v1.2 states that a device connected on a SDP shall onl=
y
> +	 * draw at max 100mA while in a connected, but unconfigured state.
> +	 */
> +	usb_gadget_vbus_draw(gadget, 100);
> +	__composite_disconnect(gadget);
> +}
> +
>  /*----------------------------------------------------------------------=
---*/
> =20
>  static ssize_t suspended_show(struct device *dev, struct device_attribut=
e *attr,
> @@ -2373,7 +2390,7 @@ static const struct usb_gadget_driver composite_dri=
ver_template =3D {
>  	.unbind		=3D composite_unbind,
> =20
>  	.setup		=3D composite_setup,
> -	.reset		=3D composite_disconnect,
> +	.reset		=3D composite_reset,
>  	.disconnect	=3D composite_disconnect,
> =20
>  	.suspend	=3D composite_suspend,
> diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.=
h
> index 2040696d75b6..0d8a71471512 100644
> --- a/include/linux/usb/composite.h
> +++ b/include/linux/usb/composite.h
> @@ -525,6 +525,8 @@ extern struct usb_string *usb_gstrings_attach(struct =
usb_composite_dev *cdev,
>  extern int usb_string_ids_n(struct usb_composite_dev *c, unsigned n);
> =20
>  extern void composite_disconnect(struct usb_gadget *gadget);
> +extern void composite_reset(struct usb_gadget *gadget);
> +
>  extern int composite_setup(struct usb_gadget *gadget,
>  		const struct usb_ctrlrequest *ctrl);
>  extern void composite_suspend(struct usb_gadget *gadget);
> --=20
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum=
,
> a Linux Foundation Collaborative Project
>=20

--=20

Thanks,
Peter Chen=