Commit f8f02d5c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

USB: OTG: rename product list of devices

Rename the list of specific devices that an OTG device could support to
make it more obvious as to what this list is for and what it is doing.
Also rename the configuration option to make it more obvious as well.

Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Paul Burton <paulburton@kernel.org>
Cc: "Diego Elio Pettenò" <flameeyes@flameeyes.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Eugeniu Rosca <erosca@de.adit-jv.com>
Cc: Qi Zhou <atmgnd@outlook.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: Hardik Gajjar <hgajjar@de.adit-jv.com>
Cc: Harry Pan <harry.pan@intel.com>
Cc: David Heinzelmann <heinzelmann.david@gmail.com>
Cc: Nishad Kamdar <nishadkamdar@gmail.com>
Link: https://lore.kernel.org/r/20200618094300.1887727-9-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19246d27
...@@ -159,7 +159,7 @@ CONFIG_USB_KBD=y ...@@ -159,7 +159,7 @@ CONFIG_USB_KBD=y
CONFIG_USB_MOUSE=y CONFIG_USB_MOUSE=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_PRODUCTLIST=y
CONFIG_USB_WUSB_CBAF=m CONFIG_USB_WUSB_CBAF=m
CONFIG_USB_C67X00_HCD=m CONFIG_USB_C67X00_HCD=m
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
......
...@@ -207,7 +207,7 @@ CONFIG_ZEROPLUS_FF=y ...@@ -207,7 +207,7 @@ CONFIG_ZEROPLUS_FF=y
CONFIG_USB_HIDDEV=y CONFIG_USB_HIDDEV=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_DYNAMIC_MINORS=y CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_OTG_WHITELIST=y CONFIG_USB_OTG_PRODUCTLIST=y
CONFIG_USB_MON=y CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_ROOT_HUB_TT=y
......
...@@ -55,12 +55,12 @@ config USB_OTG ...@@ -55,12 +55,12 @@ config USB_OTG
Select this only if your board has Mini-AB/Micro-AB Select this only if your board has Mini-AB/Micro-AB
connector. connector.
config USB_OTG_WHITELIST config USB_OTG_PRODUCTLIST
bool "Rely on OTG and EH Targeted Peripherals List" bool "Rely on OTG and EH Targeted Peripherals List"
depends on USB depends on USB
help help
If you say Y here, the "otg_whitelist.h" file will be used as a If you say Y here, the "otg_productlist.h" file will be used as a
product whitelist, so USB peripherals not listed there will be product list, so USB peripherals not listed there will be
rejected during enumeration. This behavior is required by the rejected during enumeration. This behavior is required by the
USB OTG and EH specification for all devices not on your product's USB OTG and EH specification for all devices not on your product's
"Targeted Peripherals List". "Embedded Hosts" are likewise "Targeted Peripherals List". "Embedded Hosts" are likewise
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include "hub.h" #include "hub.h"
#include "otg_whitelist.h" #include "otg_productlist.h"
#define USB_VENDOR_GENESYS_LOGIC 0x05e3 #define USB_VENDOR_GENESYS_LOGIC 0x05e3
#define USB_VENDOR_SMSC 0x0424 #define USB_VENDOR_SMSC 0x0424
...@@ -2403,7 +2403,7 @@ static int usb_enumerate_device(struct usb_device *udev) ...@@ -2403,7 +2403,7 @@ static int usb_enumerate_device(struct usb_device *udev)
if (err < 0) if (err < 0)
return err; return err;
if (IS_ENABLED(CONFIG_USB_OTG_WHITELIST) && hcd->tpl_support && if (IS_ENABLED(CONFIG_USB_OTG_PRODUCTLIST) && hcd->tpl_support &&
!is_targeted(udev)) { !is_targeted(udev)) {
/* Maybe it can talk to us, though we can't talk to it. /* Maybe it can talk to us, though we can't talk to it.
* (Includes HNP test device.) * (Includes HNP test device.)
......
/* SPDX-License-Identifier: GPL-2.0+ */ /* SPDX-License-Identifier: GPL-2.0+ */
/* /* Copyright (C) 2004 Texas Instruments */
* drivers/usb/core/otg_whitelist.h
*
* Copyright (C) 2004 Texas Instruments
*/
/* /*
* This OTG and Embedded Host Whitelist is "Targeted Peripheral List". * This OTG and Embedded Host list is "Targeted Peripheral List".
* It should mostly use of USB_DEVICE() or USB_DEVICE_VER() entries.. * It should mostly use of USB_DEVICE() or USB_DEVICE_VER() entries..
* *
* YOU _SHOULD_ CHANGE THIS LIST TO MATCH YOUR PRODUCT AND ITS TESTING! * YOU _SHOULD_ CHANGE THIS LIST TO MATCH YOUR PRODUCT AND ITS TESTING!
*/ */
static struct usb_device_id whitelist_table[] = { static struct usb_device_id productlist_table[] = {
/* hubs are optional in OTG, but very handy ... */ /* hubs are optional in OTG, but very handy ... */
{ USB_DEVICE_INFO(USB_CLASS_HUB, 0, 0), }, { USB_DEVICE_INFO(USB_CLASS_HUB, 0, 0), },
...@@ -44,7 +40,7 @@ static struct usb_device_id whitelist_table[] = { ...@@ -44,7 +40,7 @@ static struct usb_device_id whitelist_table[] = {
static int is_targeted(struct usb_device *dev) static int is_targeted(struct usb_device *dev)
{ {
struct usb_device_id *id = whitelist_table; struct usb_device_id *id = productlist_table;
/* HNP test device is _never_ targeted (see OTG spec 6.6.6) */ /* HNP test device is _never_ targeted (see OTG spec 6.6.6) */
if ((le16_to_cpu(dev->descriptor.idVendor) == 0x1a0a && if ((le16_to_cpu(dev->descriptor.idVendor) == 0x1a0a &&
...@@ -59,7 +55,7 @@ static int is_targeted(struct usb_device *dev) ...@@ -59,7 +55,7 @@ static int is_targeted(struct usb_device *dev)
/* NOTE: can't use usb_match_id() since interface caches /* NOTE: can't use usb_match_id() since interface caches
* aren't set up yet. this is cut/paste from that code. * aren't set up yet. this is cut/paste from that code.
*/ */
for (id = whitelist_table; id->match_flags; id++) { for (id = productlist_table; id->match_flags; id++) {
if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) && if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) &&
id->idVendor != le16_to_cpu(dev->descriptor.idVendor)) id->idVendor != le16_to_cpu(dev->descriptor.idVendor))
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment