Commit 63a901c0 authored by Johan Hovold's avatar Johan Hovold
Browse files

Revert "USB: option,zte_ev: move most ZTE CDMA devices to zte_ev" 



This reverts commit 73228a05 ("USB: option,zte_ev: move most ZTE
CDMA devices to zte_ev").

Move the IDs of the devices that were previously driven by the option
driver back to that driver.

As several users have reported, the zte_ev driver is causing random
disconnects as well as reconnect failures.

A closer analysis of the zte_ev setup code reveals that it consists of
standard CDC requests (SET/GET_LINE_CODING and SET_CONTROL_LINE_STATE)
but unfortunately fails to get some of those right. In particular, as
reported by Liu Lei, it fails to lower DTR/RTS on close. It also appears
that the control requests lack the interface argument.

Note that the zte_ev driver is based on code (once) distributed by ZTE
that still appears to originally have been reverse-engineered and bolted
onto the generic driver.

Since line control is already handled properly by the option driver, and
the SET/GET_LINE_CODING requests appears to be redundant (amounts to a
SET 9600 8N1), this is a first step in ultimately removing the redundant
zte_ev driver.

Note that AC2726 had already been moved back to option, and that some
IDs were in the device table of both drivers prior to the commit being
reverted.

Reported-by: default avatarLei Liu <liu.lei78@zte.com.cn>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent d7730273

drivers/usb/serial/option.c

+21 −3
Original line number Diff line number Diff line
@@ -275,8 +275,12 @@ static void option_instat_callback(struct urb *urb); 
#define ZTE_PRODUCT_MF622			0x0001

#define ZTE_PRODUCT_MF628			0x0015

#define ZTE_PRODUCT_MF626			0x0031

#define ZTE_PRODUCT_MC2718			0xffe8

#define ZTE_PRODUCT_AC2726			0xfff1

#define ZTE_PRODUCT_CDMA_TECH			0xfffe

#define ZTE_PRODUCT_AC8710T			0xffff

#define ZTE_PRODUCT_MC2718			0xffe8

#define ZTE_PRODUCT_AD3812			0xffeb

#define ZTE_PRODUCT_MC2716			0xffed



#define BENQ_VENDOR_ID				0x04a5

#define BENQ_PRODUCT_H10			0x4068
@@ -531,10 +535,18 @@ static const struct option_blacklist_info zte_k3765_z_blacklist = { 
	.reserved = BIT(4),

};



static const struct option_blacklist_info zte_ad3812_z_blacklist = {

	.sendsetup = BIT(0) | BIT(1) | BIT(2),

};



static const struct option_blacklist_info zte_mc2718_z_blacklist = {

	.sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),

};



static const struct option_blacklist_info zte_mc2716_z_blacklist = {

	.sendsetup = BIT(1) | BIT(2) | BIT(3),

};



static const struct option_blacklist_info huawei_cdc12_blacklist = {

	.reserved = BIT(1) | BIT(2),

};
@@ -1074,6 +1086,7 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_INTERFACE_CLASS(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1012, 0xff) },

	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },

	{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
@@ -1548,13 +1561,18 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff93, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff94, 0xff, 0xff, 0xff) },



	/* NOTE: most ZTE CDMA devices should be driven by zte_ev, not option */

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),

	 .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff),

	 .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),

	 .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },

	{ USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },



	{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },

	{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },

drivers/usb/serial/zte_ev.c

+0 −18
Original line number Diff line number Diff line
@@ -272,27 +272,9 @@ static void zte_ev_usb_serial_close(struct usb_serial_port *port) 
}



static const struct usb_device_id id_table[] = {

	/* AC8710, AC8710T */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffff, 0xff, 0xff, 0xff) },

	 /* AC8700 */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xfffe, 0xff, 0xff, 0xff) },

	/* MG880 */

	{ USB_DEVICE(0x19d2, 0xfffd) },

	{ USB_DEVICE(0x19d2, 0xfffc) },

	{ USB_DEVICE(0x19d2, 0xfffb) },

	/* AC8710_V3 */

	{ USB_DEVICE(0x19d2, 0xfff6) },

	{ USB_DEVICE(0x19d2, 0xfff7) },

	{ USB_DEVICE(0x19d2, 0xfff8) },

	{ USB_DEVICE(0x19d2, 0xfff9) },

	{ USB_DEVICE(0x19d2, 0xffee) },

	/* AC2716, MC2716 */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffed, 0xff, 0xff, 0xff) },

	/* AD3812 */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x19d2, 0xffeb, 0xff, 0xff, 0xff) },

	{ USB_DEVICE(0x19d2, 0xffec) },

	{ USB_DEVICE(0x05C6, 0x3197) },

	{ USB_DEVICE(0x05C6, 0x6000) },

	{ USB_DEVICE(0x05C6, 0x9008) },

	{ },

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE