Message ID | DS7PR20MB4855FE3E27EFAD39D56FF897C6D82@DS7PR20MB4855.namprd20.prod.outlook.com |
---|---|
State | New |
Headers | show |
Series | USB: serial: qcserial: patch for adding Sierra Wireless 9x50, EM91, EM92 and SDX35. | expand |
On Thu, Mar 20, 2025 at 10:08:36PM +0000, Adam Xue wrote: > Hi Johan, > > This is the patch for adding support for Sierra Wireless and Semtech products based on > Qualcomm 9x50, SDX35, SDX55 and SDX65 based products (EM75xx, EM91xx, EM92xx). > Currently, only our products based on Qualcomm 9x30 and older chipsets are supported. > These products have a different USB interface layout compared to the default one which > require code changes. The VID/PID list has also been updated for all products mentioned above. > Please review. > > Thanks, > > Adam > > > diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c > index 13c664317a05..f362da97b7de 100644 > --- a/drivers/usb/serial/qcserial.c > +++ b/drivers/usb/serial/qcserial.c > @@ -26,12 +26,24 @@ enum qcserial_layouts { > QCSERIAL_G1K = 1, /* Gobi 1000 */ > QCSERIAL_SWI = 2, /* Sierra Wireless */ > QCSERIAL_HWI = 3, /* Huawei */ > + QCSERIAL_SWI_9X50 = 4, /* Sierra Wireless 9x50 USB-IF */ > + QCSERIAL_SWI_SDX55 = 5, /* Sierra Wireless SDX55 */ > + QCSERIAL_SWI_SDX55_RMNET = 6, /* Sierra Wireless SDX55 rmnet */ > + QCSERIAL_SWI_SDX35 = 7, /* Sierra Wireless SDX35 */ > }; > > #define DEVICE_G1K(v, p) \ > USB_DEVICE(v, p), .driver_info = QCSERIAL_G1K > #define DEVICE_SWI(v, p) \ > USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI > +#define DEVICE_SWI_9X50(v, p) \ > + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_9X50 > +#define DEVICE_SWI_SDX55(v, p) \ > + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_SDX55 > +#define DEVICE_SWI_SDX55_RMNET(v, p) \ > + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_SDX55_RMNET > + #define DEVICE_SWI_SDX35(v, p) \ > + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_SDX35 > #define DEVICE_HWI(v, p) \ > USB_DEVICE(v, p), .driver_info = QCSERIAL_HWI > > @@ -165,11 +177,21 @@ static const struct usb_device_id id_table[] = { > {DEVICE_SWI(0x1199, 0x907b)}, /* Sierra Wireless EM74xx */ > {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */ > {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */ > - {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */ > + {DEVICE_SWI(0x1199, 0x90b0)}, /* Sierra Wireless EM7565 QDL */ > + {DEVICE_SWI_9X50(0x1199, 0x90b1)}, /* Sierra Wireless EM7565 */ > + {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9190 QDL */ > + {DEVICE_SWI_SDX55(0x1199, 0x90d3)}, /* Sierra Wireless EM9190 */ > + {DEVICE_SWI(0x1199, 0x90d8)}, /* Sierra Wireless EM9190 QDL */ > + {DEVICE_SWI_SDX55_RMNET(0x1199, 0x90d9)}, /* Sierra Wireless EM9190 */ > + {DEVICE_SWI(0x1199, 0x90e0)}, /* Sierra Wireless EM929x QDL */ > + {DEVICE_SWI_SDX55(0x1199, 0x90e1)}, /* Sierra Wireless EM929x */ > + {DEVICE_SWI(0x1199, 0x90e2)}, /* Sierra Wireless EM929x QDL */ > + {DEVICE_SWI_SDX55(0x1199, 0x90e3)}, /* Sierra Wireless EM929x */ > {DEVICE_SWI(0x1199, 0x90e4)}, /* Sierra Wireless EM86xx QDL*/ > {DEVICE_SWI(0x1199, 0x90e5)}, /* Sierra Wireless EM86xx */ > {DEVICE_SWI(0x1199, 0xc080)}, /* Sierra Wireless EM7590 QDL */ > {DEVICE_SWI(0x1199, 0xc081)}, /* Sierra Wireless EM7590 */ > + {DEVICE_SWI_SDX35(0x05c6, 0x90b8)}, /* Sierra Wireless SDX35 */ > {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ > {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ > {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ > @@ -367,6 +389,88 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id) > break; > } > break; > + case QCSERIAL_SWI_SDX55: > + /* > + * Sierra Wireless SDX55 layout: > + * 3: AT-capable modem port > + * 4: DM/DIAG > + */ > + switch (ifnum) { > + case 3: > + dev_dbg(dev, "Modem port found\n"); > + sendsetup = true; > + break; > + case 4: > + dev_dbg(dev, "DM/DIAG interface found\n"); > + break; > + default: > + /* don't claim any unsupported interface */ > + altsetting = -1; > + break; > + } > + break; > + case QCSERIAL_SWI_SDX55_RMNET: > + /* > + * Sierra Wireless SDX55 layout: > + * 1: AT-capable modem port > + * 2: DM > + */ > + switch (ifnum) { > + case 1: > + dev_dbg(dev, "Modem port found\n"); > + sendsetup = true; > + break; > + case 2: > + dev_dbg(dev, "DM/DIAG interface found\n"); > + break; > + default: > + /* don't claim any unsupported interface */ > + altsetting = -1; > + break; > + } > + break; > + case QCSERIAL_SWI_9X50: > + /* > + * Sierra Wireless 9X50 USB-IF layout: > + * 2: AT-capable modem port > + * 3: NMEA > + * 4: DM > + */ > + switch (ifnum) { > + case 2: > + dev_dbg(dev, "Modem port found\n"); > + sendsetup = true; > + break; > + case 3: > + dev_dbg(dev, "NMEA GPS interface found\n"); > + sendsetup = true; > + break; > + case 4: > + dev_dbg(dev, "DM/DIAG interface found\n"); > + break; > + default: > + /* don't claim any unsupported interface */ > + altsetting = -1; > + break; > + } > + break; > + case QCSERIAL_SWI_SDX35: > + /* > + */ > + switch (ifnum) { > + case 0: > + dev_dbg(dev, "DM/DIAG interface found\n"); > + break; > + case 1: > + dev_dbg(dev, "Modem port found\n"); > + sendsetup = true; > + break; > + default: > + /* don't claim any unsupported interface */ > + altsetting = -1; > + break; > + } > + break; > case QCSERIAL_HWI: > /* > * Huawei devices map functions by subclass + protocol > > Hi, This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree. You are receiving this message because of the following common error(s) as indicated below: - Your patch is malformed (tabs converted to spaces, linewrapped, etc.) and can not be applied. Please read the file, Documentation/process/email-clients.rst in order to fix this. - Your patch does not have a Signed-off-by: line. Please read the kernel file, Documentation/process/submitting-patches.rst and resend it after adding that line. Note, the line needs to be in the body of the email, before the patch, not at the bottom of the patch or in the email signature. - You did not specify a description of why the patch is needed, or possibly, any description at all, in the email body. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for what is needed in order to properly describe the change. If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers. thanks, greg k-h's patch email bot
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c index 13c664317a05..f362da97b7de 100644 --- a/drivers/usb/serial/qcserial.c +++ b/drivers/usb/serial/qcserial.c @@ -26,12 +26,24 @@ enum qcserial_layouts { QCSERIAL_G1K = 1, /* Gobi 1000 */ QCSERIAL_SWI = 2, /* Sierra Wireless */ QCSERIAL_HWI = 3, /* Huawei */ + QCSERIAL_SWI_9X50 = 4, /* Sierra Wireless 9x50 USB-IF */ + QCSERIAL_SWI_SDX55 = 5, /* Sierra Wireless SDX55 */ + QCSERIAL_SWI_SDX55_RMNET = 6, /* Sierra Wireless SDX55 rmnet */ + QCSERIAL_SWI_SDX35 = 7, /* Sierra Wireless SDX35 */ }; #define DEVICE_G1K(v, p) \ USB_DEVICE(v, p), .driver_info = QCSERIAL_G1K #define DEVICE_SWI(v, p) \ USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI +#define DEVICE_SWI_9X50(v, p) \ + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_9X50 +#define DEVICE_SWI_SDX55(v, p) \ + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_SDX55 +#define DEVICE_SWI_SDX55_RMNET(v, p) \ + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_SDX55_RMNET + #define DEVICE_SWI_SDX35(v, p) \ + USB_DEVICE(v, p), .driver_info = QCSERIAL_SWI_SDX35 #define DEVICE_HWI(v, p) \ USB_DEVICE(v, p), .driver_info = QCSERIAL_HWI @@ -165,11 +177,21 @@ static const struct usb_device_id id_table[] = { {DEVICE_SWI(0x1199, 0x907b)}, /* Sierra Wireless EM74xx */ {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */ {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */ - {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */ + {DEVICE_SWI(0x1199, 0x90b0)}, /* Sierra Wireless EM7565 QDL */ + {DEVICE_SWI_9X50(0x1199, 0x90b1)}, /* Sierra Wireless EM7565 */ + {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9190 QDL */ + {DEVICE_SWI_SDX55(0x1199, 0x90d3)}, /* Sierra Wireless EM9190 */ + {DEVICE_SWI(0x1199, 0x90d8)}, /* Sierra Wireless EM9190 QDL */ + {DEVICE_SWI_SDX55_RMNET(0x1199, 0x90d9)}, /* Sierra Wireless EM9190 */ + {DEVICE_SWI(0x1199, 0x90e0)}, /* Sierra Wireless EM929x QDL */ + {DEVICE_SWI_SDX55(0x1199, 0x90e1)}, /* Sierra Wireless EM929x */ + {DEVICE_SWI(0x1199, 0x90e2)}, /* Sierra Wireless EM929x QDL */ + {DEVICE_SWI_SDX55(0x1199, 0x90e3)}, /* Sierra Wireless EM929x */ {DEVICE_SWI(0x1199, 0x90e4)}, /* Sierra Wireless EM86xx QDL*/ {DEVICE_SWI(0x1199, 0x90e5)}, /* Sierra Wireless EM86xx */ {DEVICE_SWI(0x1199, 0xc080)}, /* Sierra Wireless EM7590 QDL */ {DEVICE_SWI(0x1199, 0xc081)}, /* Sierra Wireless EM7590 */ + {DEVICE_SWI_SDX35(0x05c6, 0x90b8)}, /* Sierra Wireless SDX35 */ {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ @@ -367,6 +389,88 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id) break; } break; + case QCSERIAL_SWI_SDX55: + /* + * Sierra Wireless SDX55 layout: + * 3: AT-capable modem port + * 4: DM/DIAG + */ + switch (ifnum) { + case 3: + dev_dbg(dev, "Modem port found\n"); + sendsetup = true; + break; + case 4: + dev_dbg(dev, "DM/DIAG interface found\n"); + break; + default: + /* don't claim any unsupported interface */ + altsetting = -1; + break; + } + break; + case QCSERIAL_SWI_SDX55_RMNET: + /* + * Sierra Wireless SDX55 layout: + * 1: AT-capable modem port + * 2: DM + */ + switch (ifnum) { + case 1: + dev_dbg(dev, "Modem port found\n"); + sendsetup = true; + break; + case 2: + dev_dbg(dev, "DM/DIAG interface found\n"); + break; + default: + /* don't claim any unsupported interface */ + altsetting = -1; + break; + } + break; + case QCSERIAL_SWI_9X50: + /* + * Sierra Wireless 9X50 USB-IF layout: + * 2: AT-capable modem port + * 3: NMEA + * 4: DM + */ + switch (ifnum) { + case 2: + dev_dbg(dev, "Modem port found\n"); + sendsetup = true; + break; + case 3: + dev_dbg(dev, "NMEA GPS interface found\n"); + sendsetup = true; + break; + case 4: + dev_dbg(dev, "DM/DIAG interface found\n"); + break; + default: + /* don't claim any unsupported interface */ + altsetting = -1; + break; + } + break; + case QCSERIAL_SWI_SDX35: + /* + */ + switch (ifnum) { + case 0: + dev_dbg(dev, "DM/DIAG interface found\n"); + break; + case 1: + dev_dbg(dev, "Modem port found\n"); + sendsetup = true; + break; + default: + /* don't claim any unsupported interface */ + altsetting = -1; + break; + } + break; case QCSERIAL_HWI: /* * Huawei devices map functions by subclass + protocol