From patchwork Tue Nov 30 10:42:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Liu X-Patchwork-Id: 12694178 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A9AE8C433EF for ; Tue, 30 Nov 2021 14:10:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tos+GKJxR64FQ9Ev5mBFIpbWHgoEWBk320DHNeIXP+g=; b=EDu9N9birre0n/ mraxmotASwpQDBcpGgzoRoedtM5WDTHEBX2p9VuUBG+1LigDt8xd7y6805HfuCY1yuU4710eB7TQA t+y2g4uAG5EViG4YoReciNqDLjgVuUuk3AZwVR7nKvM1mV9xGCWK1HB114kyk6zuHMAAHJgJI8rDI 9bjDL1G8Z9JyKPZuJy5Yll9YSOdZATdNQbAJkmH1AYzAX1nMQflx3tt2c3Li4grAcW5v+NuwaIu2y xwTupJPlvzg1d0zWaiRNmX4VQ8MmMTsrdVxRm5BnIjZdq9UiNXa4y/Oq1K4w7CI4IM8mTQMcb1ai6 4dJdhxQJGBX4apFv2jdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3oQ-005Uup-MQ; Tue, 30 Nov 2021 14:08:51 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3lz-005TwS-NO for linux-arm-kernel@bombadil.infradead.org; Tue, 30 Nov 2021 14:06:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=qSgeo0WAwGLuZPSodDUN1zXQkkrJ4IB/9Xhs20lIsBs=; b=XsiwwuOhxXP5vp1B0YSst/0SkY 0Qkwz8Ssjgln894JzM9Iy3e7MEr3TXmRQpduQaTyGJnovqXHHlzrNU2qQ94x7ukTzpsvSvf6k97vi tO1giEzOhw1C9GRMY6ZL2/9Sr1EgwaCn42/qV2VKuN1iABg4iz2K9JBp/fDUnWqnY2AScwy+THU16 qQCAo+ujUuIWTJTjc+Jacy3Kv22wUDxE3HTbMjY2jsuVtluUXk9aDUoX0/AcBOenmV5U7caec8ToD b+EZX7oXA1bZsyVr4QQIkvLemhISQG6mVK1qeLEapnVLwExoYbRStWXD9+493u8R5uHxlIElisBlk bRE1ckmw==; Received: from twspam01.aspeedtech.com ([211.20.114.71]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms0cL-001Qq3-Jp for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 10:44:15 +0000 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1AUAIVbw077385; Tue, 30 Nov 2021 18:18:31 +0800 (GMT-8) (envelope-from neal_liu@aspeedtech.com) Received: from localhost.localdomain (192.168.10.10) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Nov 2021 18:43:03 +0800 From: Neal Liu To: Felipe Balbi , Greg Kroah-Hartman , Joel Stanley , Andrew Jeffery , Cai Huoqing , Tao Ren , Julia Lawall , "kernel test robot" , Sasha Levin , , , , CC: Neal Liu , Subject: [PATCH v2 1/4] usb: aspeed-vhub: add qualifier descriptor Date: Tue, 30 Nov 2021 18:42:53 +0800 Message-ID: <20211130104256.3106797-2-neal_liu@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130104256.3106797-1-neal_liu@aspeedtech.com> References: <20211130104256.3106797-1-neal_liu@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.10.10] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1AUAIVbw077385 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_104410_262387_32B1DE5C X-CRM114-Status: GOOD ( 12.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Support qualifier descriptor to pass USB30CV compliance test. Signed-off-by: Neal Liu --- drivers/usb/gadget/udc/aspeed-vhub/hub.c | 24 +++++++++++++++++++++++ drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 1 + 2 files changed, 25 insertions(+) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/hub.c b/drivers/usb/gadget/udc/aspeed-vhub/hub.c index b9960fdd8a51..93f27a745760 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/hub.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/hub.c @@ -68,6 +68,18 @@ static const struct usb_device_descriptor ast_vhub_dev_desc = { .bNumConfigurations = 1, }; +static const struct usb_qualifier_descriptor ast_vhub_qual_desc = { + .bLength = 0xA, + .bDescriptorType = USB_DT_DEVICE_QUALIFIER, + .bcdUSB = cpu_to_le16(0x0200), + .bDeviceClass = USB_CLASS_HUB, + .bDeviceSubClass = 0, + .bDeviceProtocol = 0, + .bMaxPacketSize0 = 64, + .bNumConfigurations = 1, + .bRESERVED = 0, +}; + /* * Configuration descriptor: same comments as above * regarding handling USB1 mode. @@ -271,9 +283,11 @@ static int ast_vhub_rep_desc(struct ast_vhub_ep *ep, BUILD_BUG_ON(dsize > sizeof(vhub->vhub_dev_desc)); BUILD_BUG_ON(USB_DT_DEVICE_SIZE >= AST_VHUB_EP0_MAX_PACKET); break; + case USB_DT_OTHER_SPEED_CONFIG: case USB_DT_CONFIG: dsize = AST_VHUB_CONF_DESC_SIZE; memcpy(ep->buf, &vhub->vhub_conf_desc, dsize); + ((u8 *)ep->buf)[1] = desc_type; BUILD_BUG_ON(dsize > sizeof(vhub->vhub_conf_desc)); BUILD_BUG_ON(AST_VHUB_CONF_DESC_SIZE >= AST_VHUB_EP0_MAX_PACKET); break; @@ -283,6 +297,10 @@ static int ast_vhub_rep_desc(struct ast_vhub_ep *ep, BUILD_BUG_ON(dsize > sizeof(vhub->vhub_hub_desc)); BUILD_BUG_ON(AST_VHUB_HUB_DESC_SIZE >= AST_VHUB_EP0_MAX_PACKET); break; + case USB_DT_DEVICE_QUALIFIER: + dsize = sizeof(vhub->vhub_qual_desc); + memcpy(ep->buf, &vhub->vhub_qual_desc, dsize); + break; default: return std_req_stall; } @@ -428,6 +446,8 @@ enum std_req_rc ast_vhub_std_hub_request(struct ast_vhub_ep *ep, switch (wValue >> 8) { case USB_DT_DEVICE: case USB_DT_CONFIG: + case USB_DT_DEVICE_QUALIFIER: + case USB_DT_OTHER_SPEED_CONFIG: return ast_vhub_rep_desc(ep, wValue >> 8, wLength); case USB_DT_STRING: @@ -1033,6 +1053,10 @@ static int ast_vhub_init_desc(struct ast_vhub *vhub) else ret = ast_vhub_str_alloc_add(vhub, &ast_vhub_strings); + /* Initialize vhub Qualifier Descriptor. */ + memcpy(&vhub->vhub_qual_desc, &ast_vhub_qual_desc, + sizeof(vhub->vhub_qual_desc)); + return ret; } diff --git a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h index 87a5dea12d3c..6b9dfa6e10eb 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h +++ b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h @@ -425,6 +425,7 @@ struct ast_vhub { struct ast_vhub_full_cdesc vhub_conf_desc; struct usb_hub_descriptor vhub_hub_desc; struct list_head vhub_str_desc; + struct usb_qualifier_descriptor vhub_qual_desc; }; /* Standard request handlers result codes */ From patchwork Tue Nov 30 10:42:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Liu X-Patchwork-Id: 12694182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 673C2C433F5 for ; Tue, 30 Nov 2021 14:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=h1nIv1uwtF1XySOjZtqmT1SD7vUAwlDXCum8HpwNMx8=; b=tALGqMtH5LuM81 UCSfHm0xzLbuiDu4YKpLtgtv0EPwgEmuIwQ+HaKZqxFtVRuWJPoNZdisdWQ9w6ZEujIkaNB5LN0t2 eHCc76ELSaV4sI+3Ua7AFnAg2T9+wghT9dYM9wjX7pVIe2hPSEevpJeL6QoMqbejTOuv6m7TdQxcn 9C4/dQAxNFk589pbz8CjwJZH7fbmkAuSKA+jzchZwxwy1mLgI0JDqYKpqtTZaDAy+9h/F0ruhh0QG kK2ZMnZvOle6OATLzSNVdNP4d+P70lRdzf/K+szHqeqNI8p68QKehCIH4QRdsb5tJ6xCh7RsAr1WN oWUefOFeZg4WhWXucqEg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3qu-005W8x-Sy; Tue, 30 Nov 2021 14:11:26 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3m6-005TyH-BU for linux-arm-kernel@bombadil.infradead.org; Tue, 30 Nov 2021 14:06:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=jUjspTKvXSvBRdcPYGlZgUUfKqI+QOCRZk3gHIjCrtE=; b=BPUjThbhBBplWj4i99hsB5RKVE p4BWXQ50ZtabGUtjHE5cFE1QUBwNUvHCpNc5RtWgd4q9IB5GCiwVq6QeFFhAIH0Nn4pHfmAZ/j3bY 5TPv+RunlVdanrJaQSNQ/NRWA83z0BBEyBH1HOLxhILF0aB5oP/uU1+CTC54PYXX+9AA8j+5nySsw k9dF1kNKMpIsNo1TxV7qqjyWIsxOABjVVgRbBCXCHoCZrp+PZbtb+U1hLzNxoeMbYSfo1hI9PJYjF b+GEyFgdMk12rM7Pqqt0L57FgsvQysb7JfzVAwhwW3xcJAowP42vWGspI0+rQPCJUfFvtIoVKlR0Y aPU1Z0Fw==; Received: from twspam01.aspeedtech.com ([211.20.114.71]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms0cN-001QqF-Fm for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 10:44:15 +0000 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1AUAIVHG077386; Tue, 30 Nov 2021 18:18:31 +0800 (GMT-8) (envelope-from neal_liu@aspeedtech.com) Received: from localhost.localdomain (192.168.10.10) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Nov 2021 18:43:03 +0800 From: Neal Liu To: Felipe Balbi , Greg Kroah-Hartman , Joel Stanley , Andrew Jeffery , Cai Huoqing , Tao Ren , Julia Lawall , "kernel test robot" , Sasha Levin , , , , CC: Neal Liu , Subject: [PATCH v2 2/4] usb: aspeed-vhub: support auto remote wakeup feature Date: Tue, 30 Nov 2021 18:42:54 +0800 Message-ID: <20211130104256.3106797-3-neal_liu@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130104256.3106797-1-neal_liu@aspeedtech.com> References: <20211130104256.3106797-1-neal_liu@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.10.10] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1AUAIVHG077386 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_104412_063992_789C32EC X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remote wakeup signaling will be automatically issued whenever any write commands has been received in suspend state. Signed-off-by: Neal Liu --- drivers/usb/gadget/udc/aspeed-vhub/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/core.c b/drivers/usb/gadget/udc/aspeed-vhub/core.c index 7a635c499777..122ee7ef0b03 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/core.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/core.c @@ -240,6 +240,9 @@ void ast_vhub_init_hw(struct ast_vhub *vhub) if (vhub->force_usb1) ctrl |= VHUB_CTRL_FULL_SPEED_ONLY; + /* Enable auto remote wakeup */ + ctrl |= VHUB_CTRL_AUTO_REMOTE_WAKEUP; + ctrl |= VHUB_CTRL_UPSTREAM_CONNECT; writel(ctrl, vhub->regs + AST_VHUB_CTRL); From patchwork Tue Nov 30 10:42:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Liu X-Patchwork-Id: 12694183 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EB540C433EF for ; Tue, 30 Nov 2021 14:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NHn9t7455/76F7fHaeUwKdDhME69IMFRp3gOsnahjug=; b=gDQByyx/hFN46x I9KwnziiqAEVY6OKDzqL17SqdAC+9ePjqiL0VfnIZEBcq4Kf3evTiP82yiZTW21/S+bTT+wTIrJxZ fwuPz3Ufqr12yycV3ulRdgmx46H7cch9KeU5mv01CRrQSy1kkSJufkAw40CaWK6dO4o7Wooz1Tcz9 16UUcLI9wHHI8NGXbqc/r9CWKTc9tCZt43eItf68oDb0PJAooKBoVHiYh6oI5DGOhwDeXkjQWsjXL gJ2SWtoNzYcII0K43ga57Ec1BDBU5DnQ253HRgabtQxXAzPSMPH87f6I8Hr9OgDj5Zt7EdhaYyyyD k9ekPJPtEnUOFrm4WZYg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3rZ-005WPz-Fi; Tue, 30 Nov 2021 14:12:06 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3m7-005TyY-Ne for linux-arm-kernel@bombadil.infradead.org; Tue, 30 Nov 2021 14:06:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=ZpVxZsGFWGfXH9myqI9EPec/HI3bfSnyUqKFq6iSZu0=; b=SaNgbMNocaPjE72xKK/DkealRf zyMaz//EuZz0Ckd/ucW7OEjaV7H8p94civj23x/2vOAosfv0k4JbGRSCvWPreTP35dlihG7h2sgaU 9OxJzNILxvvYpe/Z4NYGItc8e5px0CzakgZgZuWqLJnwBxCaE8L0r+I84EWn1ZnOA0/5epvabtv6l JrXV362F4UOaR7Fz6BvS/Cc7hlzefibOuNH9IxLsJvrEzFaMM/GJwtDkmKrJGZdi1xVW2ioNpsyR5 PF1DVVaqfcUYk5v2NqTXdOWW7LDyJvOMOGPTZQm3IiKZTqObL7rDvsB1jjQyAFM/U9+Nwi8/ZszBY j/dgzreQ==; Received: from twspam01.aspeedtech.com ([211.20.114.71]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms0cK-001QqG-PX for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 10:44:13 +0000 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1AUAIV9q077387; Tue, 30 Nov 2021 18:18:31 +0800 (GMT-8) (envelope-from neal_liu@aspeedtech.com) Received: from localhost.localdomain (192.168.10.10) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Nov 2021 18:43:03 +0800 From: Neal Liu To: Felipe Balbi , Greg Kroah-Hartman , Joel Stanley , Andrew Jeffery , Cai Huoqing , Tao Ren , Julia Lawall , "kernel test robot" , Sasha Levin , , , , CC: Neal Liu , , "Benjamin Herrenschmidt" Subject: [PATCH v2 3/4] usb: aspeed-vhub: fix ep0 OUT ack received wrong length issue Date: Tue, 30 Nov 2021 18:42:55 +0800 Message-ID: <20211130104256.3106797-4-neal_liu@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130104256.3106797-1-neal_liu@aspeedtech.com> References: <20211130104256.3106797-1-neal_liu@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.10.10] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1AUAIV9q077387 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_104409_406568_AD143EE6 X-CRM114-Status: UNSURE ( 9.78 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If multiple devices in vhub are enumerated simultaneously, ep0 OUT ack might received wrong data length. Using expected data length instead. Acked-by: Benjamin Herrenschmidt Signed-off-by: Neal Liu --- drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/ep0.c b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c index 74ea36c19b1e..bea9cbb191a2 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/ep0.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/ep0.c @@ -251,6 +251,13 @@ static void ast_vhub_ep0_do_receive(struct ast_vhub_ep *ep, struct ast_vhub_req len = remain; rc = -EOVERFLOW; } + + /* HW return wrong data len */ + if (len < ep->ep.maxpacket && len != remain) { + EPDBG(ep, "using expected data len instead\n"); + len = remain; + } + if (len && req->req.buf) memcpy(req->req.buf + req->req.actual, ep->buf, len); req->req.actual += len; From patchwork Tue Nov 30 10:42:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Liu X-Patchwork-Id: 12694179 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4E82C433F5 for ; Tue, 30 Nov 2021 14:11:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Js+QdBdorlIDST8fcArKoIrrThz1LeaHiLPGy8vOR4U=; b=ILvj6mHigYDN4z Q8/jSgFEEb6O6zZ1znC6rvGgDUbkxy6AePojQDiMygc6XhsKarXizARZTUbKMbtYGfK6gF2YwIAIF BibPyaKCs89BIwxmfH6ql5YOnFfLjNibmZrn5Z3k9kGPd9CI25h1AcukviWLJsI8g/xfdTgEHcn5k Ca/LPqljedmqgfH0LlwmkDAzNMaEUA52gJdDOyI5b546lsw8wl5rCs6u9jYTS4PDHk3F3TIywSH9c +SdRBI/DkYWK/EPjmqwwSdWDZr07lMhs3CsVw16sfM89cmH0qfXc9s4/LZQNKdZ1MeEzgeKK9tyWk pFLOwIf5Ja2JTCPwu1vA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3p8-005VFI-0Z; Tue, 30 Nov 2021 14:09:34 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms3m1-005Tws-Tj for linux-arm-kernel@bombadil.infradead.org; Tue, 30 Nov 2021 14:06:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=id0pk3EzURUoND5AnQJcTrq4F5cyT+l3Sw81DBJcRN4=; b=feazc2jY70oi/WGJnHo3hMzmqI I8hon6d6eVw3V2Z2TBeoSA/cTVfXGz6lNkyOE2IDwotkaK1nA5oaVguiSZfgJg7hi87xCnsc00cBw S9kheYqEkbUBYpbwduRzgo290CrkqwKWxtCrlhqVf3owqp6nMmdr359m7dOgDjDt/quiK2nRvMNx5 p654lDHtaRYMx8maVYipcvGv0PlyE7axDv+flkoVEG2GBNFRdZopySdffli9Mtr957QX/zcdVEC6O yXczHRMbh+yZHOtw4Y5ONiFncv0M0z1iu5a2DmMmDAkmLrS4zgZi1md5l0Q+G22VOcolgdfMsy5rI VYI8oZww==; Received: from twspam01.aspeedtech.com ([211.20.114.71]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms0cL-001QqJ-9J for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 10:44:13 +0000 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 1AUAIWAq077388; Tue, 30 Nov 2021 18:18:32 +0800 (GMT-8) (envelope-from neal_liu@aspeedtech.com) Received: from localhost.localdomain (192.168.10.10) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 30 Nov 2021 18:43:03 +0800 From: Neal Liu To: Felipe Balbi , Greg Kroah-Hartman , Joel Stanley , Andrew Jeffery , Cai Huoqing , Tao Ren , Julia Lawall , "kernel test robot" , Sasha Levin , , , , CC: Neal Liu , Subject: [PATCH v2 4/4] usb: aspeed-vhub: support test mode feature Date: Tue, 30 Nov 2021 18:42:56 +0800 Message-ID: <20211130104256.3106797-5-neal_liu@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211130104256.3106797-1-neal_liu@aspeedtech.com> References: <20211130104256.3106797-1-neal_liu@aspeedtech.com> MIME-Version: 1.0 X-Originating-IP: [192.168.10.10] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 1AUAIWAq077388 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211130_104409_895702_6CA9FF34 X-CRM114-Status: GOOD ( 11.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Support aspeed usb vhub set feature to test mode. Signed-off-by: Neal Liu --- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 18 ++++++++++++++---- drivers/usb/gadget/udc/aspeed-vhub/hub.c | 22 ++++++++++++++++------ 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/drivers/usb/gadget/udc/aspeed-vhub/dev.c b/drivers/usb/gadget/udc/aspeed-vhub/dev.c index d918e8b2af3c..4462f4b73b04 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/dev.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/dev.c @@ -110,15 +110,25 @@ static int ast_vhub_dev_feature(struct ast_vhub_dev *d, u16 wIndex, u16 wValue, bool is_set) { + u32 val; + DDBG(d, "%s_FEATURE(dev val=%02x)\n", is_set ? "SET" : "CLEAR", wValue); - if (wValue != USB_DEVICE_REMOTE_WAKEUP) - return std_req_driver; + if (wValue == USB_DEVICE_REMOTE_WAKEUP) { + d->wakeup_en = is_set; + return std_req_complete; - d->wakeup_en = is_set; + } else if (wValue == USB_DEVICE_TEST_MODE) { + val = readl(d->vhub->regs + AST_VHUB_CTRL); + val &= ~GENMASK(10, 8); + val |= VHUB_CTRL_SET_TEST_MODE((wIndex >> 8) & 0x7); + writel(val, d->vhub->regs + AST_VHUB_CTRL); - return std_req_complete; + return std_req_complete; + } + + return std_req_driver; } static int ast_vhub_ep_feature(struct ast_vhub_dev *d, diff --git a/drivers/usb/gadget/udc/aspeed-vhub/hub.c b/drivers/usb/gadget/udc/aspeed-vhub/hub.c index 93f27a745760..e52805fbdebd 100644 --- a/drivers/usb/gadget/udc/aspeed-vhub/hub.c +++ b/drivers/usb/gadget/udc/aspeed-vhub/hub.c @@ -212,17 +212,27 @@ static int ast_vhub_hub_dev_feature(struct ast_vhub_ep *ep, u16 wIndex, u16 wValue, bool is_set) { + u32 val; + EPDBG(ep, "%s_FEATURE(dev val=%02x)\n", is_set ? "SET" : "CLEAR", wValue); - if (wValue != USB_DEVICE_REMOTE_WAKEUP) - return std_req_stall; + if (wValue == USB_DEVICE_REMOTE_WAKEUP) { + ep->vhub->wakeup_en = is_set; + EPDBG(ep, "Hub remote wakeup %s\n", + is_set ? "enabled" : "disabled"); + return std_req_complete; - ep->vhub->wakeup_en = is_set; - EPDBG(ep, "Hub remote wakeup %s\n", - is_set ? "enabled" : "disabled"); + } else if (wValue == USB_DEVICE_TEST_MODE) { + val = readl(ep->vhub->regs + AST_VHUB_CTRL); + val &= ~GENMASK(10, 8); + val |= VHUB_CTRL_SET_TEST_MODE((wIndex >> 8) & 0x7); + writel(val, ep->vhub->regs + AST_VHUB_CTRL); - return std_req_complete; + return std_req_complete; + } + + return std_req_stall; } static int ast_vhub_hub_ep_feature(struct ast_vhub_ep *ep,