From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF5C5C7619D for ; Thu, 20 Feb 2020 01:40:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93B2821D56 for ; Thu, 20 Feb 2020 01:40:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727135AbgBTBka (ORCPT ); Wed, 19 Feb 2020 20:40:30 -0500 Received: from kernel.crashing.org ([76.164.61.194]:32960 "EHLO kernel.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726784AbgBTBka (ORCPT ); Wed, 19 Feb 2020 20:40:30 -0500 Received: from localhost (gate.crashing.org [63.228.1.57]) (authenticated bits=0) by kernel.crashing.org (8.14.7/8.14.7) with ESMTP id 01K1dkWX028195 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 19 Feb 2020 19:39:49 -0600 Message-ID: <55e77bcb37ec780094b8d226f89bd5557e30d913.camel@kernel.crashing.org> Subject: Re: [PATCH 2/2] usb: gadget: aspeed: fixup usb1 device descriptor at init time From: Benjamin Herrenschmidt To: rentao.bupt@gmail.com, Felipe Balbi , Greg Kroah-Hartman , Joel Stanley , Andrew Jeffery , Chunfeng Yun , Colin Ian King , Stephen Boyd , Rob Herring , Mark Rutland , linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, openbmc@lists.ozlabs.org, taoren@fb.com Date: Thu, 20 Feb 2020 12:39:45 +1100 In-Reply-To: <20200218235600.6763-3-rentao.bupt@gmail.com> References: <20200218235600.6763-1-rentao.bupt@gmail.com> <20200218235600.6763-3-rentao.bupt@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Tue, 2020-02-18 at 15:56 -0800, rentao.bupt@gmail.com wrote: > From: Tao Ren > > This patch moves fixup-usb1-device-descriptor logic from get_descriptor > handler to "ast_vhub_fixup_dev_desc" function so the device descriptor > is only patched once (at vhub init time). I don't like this either. We should make ast_vhub_dev_desc and patch a copy here too. I know today there's only one instance of the vhub in a given SoC but that might not always be the case. > Signed-off-by: Tao Ren > --- > drivers/usb/gadget/udc/aspeed-vhub/hub.c | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/drivers/usb/gadget/udc/aspeed-vhub/hub.c b/drivers/usb/gadget/udc/aspeed-vhub/hub.c > index 4e3ef83283a6..b8bf54b12adc 100644 > --- a/drivers/usb/gadget/udc/aspeed-vhub/hub.c > +++ b/drivers/usb/gadget/udc/aspeed-vhub/hub.c > @@ -76,13 +76,6 @@ static struct usb_device_descriptor ast_vhub_dev_desc = { > .bNumConfigurations = 1, > }; > > -/* Patches to the above when forcing USB1 mode */ > -static void ast_vhub_patch_dev_desc_usb1(struct usb_device_descriptor *desc) > -{ > - desc->bcdUSB = cpu_to_le16(0x0100); > - desc->bDeviceProtocol = 0; > -} > - > /* > * Configuration descriptor: same comments as above > * regarding handling USB1 mode. > @@ -316,10 +309,6 @@ static int ast_vhub_rep_desc(struct ast_vhub_ep *ep, > if (len > dsize) > len = dsize; > > - /* Patch it if forcing USB1 */ > - if (desc_type == USB_DT_DEVICE && ep->vhub->force_usb1) > - ast_vhub_patch_dev_desc_usb1(ep->buf); > - > /* Shoot it from the EP buffer */ > return ast_vhub_reply(ep, NULL, len); > } > @@ -878,6 +867,15 @@ static void ast_vhub_fixup_dev_desc(struct ast_vhub *vhub) > if (of_str[id]) > ast_vhub_str_array[i].s = of_str[id]; > } > + > + /* > + * Update USB Release Number and Protocol code if vhub is running > + * at USB 1.x speed. > + */ > + if (vhub->force_usb1) { > + ast_vhub_dev_desc.bcdUSB = cpu_to_le16(0x0100); > + ast_vhub_dev_desc.bDeviceProtocol = 0; > + } > } > > void ast_vhub_init_hub(struct ast_vhub *vhub)