Commit 4e31a5d0 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: ftdi_sio: match on interface number for jtag 



Some FTDI devices have the first port reserved for JTAG and have been
using a dedicated quirk to prevent binding to it.

As can be inferred directly or indirectly from the commit messages,
almost all of these devices are dual port devices which means that the
more recently added macro for matching on interface number can be used
instead (and some such devices do so already).

This avoids probing interfaces that will never be bound and cleans up
the match table somewhat.

Note that the JTAG quirk is kept for quad port devices, which would
otherwise require three match entries.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 53002803

drivers/usb/serial/ftdi_sio.c

+24 −48
Original line number Diff line number Diff line
@@ -628,10 +628,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_IBS_PEDO_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_IBS_PROD_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_TAVIR_STK500_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_TIAO_UMPA_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLXM_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_TIAO_UMPA_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_NT_ORIONLXM_PID, 1) },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONLX_PLUS_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORION_IO_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_NT_ORIONMX_PID) },
@@ -842,24 +840,17 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_ELSTER_UNICOM_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_PROPOX_JTAGCABLEII_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_PROPOX_ISPCABLEIII_PID) },

	{ USB_DEVICE(FTDI_VID, CYBER_CORTEX_AV_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, CYBER_CORTEX_AV_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_OCD_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_OCD_H_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_TINY_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(OLIMEX_VID, OLIMEX_ARM_USB_TINY_H_PID, 1) },

	{ USB_DEVICE(FIC_VID, FIC_NEO1973_DEBUG_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, LMI_LM3S_DEVEL_BOARD_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, LMI_LM3S_EVAL_BOARD_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, LMI_LM3S_ICDI_BOARD_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_TURTELIZER_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(FIC_VID, FIC_NEO1973_DEBUG_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_OOCDLINK_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, LMI_LM3S_DEVEL_BOARD_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, LMI_LM3S_EVAL_BOARD_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, LMI_LM3S_ICDI_BOARD_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_TURTELIZER_PID, 1) },

	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },

	{ USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_SCU18) },

	{ USB_DEVICE(FTDI_VID, FTDI_REU_TINY_PID) },
@@ -901,17 +892,14 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(ATMEL_VID, STK541_PID) },

	{ USB_DEVICE(DE_VID, STB_PID) },

	{ USB_DEVICE(DE_VID, WHT_PID) },

	{ USB_DEVICE(ADI_VID, ADI_GNICE_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(ADI_VID, ADI_GNICE_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(ADI_VID, ADI_GNICEPLUS_PID, 1) },

	{ USB_DEVICE_AND_INTERFACE_INFO(MICROCHIP_VID, MICROCHIP_USB_BOARD_PID,

					USB_CLASS_VENDOR_SPEC,

					USB_SUBCLASS_VENDOR_SPEC, 0x00) },

	{ USB_DEVICE_INTERFACE_NUMBER(ACTEL_VID, MICROSEMI_ARROW_SF2PLUS_BOARD_PID, 2) },

	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },

	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(MARVELL_VID, MARVELL_SHEEVAPLUG_PID, 1) },

	{ USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) },

	{ USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) },

	{ USB_DEVICE(FTDI_VID, PI_C865_PID) },
@@ -934,10 +922,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(PI_VID, PI_1016_PID) },

	{ USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },

	{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },

	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, TI_XDS100V2_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, MARVELL_OPENRD_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, TI_XDS100V2_PID, 1) },

	{ USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },

	{ USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) },

	{ USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) },
@@ -946,18 +932,14 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) },

	{ USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) },

	{ USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) },

	{ USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_ST_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SLITE_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH2_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, XVERVE_SIGNALYZER_ST_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, XVERVE_SIGNALYZER_SLITE_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, XVERVE_SIGNALYZER_SH2_PID, 1) },

	{ USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, SEGWAY_RMP200_PID) },

	{ USB_DEVICE(FTDI_VID, ACCESIO_COM4SM_PID) },

	{ USB_DEVICE(IONICS_VID, IONICS_PLUGCOMPUTER_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(IONICS_VID, IONICS_PLUGCOMPUTER_PID, 1) },

	{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_24_MASTER_WING_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_PC_WING_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CHAMSYS_USB_DMX_PID) },
@@ -972,15 +954,12 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_CINTERION_MC55I_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_FHE_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_DOTEC_PID) },

	{ USB_DEVICE(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(ST_VID, ST_STMCLT_2232_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(QIHARDWARE_VID, MILKYMISTONE_JTAGSERIAL_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(ST_VID, ST_STMCLT_2232_PID, 1) },

	{ USB_DEVICE(ST_VID, ST_STMCLT_4232_PID),

		.driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_RF_R106) },

	{ USB_DEVICE(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_DISTORTEC_JTAG_LOCK_PICK_PID, 1) },

	{ USB_DEVICE(FTDI_VID, FTDI_LUMEL_PD12_PID) },

	/* Crucible Devices */

	{ USB_DEVICE(FTDI_VID, FTDI_CT_COMET_PID) },
@@ -1055,8 +1034,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7561U_PID) },

	{ USB_DEVICE(ICPDAS_VID, ICPDAS_I7563U_PID) },

	{ USB_DEVICE(WICED_VID, WICED_USB20706V2_PID) },

	{ USB_DEVICE(TI_VID, TI_CC3200_LAUNCHPAD_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(TI_VID, TI_CC3200_LAUNCHPAD_PID, 1) },

	{ USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_BT_USB_PID) },

	{ USB_DEVICE(CYPRESS_VID, CYPRESS_WICED_WL_USB_PID) },

	{ USB_DEVICE(AIRBUS_DS_VID, AIRBUS_DS_P8GR) },
@@ -1075,10 +1053,8 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) },

	{ USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) },

	/* FreeCalypso USB adapters */

	{ USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_BUF_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID),

		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_FALCONIA_JTAG_BUF_PID, 1) },

	{ USB_DEVICE_INTERFACE_NUMBER(FTDI_VID, FTDI_FALCONIA_JTAG_UNBUF_PID, 1) },

	/* GMC devices */

	{ USB_DEVICE(GMC_VID, GMC_Z216C_PID) },

	/* Altera USB Blaster 3 */