From patchwork Wed Jan 25 14:34:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 48158 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp306552wrn; Wed, 25 Jan 2023 06:35:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXvBtBr50imwn/9xR/vDkjeCuW7LiYKcIUe+8cXT+72hqwULst/oYsK+uH0K3nSVz/csUS9A X-Received: by 2002:a17:90b:4c07:b0:22b:b1c3:7972 with SMTP id na7-20020a17090b4c0700b0022bb1c37972mr19942165pjb.5.1674657355188; Wed, 25 Jan 2023 06:35:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674657355; cv=none; d=google.com; s=arc-20160816; b=V5lrvE0PdK+RUED75sjWgQfA7qAncuVUQGSXUDfST31agL1OaC8Oc7e0G8IrZ8oFKr nunoDTVwM9SEU7X/om2gAS4RJuMeFDvq0UHADpnleMF7GhlAgTS5sQJ7Wf3mlC7oA7l9 HYDVKbOzsBcrsHyc6kGjm4dA+YmVxwG+v7UmRWmtHwxjIuxej+ei+2B1hw4ZlJ3KSoCZ 38OZ5wkkawY3oP8NdoHJ49tLlNSW4G+vizY4Sa4NSzbvIuq6FdQ8UI/ElDxN3dV6cVeP 492ZVYnca7yzlDRqVW3bQoXmxVXHssxW1aO4b9Zm0D5egxMNA95Q0Fg82fdWqbnnoxLu hEqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=cLZjtpTSmBTG8QCJPUFExU/khB9jLMgybVtk+OQ21ak=; b=EQs1h6vhwrYbrl/i2Oe2j74E+hVzeFhdOQPbTrQD+bCEdnt0nSIL4JnC+ybkIEtlNz JqiOEpLvXCY4S1cD5TuxmiWwMhqf+jyu31tchu5x9yFjNG/8vkkzEt4ROBi+ssSsGC5s A0vyaTmZ6ZFKlZ7nBjbm7+sIiif4x9hqDemPJduxJ9lrwUg1HhZEbCCEVljEgl/KV9Db 9OBTyhVNhZWewjs6bLY6Qot4oKQYlCU2AWqesQtYAoeQgy80x42AiWsRMRfZFm1Xp2ec ic1hcisKSvzyECljByZ3D/wQ4NWtnp3CEFidx/5Favpm52Uj63mx7E0tdbuDI4gDnJhb q2pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eeZzmZZY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bg22-20020a17090b0d9600b0022bffd5f41asi2193933pjb.62.2023.01.25.06.35.43; Wed, 25 Jan 2023 06:35:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=eeZzmZZY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235506AbjAYOeF (ORCPT + 99 others); Wed, 25 Jan 2023 09:34:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235427AbjAYOeD (ORCPT ); Wed, 25 Jan 2023 09:34:03 -0500 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC0B92F791; Wed, 25 Jan 2023 06:34:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674657242; x=1706193242; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=3kpOMqrQuctFKDrDiGjBznoIROiBQ5QhwWS1ed7ePGE=; b=eeZzmZZYBYFhSOLUPBMGTrUn290Gw7tjfzbXj7edVCgtPzflaliA9F7Z JsPm9p6FG4ke+5D6UsqBZ9vhLYvkNKc/Dr7+yg7mY7qvH+0/eCjkzV7qg znWlIyERyCYGz0MZWx8u0Y8vOfP/HpQC+k704ye+zYVAE6zfYCVhY7JUC peHwuaanJas+O6f1vxpnbFZPXyEYM9DAXTyfTkfCw8gE453wn0FExv4H+ yuBAnHDskgyqaBetW4I5hpA+VoBoPDnMGdDTD3vICjIakqV/YoN30MxNm 88hsV9Qimm2UlmyBqoXMlgfVVtY82qRSsaEcb/DkbgIe3tjo73QFVjrlg g==; X-IronPort-AV: E=McAfee;i="6500,9779,10601"; a="324268176" X-IronPort-AV: E=Sophos;i="5.97,245,1669104000"; d="scan'208";a="324268176" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2023 06:33:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10601"; a="805017342" X-IronPort-AV: E=Sophos;i="5.97,245,1669104000"; d="scan'208";a="805017342" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 25 Jan 2023 06:33:57 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 37B9A165; Wed, 25 Jan 2023 16:34:33 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , =?utf-8?b?SsOzIMOBZ2ls?= =?utf-8?b?YSBCaXRzY2g=?= , Andy Shevchenko , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/1] usb: gadget: Use correct APIs and data types for UUID handling Date: Wed, 25 Jan 2023 16:34:25 +0200 Message-Id: <20230125143425.85268-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756005510920858574?= X-GMAIL-MSGID: =?utf-8?q?1756005510920858574?= We have two types for UUIDs depending on the byte ordering. Instead of explaining how bytes should go over the wire, use dedicated APIs and data types. This removes a confusion over the byte ordering. Signed-off-by: Andy Shevchenko Tested-By: Jó Ágila Bitsch --- drivers/usb/gadget/composite.c | 4 ++-- include/linux/usb/webusb.h | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 8e2603688016..fa7dd6cf014d 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -829,7 +829,7 @@ static int bos_desc(struct usb_composite_dev *cdev) if (cdev->use_webusb) { struct usb_plat_dev_cap_descriptor *webusb_cap; struct usb_webusb_cap_data *webusb_cap_data; - uuid_t webusb_uuid = WEBUSB_UUID; + guid_t webusb_uuid = WEBUSB_UUID; webusb_cap = cdev->req->buf + le16_to_cpu(bos->wTotalLength); webusb_cap_data = (struct usb_webusb_cap_data *) webusb_cap->CapabilityData; @@ -841,7 +841,7 @@ static int bos_desc(struct usb_composite_dev *cdev) webusb_cap->bDescriptorType = USB_DT_DEVICE_CAPABILITY; webusb_cap->bDevCapabilityType = USB_PLAT_DEV_CAP_TYPE; webusb_cap->bReserved = 0; - export_uuid(webusb_cap->UUID, &webusb_uuid); + export_guid(webusb_cap->UUID, &webusb_uuid); if (cdev->bcd_webusb_version != 0) webusb_cap_data->bcdVersion = cpu_to_le16(cdev->bcd_webusb_version); diff --git a/include/linux/usb/webusb.h b/include/linux/usb/webusb.h index b430d84357f3..fe43020b4a48 100644 --- a/include/linux/usb/webusb.h +++ b/include/linux/usb/webusb.h @@ -11,15 +11,12 @@ #include "uapi/linux/usb/ch9.h" /* - * little endian PlatformCapablityUUID for WebUSB + * Little Endian PlatformCapablityUUID for WebUSB * 3408b638-09a9-47a0-8bfd-a0768815b665 - * to identify Platform Device Capability descriptors as referring to WebUSB - * - * the UUID above MUST be sent over the wire as the byte sequence: - * {0x38, 0xB6, 0x08, 0x34, 0xA9, 0x09, 0xA0, 0x47, 0x8B, 0xFD, 0xA0, 0x76, 0x88, 0x15, 0xB6, 0x65}. + * to identify Platform Device Capability descriptors as referring to WebUSB. */ #define WEBUSB_UUID \ - UUID_INIT(0x38b60834, 0xa909, 0xa047, 0x8b, 0xfd, 0xa0, 0x76, 0x88, 0x15, 0xb6, 0x65) + GUID_INIT(0x3408b638, 0x09a9, 0x47a0, 0x8b, 0xfd, 0xa0, 0x76, 0x88, 0x15, 0xb6, 0x65) /* * WebUSB Platform Capability data