From patchwork Mon Jun 29 02:32:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1318720 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=lwRd0wCT; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49w9tq44Skz9sTJ for ; Mon, 29 Jun 2020 12:10:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8466881F17; Mon, 29 Jun 2020 04:09:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="lwRd0wCT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B0C7981EB0; Mon, 29 Jun 2020 04:09:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::612]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9AFD281F00 for ; Mon, 29 Jun 2020 04:08:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hOgenUS43lZHpedIbkHVY6xGmzRYITELk2irO4EuX2qG4e5A+X4n7aQNHqwaGfLzqwcPJF65+sxpsBv2CINUKQvhYezOQfMPDMW0xhpZpizsYJ8BbUpeFFl8CNnZzoZbqftCfIcx6FQzKRu2eChgzH8YBd1rxlqfLFhIwerrdLzdLGgIJgTeIGNbHtpdlOJNZAM983SiyuwmTH5oEOq94IJV87U4Is3VMygkMWy7TgcmVzTJcC0J5v67DheNRGcqZIsOG609qyFn6umOpCcuLeCJexAC3igrwWJQY+Q4+wO4WYjVDZy9vaBw/yZBYoY8vUlYtoWkVMg91RA5GvTgLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UaKHkbHSMvcg1rUUU4IYgNmU8RbEk5liWMlhkoOuiqM=; b=YNlzuR7bad3i8DhlArqymWH4dhTrcqu6xziaUO/e+9GWbLkTE9fCmL3vEqbrETbQjXdhFdVB4hwyJQHs1TA4nzS6RB6jqMjqEoQCUr3F+21q+PWjhE0AAyrdjQaVYGFjIDV/mGZz1lrL+ozFG2X197d7Ok5FKNywfvSEHGjJnVHE367G/QlSIPa08AQyiPE4Q6w1gJ6GMwUjHICYcw9SJ9nmnF43s551+wiQDkTqFr1p1yOmngmK1eSyAbHFNUK5dA+yJeXQNHfNejHelg9BSbDJks93S2NS7mnLCyzCuFqhIqcd8F5rL3bfjD8jdkf83sXpKnA6+/Ks7nNob/UWGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UaKHkbHSMvcg1rUUU4IYgNmU8RbEk5liWMlhkoOuiqM=; b=lwRd0wCTZZkt7ZJuAcM1lqEPYJMWeRANJnu3q5vgwX6FQSVIT3f3hYEBpJTMZ+8jmteTWPC2aSAHadfMwXsZTmnJa/BPMMJkXSrpoaTK3tYxrFrO6AdaVQOotxIT+rnOaz8RUfZrKMmGi+9+0W2vOoAlbhzO3Dfv5eV13OK7sZs= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB3PR0402MB3913.eurprd04.prod.outlook.com (2603:10a6:8:3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.25; Mon, 29 Jun 2020 02:08:38 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::2d36:b569:17c:7701]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::2d36:b569:17c:7701%4]) with mapi id 15.20.3131.026; Mon, 29 Jun 2020 02:08:37 +0000 From: Peng Fan To: sbabic@denx.de, marex@denx.de, lukma@denx.de Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH 2/7] f_sdp: Add high speed endpoint descriptor Date: Mon, 29 Jun 2020 10:32:53 +0800 Message-Id: <20200629023258.25452-2-peng.fan@nxp.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200629023258.25452-1-peng.fan@nxp.com> References: <20200629023258.25452-1-peng.fan@nxp.com> X-ClientProxiedBy: SG2PR06CA0185.apcprd06.prod.outlook.com (2603:1096:4:1::17) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2PR06CA0185.apcprd06.prod.outlook.com (2603:1096:4:1::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.20 via Frontend Transport; Mon, 29 Jun 2020 02:08:34 +0000 X-Mailer: git-send-email 2.16.4 X-Originating-IP: [119.31.174.71] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 69fae00c-9d7a-4666-c992-08d81bd15594 X-MS-TrafficTypeDiagnostic: DB3PR0402MB3913: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-Forefront-PRVS: 044968D9E1 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SIukGR8iPOogcCsOnCkOtTKGQQdSLCJq1Ic7SDdQw7lKWqrrW71YmWOAZA3R8GeS4sRFsoxJRquPmk5lBqAXd5geA6CxYbiKl8RSuHRdWIzpoQfcKkB7EHwft09TkCtXcOp68YUKVA2vQ73zCl135E3SAdxauTyy5b2zUo57Dhjb8crL8G/75FV7tyLZyniiglz0nyGFS25fORQhZcV6y1RFiP4VkZVC4PjJK1KJ65+4qeFEsREUjso7AUsKchCpUui02FuGuCI9gIl/9Pp5LAVqp3KI4R5mahJv+IZ9zOc1bJ0C+/dxK9DgSzZetmLNjZhQ1OUyd9aO/qnoStompw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39860400002)(136003)(366004)(396003)(346002)(376002)(6486002)(6666004)(86362001)(52116002)(54906003)(66946007)(5660300002)(316002)(2906002)(66476007)(66556008)(1076003)(26005)(4326008)(36756003)(6512007)(8676002)(186003)(83380400001)(16526019)(6506007)(478600001)(44832011)(956004)(8936002)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: sZAcv3Z4ZmAHeihaLk0k4bFPfaXM3Wm5UwqQxLhvxx46tq3bPlBof+isilFke8+gC/E7q4pqma0ungeWws6Mk6fT58HjtfILnHSr/NMxQ/u7e79nJdVEGNLEOiUo2dOcmKY4zPld/LyRT8B7hGE0pbR4/HnAwIp3QRz5A11I9cw3qo4N3GA7lJ90Sx4faDciIZ1SHxnBQ1qxPoWBJxtazLsmFaotUEFCh9v+gBbr5Lwq7Jw9+l5ax5riN2PXtKUCg9OCL/TWhz9aGJX/E03cPEInOuu9hf4u8/yrVcAHCx0t7KhVmTqMzl275kwX+nKk9Kffm1Fu+b9q2dOew/xbOF1jqeTtg+kuLHnB0cpLPBK0RjKPQiUkf1W+EhOcM1Bwy6pj6hrcJtksadcozrsfwEOcQ4++72xWVN72Hg48S0eODYESWpi9JHC8UktwKrV0F+U6h4WKDOy+RNi0O3/n6jp6BafghylrbrAQXvr4xsYDXqy4DWhu4aXolGAsZexc X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69fae00c-9d7a-4666-c992-08d81bd15594 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2020 02:08:37.3203 (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: TspWuGTarjoEFcEa6XTtXiNVAignaKs9BEPhzcAU1GlnDpIZUUmj2jC0k0GJJsZZU5S7THZN0iL5TV6k31bV4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0402MB3913 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Add HS endpoint descriptor for SDP. So that we can use high speed endpoint, and the SDP device can send packet with 512 byte size. Signed-off-by: Ye Li Signed-off-by: Peng Fan --- drivers/usb/gadget/f_sdp.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index f2fe89d2a6..f971ccdeca 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -159,6 +159,16 @@ static struct usb_endpoint_descriptor in_desc = { .bInterval = 1, }; +static struct usb_endpoint_descriptor in_hs_desc = { + .bLength = USB_DT_ENDPOINT_SIZE, + .bDescriptorType = USB_DT_ENDPOINT, /*USB_DT_CS_ENDPOINT*/ + + .bEndpointAddress = 1 | USB_DIR_IN, + .bmAttributes = USB_ENDPOINT_XFER_INT, + .wMaxPacketSize = 512, + .bInterval = 1, +}; + static struct usb_descriptor_header *sdp_runtime_descs[] = { (struct usb_descriptor_header *)&sdp_intf_runtime, (struct usb_descriptor_header *)&sdp_hid_desc, @@ -166,6 +176,13 @@ static struct usb_descriptor_header *sdp_runtime_descs[] = { NULL, }; +static struct usb_descriptor_header *sdp_runtime_hs_descs[] = { + (struct usb_descriptor_header *)&sdp_intf_runtime, + (struct usb_descriptor_header *)&sdp_hid_desc, + (struct usb_descriptor_header *)&in_hs_desc, + NULL, +}; + /* This is synchronized with what the SoC implementation reports */ static struct hid_report sdp_hid_report = { .usage_page = { @@ -489,6 +506,11 @@ static int sdp_bind(struct usb_configuration *c, struct usb_function *f) goto error; } + if (gadget_is_dualspeed(gadget)) { + /* Assume endpoint addresses are the same for both speeds */ + in_hs_desc.bEndpointAddress = in_desc.bEndpointAddress; + } + sdp->in_ep = ep; /* Store IN EP for enabling @ setup */ cdev->req->context = sdp; @@ -541,11 +563,15 @@ static int sdp_set_alt(struct usb_function *f, unsigned intf, unsigned alt) { struct f_sdp *sdp = func_to_sdp(f); struct usb_composite_dev *cdev = f->config->cdev; + struct usb_gadget *gadget = cdev->gadget; int result; debug("%s: intf: %d alt: %d\n", __func__, intf, alt); - result = usb_ep_enable(sdp->in_ep, &in_desc); + if (gadget_is_dualspeed(gadget) && gadget->speed == USB_SPEED_HIGH) + result = usb_ep_enable(sdp->in_ep, &in_hs_desc); + else + result = usb_ep_enable(sdp->in_ep, &in_desc); if (result) return result; sdp->in_req = sdp_start_ep(sdp->in_ep); @@ -591,7 +617,7 @@ static int sdp_bind_config(struct usb_configuration *c) memset(sdp_func, 0, sizeof(*sdp_func)); sdp_func->usb_function.name = "sdp"; - sdp_func->usb_function.hs_descriptors = sdp_runtime_descs; + sdp_func->usb_function.hs_descriptors = sdp_runtime_hs_descs; sdp_func->usb_function.descriptors = sdp_runtime_descs; sdp_func->usb_function.bind = sdp_bind; sdp_func->usb_function.unbind = sdp_unbind;