From patchwork Mon Jan 25 13:43:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 370230 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp3993614jam; Mon, 25 Jan 2021 05:28:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJyEAcycv3KsWEN3g6Dvu9rMAUy2mIrZ5ZetOPcz6qaDk6n75iGrwvmdRRhzQej55b1Yv/z3 X-Received: by 2002:a05:6402:312e:: with SMTP id dd14mr473254edb.366.1611581310013; Mon, 25 Jan 2021 05:28:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1611581310; cv=pass; d=google.com; s=arc-20160816; b=IGu2oX0wenVlL6yS4pViCpDkkZ4efFakY2gS4ALxT7yzerTKr1+zg1pixqS4Y23NYJ AF7ac9OoUytY1Jukhh64LT0x0J1csOspcbgUFOdh3HodI9VKEMMg1b6qSTmezpJFHB0G nwAmDNs5wY9jw2Yg4AbKpbHtYIp/KFZsPiqD9FpZZ4d/SWA9vCZJNS5skou5yur++IFZ NZaoma47Pym9Ccewb6/IHtEALW05ebRGK/uOl+ue9JKQn2UUWDJHrWzUhb4pg9pPy7NU aQmpSqGFWHKA+uz8SY5HQecomaV4EH67vMkuErqc3ree119oDpXt3b7p9CjciQbbyeEa /6gw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=QkVEgdVyCftZh4BTI1gfLcAwFCZC2nYOaPWDpc9PPbE=; b=bOS2Yaf46gyPAsydepOFXxOAofB6R+34DdGjUytbewfqKPUbAy2iNrJcTZCWNbBsfu /TEmAgBovNrJ73L9X3MSLRP7fJiSK70l1UidAeSWBaI0YayuHIsZojktTm6G9/KOlI+p Q6h072cyjfUrSgnKDek4tQ5O5PVAuEjkBWALw5GCkEwYvyz/YQ12X2j5CS3vV3jbljQr I26YSxiV3k327hhV5xmgfTSJbs3R9uMT1FTq5yBS/YhMtAabvrZKC1AQEar3mQ7T+fd3 H9ECbndbGPh2EOykxNdzC0tFpGwckB2WkrAna3p2hJiClrgRPmK0bBPdMGqXhIXl4TCM KFNw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=je9r2YhY; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id w20si6041377ejc.188.2021.01.25.05.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 05:28:29 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@nxp.com header.s=selector2 header.b=je9r2YhY; arc=pass (i=1 spf=pass spfdomain=nxp.com dkim=pass dkdomain=nxp.com dmarc=pass fromdomain=nxp.com); spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FEC382775; Mon, 25 Jan 2021 14:26:52 +0100 (CET) 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="je9r2YhY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F1DAA82686; Mon, 25 Jan 2021 14:15:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0a::610]) (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 1E9D982642 for ; Mon, 25 Jan 2021 14:15:00 +0100 (CET) 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=b6uZF3QuaVFDToN3jswa/xbL9busnpCze75tTZ9NEy6WnofMmX5RolzhJeXzS6Odco8Ksaf7B6KxQpHN0H4nU2kJ2CZuLrfIrUdKEH0Dhza1vTxRxPDGCUwD8GAjs2TN3Ibf+zutPFTtaTqALHTDdpV8AoDHACF4CVGbWB4yv4/fLiCM1QvuAHjBrvLxqLKI2bCqbhKIErgnvDoHclE7B33Em0mM/ImIwEKeMl8qySfSqqY57SGDZCDgG9Uaxvb10/0lzfNfjOclcIAfAjFS59L1Lke+iTl1HP2p6S1ZuXdOyUMgS1z1zbT7wcghAa+1/vRFBn5E6TQgdaGfnj53fg== 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=QkVEgdVyCftZh4BTI1gfLcAwFCZC2nYOaPWDpc9PPbE=; b=dKuL0+r6DVoabzJyofuvljh1jCNJTL5Q+WhWQKIL2vPw3Ct1Pg6VeVOAe3Aa4XgPAsA2Ndm+QB48gpZ6f21FKwgrj/4uYizbUJuBem4K0GXGHgenjJ5hIU5QVfEevJgIjqxauMVH/VIQIGuJgyfnaUgfPc9PhIdQ8h/FzgyHeiAH3ND7pUmj134J7fzYWCOGulbaN7J4f9MN2ruOL0dTtBk4VA2J4yUg7skfpdDU/sTpqNwPKdVSehB7i0dZJ91fDFZvCeaXDWqTanU/2xSwP+e2/crRP2fOY7jpTR7kVyDF+ZKd6gmS8pJ1hLTyRLAD+WcSd+GKKPSjEuodu8KEaA== 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=QkVEgdVyCftZh4BTI1gfLcAwFCZC2nYOaPWDpc9PPbE=; b=je9r2YhYresGhEUhL/gStk+2cY3OJyDAQ2K+zgUlpZ1mBnrJg3TjsfEVsisIrvmkgnKGK4Y4yQwUblDOaN104Rsnne+QMtB6aOlcKv0pJsQsv9YNgdUO5c+q/kXWEOhVjyJrsImoTo0GcGoWSC0R0HF//9dJ2kiH/vcBTIEfl1s= 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 DB6PR04MB3128.eurprd04.prod.outlook.com (2603:10a6:6:10::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.13; Mon, 25 Jan 2021 13:14:58 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d58c:d479:d094:43d0%9]) with mapi id 15.20.3784.019; Mon, 25 Jan 2021 13:14:58 +0000 From: peng.fan@nxp.com To: sbabic@denx.de, lukma@denx.de, marex@denx.de Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Jun Li , Ye Li , Peter Chen , Peng Fan Subject: [PATCH V2 09/17] usb: gadget: set correct usb_configuration for os_desc_config Date: Mon, 25 Jan 2021 21:43:52 +0800 Message-Id: <20210125134400.780-10-peng.fan@nxp.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210125134400.780-1-peng.fan@nxp.com> References: <20210125134400.780-1-peng.fan@nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR03CA0117.apcprd03.prod.outlook.com (2603:1096:4:91::21) 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 SG2PR03CA0117.apcprd03.prod.outlook.com (2603:1096:4:91::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3805.6 via Frontend Transport; Mon, 25 Jan 2021 13:14:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c70ade0d-3ede-488d-d087-08d8c13336c0 X-MS-TrafficTypeDiagnostic: DB6PR04MB3128: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:569; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Rz8+M021cVSJ3o26XA9EAaIyW8ue+IYK1PfhWlm07DVxfMVufLH3NPCwbwdEeCwLo9mwR5s92fiXJf9NhnR8CaG54FVABLieJNq7pSWlRQQCmvMfOp8tJlowUrw/IIeA2SqwSXKWoy2gOI8oRa7gppJkEv/sxKCYvnoYUovywEn/XE1f0AedoKmExU+oq+OCKGNENBqg8xpC527G0cqptb4s/ESSlqZp/X4jrwPh1WpiUvgSoRSow4Jf3whv6Mtqsbj9OCtBabyorF0hDKOtcqgHtuXeyJk5Dz3oHtlsoX0VpzliDxu/5+5L0pRVLSscXhl3kp6K5CBWGFN+QWbdEnIs2+JdKcOv/mWMkNboK4uX+l7ChC7rC9qgduLQQdov4uB9rOAOzsgE6g+Dy85JsA== 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; SFS:(4636009)(346002)(136003)(39860400002)(376002)(366004)(396003)(6506007)(1076003)(26005)(316002)(6512007)(45080400002)(186003)(4326008)(54906003)(83380400001)(478600001)(8936002)(8676002)(86362001)(6486002)(2906002)(36756003)(6666004)(5660300002)(9686003)(66556008)(2616005)(66476007)(16526019)(956004)(66946007)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: Rvg1ezr/3e+Zmr1YAvcoPXw70+EXMZGgkRqXL32aM/qdRy4dmaejgCpU5iX2aKUTTskhMCSB1alEkPrUqtxtTdutovwPTDpO4awP9xL2iowDmSGZ4vtmkGc6VTj8M5OcQoFT+gSCqxU5t3qu5LTKrk2nuSXdNdp3pJ9iwOPUI3vNjlAYEUbY3eU+8O1AeaPybT7K5P3+8kKLUpgvlFwXI1at3TWvDIQVD1FpGEPA6Z9s0MeBpL2YsQHtWB1d0TbmXPe2aUog87eNEmgfUJfsAVTyjeF0FDDuJUZTW2BmLOZNBXk28jRpkbChXdEc46OLCN209LfaBpjTFgGjabgQhiSXXO+x4L+cJL6bNNHn0NGMGgFtJmV/g4HEXrZC7mM5g6nJ811BVBin86hVpslc0gQoNspVTBdcipqc/dtc/A8vvi8ERLDkq9NK4TB+9TYc/kQ9d+B7ztVupowIIQl14Otua8neNs1P7r5g2yzfavllgTOR7pUAl7HsUobsaM4JB39obVd7IqSwZWBCAoOXt8Q+IB0qqYTBO45n4mRq6J4nDjbJQk3edcTZR7Z6vn/PSqcDDIsh8vYRiB96U/jFicLqJlinPcPfPQgP9rPMUncS7BJGNbkFWMtnbOi/X6KqPGGzN0XOlsAFKBd0hZIF5ec8K4KFdXKm+NBTr7bqoglYAMr+CCHQWtxb+DECyO/Fut8nY7fj9LCQLlTaWB6Y0rh5Xa419SwerYtEaPTZOWhJyMcjLyTDbcen7VhCMwMseqsYtsycUgb9vT0/5r2MhY+ceCYmhzz78TKm7xESS2d85mRcWXt582C/J85OyolnoKYhTABMGwaBtLWy0CqIPIpPZJqH6akgez3o72GA7IzDfSEpTiP8yDxto25zQ6RAaC6KWl32X5QXz8CcTntXf/ntTr+doNIKkhM1W0PVj2M51yQE/P82fa/F0EIjA3jMXlbeXvE6gYAnqUCzeoqePPD/VMaRFQG1J7HOWLbniWtCzyOsYx8UhngitAWJ/bH7 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c70ade0d-3ede-488d-d087-08d8c13336c0 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2021 13:14:58.1482 (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: exgFVH1yex2gxGJznZxB+ibqhj9m3J/6ilNhqxRzGQCFk86HcCSs91OKN4XfME2VCw21MQLT7V2RYh3hkJqHog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3128 X-Mailman-Approved-At: Mon, 25 Jan 2021 14:26:22 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.3 at phobos.denx.de X-Virus-Status: Clean From: Jun Li The current way to set cdev->os_desc_config is wrong if user restart fastboot, as the old config is not used anymore and new allocated usb_configuration will be used, so set the os_desc_config while usb_add_config. Reviewed-by: Ye Li Signed-off-by: Li Jun Signed-off-by: Peter Chen Signed-off-by: Peng Fan --- drivers/usb/gadget/composite.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) -- 2.28.0 diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index cd61bfec38..e6fdefd3d0 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -399,10 +399,6 @@ static int set_config(struct usb_composite_dev *cdev, goto done; cdev->config = c; - if (cdev->use_os_string) { - cdev->os_desc_config = c; - os_desc_config = c; - } /* Initialize all interfaces by setting them to altsetting zero. */ for (tmp = 0; tmp < MAX_CONFIG_INTERFACES; tmp++) { @@ -516,6 +512,9 @@ int usb_add_config(struct usb_composite_dev *cdev, usb_ep_autoconfig_reset(cdev->gadget); + if (os_desc_config) + cdev->os_desc_config = os_desc_config; + done: if (status) debug("added config '%s'/%u --> %d\n", config->label, @@ -1373,9 +1372,6 @@ static int composite_bind(struct usb_gadget *gadget) /* Microsoft OS String Descriptor */ utf8_to_utf16le(qw_sign_buf, (__le16 *)cdev->qw_sign, OS_STRING_QW_SIGN_LEN / 2); - - if (os_desc_config) - cdev->os_desc_config = os_desc_config; } debug("%s: ready\n", composite->name);