d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: add new scsi_huawei eject3 & eject4 driver support

Browse Source 
Add initialization for new Huawei 4G E3372_NCM, E3372v153_NCM,
E5573Cs322_NCM, E5573Cs322_ECM, and E5573Cs322_ACM.

Remove now-obsolete Huawei 3G E3131 init sequence. These devices are
obsolete, share IDs with new devices and the 3G networks are shutdown.
These old devices work correctly via the 4G code while still allowing
the shared IDs to work differently for the new devices.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/633
This commit is contained in:
Michael Paepcke 2022-12-16 10:28:45 +00:00 committed by Warner Losh
parent 7d4b2b5834
commit 1997d3a4a9
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/usb/net/if_cdce.c
View File

@ -265,6 +265,8 @@ static int cdce_driver_loaded(struct module *, int, void *);
static const STRUCT_USB_HOST_ID cdce_switch_devs[] = {
{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E3272_INIT, MSC_EJECT_HUAWEI2)},
{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E3372v153_INIT, MSC_EJECT_HUAWEI2)},
{USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E3372_INIT, MSC_EJECT_HUAWEI3)},
};
static const STRUCT_USB_HOST_ID cdce_host_devs[] = {

24
sys/dev/usb/serial/u3g.c
View File

@ -89,7 +89,9 @@ SYSCTL_INT(_hw_usb_u3g, OID_AUTO, debug, CTLFLAG_RWTUN,
#define U3GINIT_SAEL_M460 8 /* Requires vendor init */
#define U3GINIT_HUAWEISCSI 9 /* Requires Huawei SCSI init command */
#define U3GINIT_HUAWEISCSI2 10 /* Requires Huawei SCSI init command (2) */
#define U3GINIT_TCT 11 /* Requires TCT Mobile init command */
#define U3GINIT_HUAWEISCSI3 11 /* Requires Huawei SCSI init command (3) */
#define U3GINIT_HUAWEISCSI4 12 /* Requires Huawei SCSI init command (4) */
#define U3GINIT_TCT 13 /* Requires TCT Mobile init command */
enum {
U3G_BULK_WR,
@ -318,8 +320,6 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
U3G_DEV(HUAWEI, E143F, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, E173, 0),
U3G_DEV(HUAWEI, E173_INIT, U3GINIT_HUAWEISCSI),
U3G_DEV(HUAWEI, E3131, 0),
U3G_DEV(HUAWEI, E3131_INIT, U3GINIT_HUAWEISCSI2),
U3G_DEV(HUAWEI, E180V, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, E220, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, E220BIS, U3GINIT_HUAWEI),
@ -342,6 +342,12 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
U3G_DEV(HUAWEI, ETS2055, U3GINIT_HUAWEI),
U3G_DEV(HUAWEI, E3272_INIT, U3GINIT_HUAWEISCSI2),
U3G_DEV(HUAWEI, E3272, 0),
U3G_DEV(HUAWEI, E3372_INIT, U3GINIT_HUAWEISCSI3),
U3G_DEV(HUAWEI, E3372v153_INIT, U3GINIT_HUAWEISCSI2),
U3G_DEV(HUAWEI, E3372v153_NCM, 0),
U3G_DEV(HUAWEI, E5573Cs322_NCM, 0),
U3G_DEV(HUAWEI, E5573Cs322_ECM, 0),
U3G_DEV(HUAWEI, E5573Cs322_ACM, 0),
U3G_DEV(KYOCERA2, CDMA_MSM_K, 0),
U3G_DEV(KYOCERA2, KPC680, 0),
U3G_DEV(LONGCHEER, WM66, U3GINIT_HUAWEI),
@ -815,6 +821,10 @@ u3g_test_autoinst(void *arg, struct usb_device *udev,
method = U3GINIT_HUAWEISCSI;
else if (usb_test_quirk(uaa, UQ_MSC_EJECT_HUAWEISCSI2))
method = U3GINIT_HUAWEISCSI2;
else if (usb_test_quirk(uaa, UQ_MSC_EJECT_HUAWEISCSI3))
method = U3GINIT_HUAWEISCSI3;
else if (usb_test_quirk(uaa, UQ_MSC_EJECT_HUAWEISCSI4))
method = U3GINIT_HUAWEISCSI4;
else if (usb_test_quirk(uaa, UQ_MSC_EJECT_TCT))
method = U3GINIT_TCT;
else if (usbd_lookup_id_by_uaa(u3g_devs, sizeof(u3g_devs), uaa) == 0)
@ -838,6 +848,12 @@ u3g_test_autoinst(void *arg, struct usb_device *udev,
case U3GINIT_HUAWEISCSI2:
error = usb_msc_eject(udev, 0, MSC_EJECT_HUAWEI2);
break;
case U3GINIT_HUAWEISCSI3:
error = usb_msc_eject(udev, 0, MSC_EJECT_HUAWEI3);
break;
case U3GINIT_HUAWEISCSI4:
error = usb_msc_eject(udev, 0, MSC_EJECT_HUAWEI4);
break;
case U3GINIT_SCSIEJECT:
error = usb_msc_eject(udev, 0, MSC_EJECT_STOPUNIT);
break;
@ -888,7 +904,7 @@ u3g_driver_loaded(struct module *mod, int what, void *arg)
default:
return (EOPNOTSUPP);
}
return (0);
return (0);
}
static int