[{"id":1765707,"web_url":"http://patchwork.ozlabs.org/comment/1765707/","msgid":"<26aa6e1b-a7b8-5257-a59f-e446a36a38bc@denx.de>","list_archive_url":null,"date":"2017-09-09T04:45:36","subject":"Re: [U-Boot] [PATCH 06/13] usb: gadget: usb_ether: Move settings to\n\tcommon","submitter":{"id":70701,"url":"http://patchwork.ozlabs.org/api/people/70701/","name":"Lukasz Majewski","email":"lukma@denx.de"},"content":"On 09/08/2017 07:34 PM, Maxime Ripard wrote:\n> The usb_ether gadget duplicates the USB settings for the manufacturer,\n> product ID and vendor ID.\n> \n> Make sure we use the common option so that we can expect a single VID/PID\n> couple for a single device.\n> \n> Signed-off-by: Maxime Ripard \n\nReviewed-by: Lukasz Majewski \n\n> ---\n> configs/sama5d2_ptc_nandflash_defconfig | 1 +\n> configs/sama5d2_ptc_spiflash_defconfig | 1 +\n> configs/vinco_defconfig | 1 +\n> drivers/usb/gadget/ether.c | 16 ++++++++--------\n> include/configs/ma5d4evk.h | 1 -\n> include/configs/sama5d2_ptc.h | 1 -\n> include/configs/vinco.h | 1 -\n> scripts/config_whitelist.txt | 1 -\n> 8 files changed, 11 insertions(+), 12 deletions(-)\n> \n> diff --git a/configs/sama5d2_ptc_nandflash_defconfig b/configs/sama5d2_ptc_nandflash_defconfig\n> index 6672a5ce11f7..431056a50a8b 100644\n> --- a/configs/sama5d2_ptc_nandflash_defconfig\n> +++ b/configs/sama5d2_ptc_nandflash_defconfig\n> @@ -29,5 +29,6 @@ CONFIG_USB=y\n> CONFIG_USB_EHCI_HCD=y\n> CONFIG_USB_STORAGE=y\n> CONFIG_USB_GADGET=y\n> +CONFIG_USB_GADGET_MANUFACTURER=\"Atmel SAMA5D2_PTC\"\n> CONFIG_USB_GADGET_ATMEL_USBA=y\n> CONFIG_USB_ETHER=y\n> diff --git a/configs/sama5d2_ptc_spiflash_defconfig b/configs/sama5d2_ptc_spiflash_defconfig\n> index 9a23a808f1b3..66bb671820a6 100644\n> --- a/configs/sama5d2_ptc_spiflash_defconfig\n> +++ b/configs/sama5d2_ptc_spiflash_defconfig\n> @@ -30,5 +30,6 @@ CONFIG_USB=y\n> CONFIG_USB_EHCI_HCD=y\n> CONFIG_USB_STORAGE=y\n> CONFIG_USB_GADGET=y\n> +CONFIG_USB_GADGET_MANUFACTURER=\"Atmel SAMA5D2_PTC\"\n> CONFIG_USB_GADGET_ATMEL_USBA=y\n> CONFIG_USB_ETHER=y\n> diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig\n> index b0df6b3c7805..8d7f9f99ab81 100644\n> --- a/configs/vinco_defconfig\n> +++ b/configs/vinco_defconfig\n> @@ -33,3 +33,4 @@ CONFIG_USB_STORAGE=y\n> CONFIG_USB_GADGET=y\n> CONFIG_USB_GADGET_ATMEL_USBA=y\n> CONFIG_USB_ETHER=y\n> +CONFIG_USB_GADGET_MANUFACTURER=\"L+G VInCo\"\n> diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c\n> index 2cf5c8d31e25..dbb578258f96 100644\n> --- a/drivers/usb/gadget/ether.c\n> +++ b/drivers/usb/gadget/ether.c\n> @@ -273,8 +273,8 @@ static inline int BITRATE(struct usb_gadget *g)\n> * static ushort idProduct;\n> */\n> \n> -#if defined(CONFIG_USBNET_MANUFACTURER)\n> -static char *iManufacturer = CONFIG_USBNET_MANUFACTURER;\n> +#if defined(CONFIG_USB_GADGET_MANUFACTURER)\n> +static char *iManufacturer = CONFIG_USB_GADGET_MANUFACTURER;\n> #else\n> static char *iManufacturer = \"U-Boot\";\n> #endif\n> @@ -2073,11 +2073,11 @@ static int eth_bind(struct usb_gadget *gadget)\n> \t * to choose the right configuration otherwise.\n> \t */\n> \tif (rndis) {\n> -#if defined(CONFIG_USB_RNDIS_VENDOR_ID) && defined(CONFIG_USB_RNDIS_PRODUCT_ID)\n> +#if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)\n> \t\tdevice_desc.idVendor =\n> -\t\t\t__constant_cpu_to_le16(CONFIG_USB_RNDIS_VENDOR_ID);\n> +\t\t\t__constant_cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);\n> \t\tdevice_desc.idProduct =\n> -\t\t\t__constant_cpu_to_le16(CONFIG_USB_RNDIS_PRODUCT_ID);\n> +\t\t\t__constant_cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);\n> #else\n> \t\tdevice_desc.idVendor =\n> \t\t\t__constant_cpu_to_le16(RNDIS_VENDOR_NUM);\n> @@ -2092,9 +2092,9 @@ static int eth_bind(struct usb_gadget *gadget)\n> \t * supporting one submode of the \"SAFE\" variant of MDLM.)\n> \t */\n> \t} else {\n> -#if defined(CONFIG_USB_CDC_VENDOR_ID) && defined(CONFIG_USB_CDC_PRODUCT_ID)\n> -\t\tdevice_desc.idVendor = cpu_to_le16(CONFIG_USB_CDC_VENDOR_ID);\n> -\t\tdevice_desc.idProduct = cpu_to_le16(CONFIG_USB_CDC_PRODUCT_ID);\n> +#if defined(CONFIG_USB_GADGET_VENDOR_NUM) && defined(CONFIG_USB_GADGET_PRODUCT_NUM)\n> +\t\tdevice_desc.idVendor = cpu_to_le16(CONFIG_USB_GADGET_VENDOR_NUM);\n> +\t\tdevice_desc.idProduct = cpu_to_le16(CONFIG_USB_GADGET_PRODUCT_NUM);\n> #else\n> \t\tif (!cdc) {\n> \t\t\tdevice_desc.idVendor =\n> diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h\n> index 6d25d84c6eb6..3aeb7e6ef136 100644\n> --- a/include/configs/ma5d4evk.h\n> +++ b/include/configs/ma5d4evk.h\n> @@ -97,7 +97,6 @@\n> #ifdef CONFIG_CMD_USB\n> \n> /* USB device */\n> -#define CONFIG_USBNET_MANUFACTURER \"AriesEmbedded\"\n> #define CONFIG_USB_FUNCTION_MASS_STORAGE\n> #define CONFIG_SYS_DFU_DATA_BUF_SIZE\t(1 * 1024 * 1024)\n> #define DFU_DEFAULT_POLL_TIMEOUT\t300\n> diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h\n> index 543592e3a574..2328c7614ed7 100644\n> --- a/include/configs/sama5d2_ptc.h\n> +++ b/include/configs/sama5d2_ptc.h\n> @@ -60,7 +60,6 @@\n> #endif\n> \n> /* USB device */\n> -#define CONFIG_USBNET_MANUFACTURER \"Atmel SAMA5D2_PTC\"\n> \n> /* Ethernet Hardware */\n> #define CONFIG_MACB\n> diff --git a/include/configs/vinco.h b/include/configs/vinco.h\n> index d3d5dc8f7732..265da84fc0cc 100644\n> --- a/include/configs/vinco.h\n> +++ b/include/configs/vinco.h\n> @@ -64,7 +64,6 @@\n> #endif\n> \n> /* USB device */\n> -#define CONFIG_USBNET_MANUFACTURER \"L+G VInCo\"\n> \n> /* Ethernet Hardware */\n> #define CONFIG_PHY_SMSC\n> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt\n> index c1285ce27fec..1020d6db9f8c 100644\n> --- a/scripts/config_whitelist.txt\n> +++ b/scripts/config_whitelist.txt\n> @@ -4993,7 +4993,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE\n> CONFIG_USBD_VENDORID\n> CONFIG_USBID_ADDR\n> CONFIG_USBNET_DEV_ADDR\n> -CONFIG_USBNET_MANUFACTURER\n> CONFIG_USBTTY\n> CONFIG_USB_AM35X\n> CONFIG_USB_ATMEL\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xq1pl5pQrz9sBW\n\tfor ;\n\tSat, 9 Sep 2017 14:45:50 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 17E1EC21EFC; Sat, 9 Sep 2017 04:45:44 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 1DA30C21C59;\n\tSat, 9 Sep 2017 04:45:41 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid BE4C3C21C59; Sat, 9 Sep 2017 04:45:39 +0000 (UTC)","from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9])\n\tby lists.denx.de (Postfix) with ESMTPS id 5D6C1C21C46\n\tfor ; Sat, 9 Sep 2017 04:45:39 +0000 (UTC)","from frontend01.mail.m-online.net (unknown [192.168.8.182])\n\tby mail-out.m-online.net (Postfix) with ESMTP id 3xq1pV39dRz1qr7f;\n\tSat, 9 Sep 2017 06:45:38 +0200 (CEST)","from localhost (dynscan1.mnet-online.de [192.168.6.70])\n\tby mail.m-online.net (Postfix) with ESMTP id 3xq1pV27rsz3hjjx;\n\tSat, 9 Sep 2017 06:45:38 +0200 (CEST)","from mail.mnet-online.de ([192.168.8.182])\n\tby localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new,\n\tport 10024)\n\twith ESMTP id EBRyZw8nPxJd; Sat, 9 Sep 2017 06:45:37 +0200 (CEST)","from [192.168.2.222] (89-64-27-66.dynamic.chello.pl [89.64.27.66])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mail.mnet-online.de (Postfix) with ESMTPSA;\n\tSat, 9 Sep 2017 06:45:36 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,\n\tRCVD_IN_MSPIKE_H3,\n\tRCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no\n\tversion=3.4.0","X-Virus-Scanned":"amavisd-new at mnet-online.de","X-Auth-Info":"S9a3g4IuKkYxG0Ql0Y2xAUvr8OyOfes790fTJ1NVMD0=","To":"Maxime Ripard ,\n\tTom Rini , Jagan Teki ","References":"\n\t","From":"=?utf-8?q?=C5=81ukasz_Majewski?= ","Organization":"DENX","Message-ID":"<26aa6e1b-a7b8-5257-a59f-e446a36a38bc@denx.de>","Date":"Sat, 9 Sep 2017 06:45:36 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"","Content-Language":"en-US","Cc":"Thomas Petazzoni , marex@denx.de,\n\tu-boot@lists.denx.de","Subject":"Re: [U-Boot] [PATCH 06/13] usb: gadget: usb_ether: Move settings to\n\tcommon","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Transfer-Encoding":"base64","Content-Type":"text/plain; charset=\"utf-8\"; Format=\"flowed\"","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "}},{"id":1767015,"web_url":"http://patchwork.ozlabs.org/comment/1767015/","msgid":"","list_archive_url":null,"date":"2017-09-12T12:28:15","subject":"Re: [U-Boot] [PATCH 06/13] usb: gadget: usb_ether: Move settings to\n\tcommon","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/","name":"Simon Glass","email":"sjg@chromium.org"},"content":"On 8 September 2017 at 11:34, Maxime Ripard\n wrote:\n> The usb_ether gadget duplicates the USB settings for the manufacturer,\n> product ID and vendor ID.\n>\n> Make sure we use the common option so that we can expect a single VID/PID\n> couple for a single device.\n>\n> Signed-off-by: Maxime Ripard \n> ---\n> configs/sama5d2_ptc_nandflash_defconfig | 1 +\n> configs/sama5d2_ptc_spiflash_defconfig | 1 +\n> configs/vinco_defconfig | 1 +\n> drivers/usb/gadget/ether.c | 16 ++++++++--------\n> include/configs/ma5d4evk.h | 1 -\n> include/configs/sama5d2_ptc.h | 1 -\n> include/configs/vinco.h | 1 -\n> scripts/config_whitelist.txt | 1 -\n> 8 files changed, 11 insertions(+), 12 deletions(-)\n\nReviewed-by: Simon Glass ","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=google.com header.i=@google.com\n\theader.b=\"NP6DblWa\"; \n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"e25LlgxX\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xs4mG0lBTz9s0g\n\tfor ;\n\tTue, 12 Sep 2017 23:05:49 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid 8990AC2206C; Tue, 12 Sep 2017 12:30:28 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 4C273C21FF5;\n\tTue, 12 Sep 2017 12:30:01 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 85418C21E9C; Tue, 12 Sep 2017 12:28:41 +0000 (UTC)","from mail-qk0-f182.google.com (mail-qk0-f182.google.com\n\t[209.85.220.182])\n\tby lists.denx.de (Postfix) with ESMTPS id C5183C21FF4\n\tfor ; Tue, 12 Sep 2017 12:28:37 +0000 (UTC)","by mail-qk0-f182.google.com with SMTP id b82so24582390qkc.4\n\tfor ; Tue, 12 Sep 2017 05:28:37 -0700 (PDT)","by 10.200.37.200 with HTTP; Tue, 12 Sep 2017 05:28:15 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID autolearn=unavailable\n\tautolearn_force=no version=3.4.0","DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\n\ts=20161025; \n\th=mime-version:sender:in-reply-to:references:from:date:message-id\n\t:subject:to:cc;\n\tbh=p6TAnds5/8nNPW1BqTevFK1EGHlqdSGihLG/gltsp0M=;\n\tb=NP6DblWa3D3XpDadiOBGPgdTnHkdzKE2FOqCHiMrfW2D3HfZRlmm2lxwXB5zWSwJqz\n\tBUNnlgnVIiLvIFawsNP9Sc8WVY+1OgsWWbnHjwUOAqk7IWczq2x6rcyZ4zBoyv3u//Te\n\tTxF1HYVo7m+yh+87HkncuotWw1zS3b1HGyZK6Jy/19XjOP9oUQWigjx2wKXEs/DYMhhX\n\tvlLc/731uQko5CgJE/5XxJxFbtgQZ3/eULqssRFC+VevqYhag21cPQL+P5dhcs0LjkSi\n\tYI5DZXWrUdSfiqqtCC8D8I+9BUcZPbsE1YJD2B83x7QtaEAvyugdTqLuh9PK3Tpmenq1\n\tM1ww==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:sender:in-reply-to:references:from:date:message-id\n\t:subject:to:cc;\n\tbh=p6TAnds5/8nNPW1BqTevFK1EGHlqdSGihLG/gltsp0M=;\n\tb=e25LlgxXqlF/sm+IddfyNY1AKJFdVTJxToHxm7Vr6SaLrSB8FSrWT7v53dKHUu/0XA\n\tAj3dvQcsQuGgldG6Q3UTCsJQDMwaBoN9seDNAakt5lPETCsR9aA5Bqjmy1loiRFV1MBd\n\t0J5fMAnFipFISZ3J0SA0TtheIO61Qyb1uLdMc="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:sender:in-reply-to:references:from\n\t:date:message-id:subject:to:cc;\n\tbh=p6TAnds5/8nNPW1BqTevFK1EGHlqdSGihLG/gltsp0M=;\n\tb=a0QSXflpD8kS5hidIpc+if9wqyjasVYDdwgjkcoZFLloxgJUXdVw7tAbA4cCCIlO5j\n\tZXwPyjrIIc/GeTwwmbgOvQdPXnAvwnPJCAkbWu4+rSGIATtKgm36+Uqkh/HJjdRHN+cj\n\tzk1fGbjp4R1rWcGMwd7HdXgQpX9+u8m0FyJ25mXAse9KxlbunCJ1JhweBC1CairZJWmM\n\tQUrFz0j7GYKsAbtqsNdDXpvWWUcCsVb4CYivBehis/I6b1mzfx5tWmxr9HHTykHots+4\n\tZWMzAja8mbuNQhiH1aj//6q6sTsytkZ05bDyITsqNJ36hx8bGj8pVWh7FEg97kyoQ69V\n\t2Hnw==","X-Gm-Message-State":"AHPjjUgqbWWtPlzvSk4VVps3OvjGQrJb24WhW/kP31tDXz8zv8MeuFBQ\n\tZ2KEFinoXXhh180YOUhxVBkuQeH9FM0ftKQjwmJNzQ==","X-Google-Smtp-Source":"AOwi7QAybXO7gN5GfLgpWI/hQQ5R2mR4Ysn1Zp7sTTNV1DQ+MBenWhk/ciH5Iz80yHo28rzwzjNVJlF1nb/tEDYgf1E=","X-Received":"by 10.55.146.198 with SMTP id\n\tu189mr18755796qkd.317.1505219316246; \n\tTue, 12 Sep 2017 05:28:36 -0700 (PDT)","MIME-Version":"1.0","In-Reply-To":"","References":"\n\t","From":"Simon Glass ","Date":"Tue, 12 Sep 2017 06:28:15 -0600","X-Google-Sender-Auth":"K_T2hjep_gfKUVJ4lIXzWwg09ZM","Message-ID":"","To":"Maxime Ripard ","Cc":"Thomas Petazzoni ,\n\tTom Rini , Marek Vasut ,\n\tU-Boot Mailing List ,\n\tJagan Teki ","Subject":"Re: [U-Boot] [PATCH 06/13] usb: gadget: usb_ether: Move settings to\n\tcommon","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "}}]