| Message ID | 1307829318-18246-1-git-send-email-marius@kotsbak.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "Marius B. Kotsbak" <marius.kotsbak@gmail.com> Date: Sat, 11 Jun 2011 23:55:18 +0200 > Introducing driver for the network port of Samsung Kalmia based USB LTE modems. > It has also an ACM interface that previous patches associates with the "option" > module. To access those interfaces, the modem must first be switched from modem > mode using a tool like usb_modeswitch. > > As the proprietary protocol has been discovered by watching the MS Windows driver > behavior, there might be errors in the protocol handling, but stable and fast > connection has been established for hours with Norwegian operator NetCom that > distributes this modem with their LTE/4G subscription. > > More and updated information about how to use this driver is available here: > > http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465 > https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver > > Signed-off-by: Marius B. Kotsbak <marius@kotsbak.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Miller <davem@davemloft.net> Date: Sat, 11 Jun 2011 16:27:11 -0700 (PDT) > From: "Marius B. Kotsbak" <marius.kotsbak@gmail.com> > Date: Sat, 11 Jun 2011 23:55:18 +0200 > >> Introducing driver for the network port of Samsung Kalmia based USB LTE modems. >> It has also an ACM interface that previous patches associates with the "option" >> module. To access those interfaces, the modem must first be switched from modem >> mode using a tool like usb_modeswitch. >> >> As the proprietary protocol has been discovered by watching the MS Windows driver >> behavior, there might be errors in the protocol handling, but stable and fast >> connection has been established for hours with Norwegian operator NetCom that >> distributes this modem with their LTE/4G subscription. >> >> More and updated information about how to use this driver is available here: >> >> http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465 >> https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver >> >> Signed-off-by: Marius B. Kotsbak <marius@kotsbak.com> > > Applied, thanks. Actually, reverted. There's a typo in your Makefile patch, and because of this it won't even build the new driver. People are so damn anxious to get this backported into stable and various distributions, yet this patch wasn't even tested properly. That really drives me crazy. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sat, 2011-06-11 at 16:29 -0700, David Miller wrote: > From: David Miller <davem@davemloft.net> > Date: Sat, 11 Jun 2011 16:27:11 -0700 (PDT) > > > From: "Marius B. Kotsbak" <marius.kotsbak@gmail.com> > > Date: Sat, 11 Jun 2011 23:55:18 +0200 > > > >> Introducing driver for the network port of Samsung Kalmia based USB LTE modems. > >> It has also an ACM interface that previous patches associates with the "option" > >> module. To access those interfaces, the modem must first be switched from modem > >> mode using a tool like usb_modeswitch. > >> > >> As the proprietary protocol has been discovered by watching the MS Windows driver > >> behavior, there might be errors in the protocol handling, but stable and fast > >> connection has been established for hours with Norwegian operator NetCom that > >> distributes this modem with their LTE/4G subscription. > >> > >> More and updated information about how to use this driver is available here: > >> > >> http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465 > >> https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver > >> > >> Signed-off-by: Marius B. Kotsbak <marius@kotsbak.com> > > > > Applied, thanks. > > Actually, reverted. > > There's a typo in your Makefile patch, and because of this it > won't even build the new driver. [...] Surely the error is in the Kconfig - the 'CONFIG_' prefix should not be there. Ben.
On 12. juni 2011 01:29, David Miller wrote: > From: David Miller <davem@davemloft.net> > Date: Sat, 11 Jun 2011 16:27:11 -0700 (PDT) > >> From: "Marius B. Kotsbak" <marius.kotsbak@gmail.com> >> Date: Sat, 11 Jun 2011 23:55:18 +0200 >> >>> Introducing driver for the network port of Samsung Kalmia based USB LTE modems. >>> It has also an ACM interface that previous patches associates with the "option" >>> module. To access those interfaces, the modem must first be switched from modem >>> mode using a tool like usb_modeswitch. >>> >>> As the proprietary protocol has been discovered by watching the MS Windows driver >>> behavior, there might be errors in the protocol handling, but stable and fast >>> connection has been established for hours with Norwegian operator NetCom that >>> distributes this modem with their LTE/4G subscription. >>> >>> More and updated information about how to use this driver is available here: >>> >>> http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465 >>> https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver >>> >>> Signed-off-by: Marius B. Kotsbak <marius@kotsbak.com> >> Applied, thanks. > Actually, reverted. > > There's a typo in your Makefile patch, and because of this it > won't even build the new driver. Oh sorry, I did make on the actual kalmia.ko to avoid building all modules, so I did not notice. Sending a fixed patch. Ben, thanks for pointing out. > People are so damn anxious to get this backported into stable > and various distributions, Japp, people keeps asking for a version that compiles with kernel 2.6.32 for the Ubuntu LTS... > yet this patch wasn't even tested > properly. We were compiling it out of the kernel tree until now. -- Marius -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Samstag, 11. Juni 2011, 23:55:18 schrieb Marius B. Kotsbak: Hi, thanks for writing a new driver. My comments are included in the quote. Regards Oliver > +static int > +kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr) > +{ > + char init_msg_1[] = > + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, > + 0x00, 0x00 }; > + char init_msg_2[] = > + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4, > + 0x00, 0x00 }; > + char receive_buf[28]; You are doing DMA on the stack. This will fail on some architectures. > + int status; > + > + status = kalmia_send_init_packet(dev, init_msg_1, sizeof(init_msg_1) > + / sizeof(init_msg_1[0]), receive_buf, 24); > + if (status != 0) > + return status; > + > + status = kalmia_send_init_packet(dev, init_msg_2, sizeof(init_msg_2) > + / sizeof(init_msg_2[0]), receive_buf, 28); > + if (status != 0) > + return status; > + > + memcpy(ethernet_addr, receive_buf + 10, ETH_ALEN); > + > + return status; > +} > + > +static int > +kalmia_bind(struct usbnet *dev, struct usb_interface *intf) > +{ > + u8 status; > + u8 ethernet_addr[ETH_ALEN]; > + > + /* Don't bind to AT command interface */ > + if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC) > + return -EINVAL; > + > + dev->in = usb_rcvbulkpipe(dev->udev, 0x81 & USB_ENDPOINT_NUMBER_MASK); > + dev->out = usb_sndbulkpipe(dev->udev, 0x02 & USB_ENDPOINT_NUMBER_MASK); > + dev->status = NULL; > + > + dev->net->hard_header_len += KALMIA_HEADER_LENGTH; > + dev->hard_mtu = 1400; > + dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing > + > + status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr); > + > + if (status < 0) { > + usb_set_intfdata(intf, NULL); > + usb_driver_release_interface(driver_of(intf), intf); > + return status; Why are you doing this? What is to be undone? > + } > + > + memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN); > + memcpy(dev->net->perm_addr, ethernet_addr, ETH_ALEN); > + > + return status; > +} > + > +static struct sk_buff * > +kalmia_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) > +{ > + struct sk_buff *skb2 = NULL; > + u16 content_len; > + unsigned char *header_start; > + unsigned char ether_type_1, ether_type_2; > + u8 remainder, padlen = 0; > + > + if (!skb_cloned(skb)) { > + int headroom = skb_headroom(skb); > + int tailroom = skb_tailroom(skb); > + > + if ((tailroom >= KALMIA_ALIGN_SIZE) && (headroom > + >= KALMIA_HEADER_LENGTH)) > + goto done; > + > + if ((headroom + tailroom) > (KALMIA_HEADER_LENGTH > + + KALMIA_ALIGN_SIZE)) { > + skb->data = memmove(skb->head + KALMIA_HEADER_LENGTH, > + skb->data, skb->len); > + skb_set_tail_pointer(skb, skb->len); > + goto done; > + } > + } > + > + skb2 = skb_copy_expand(skb, KALMIA_HEADER_LENGTH, > + KALMIA_ALIGN_SIZE, flags); > + if (!skb2) > + return NULL; > + > + dev_kfree_skb_any(skb); > + skb = skb2; > + > + done: header_start = skb_push(skb, KALMIA_HEADER_LENGTH); coding style > + ether_type_1 = header_start[KALMIA_HEADER_LENGTH + 12]; > + ether_type_2 = header_start[KALMIA_HEADER_LENGTH + 13]; > + > + netdev_dbg(dev->net, "Sending etherType: %02x%02x", ether_type_1, > + ether_type_2); > + > + /* According to empiric data for data packages */ > + header_start[0] = 0x57; > + header_start[1] = 0x44; > + content_len = skb->len - KALMIA_HEADER_LENGTH; > + header_start[2] = (content_len & 0xff); /* low byte */ > + header_start[3] = (content_len >> 8); /* high byte */ Please use an endianness macro > + header_start[4] = ether_type_1; > + header_start[5] = ether_type_2; > + > + /* Align to 4 bytes by padding with zeros */ > + remainder = skb->len % KALMIA_ALIGN_SIZE; > + if (remainder > 0) { > + padlen = KALMIA_ALIGN_SIZE - remainder; > + memset(skb_put(skb, padlen), 0, padlen); > + } > + > + netdev_dbg( > + dev->net, > + "Sending package with length %i and padding %i. Header: %02x:%02x:%02x:%02x:%02x:%02x.", > + content_len, padlen, header_start[0], header_start[1], > + header_start[2], header_start[3], header_start[4], > + header_start[5]); > + > + return skb; > +} > + > +static int > +kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) > +{ > + /* > + * Our task here is to strip off framing, leaving skb with one > + * data frame for the usbnet framework code to process. > + */ > + const u8 HEADER_END_OF_USB_PACKET[] = > + { 0x57, 0x5a, 0x00, 0x00, 0x08, 0x00 }; > + const u8 EXPECTED_UNKNOWN_HEADER_1[] = > + { 0x57, 0x43, 0x1e, 0x00, 0x15, 0x02 }; > + const u8 EXPECTED_UNKNOWN_HEADER_2[] = > + { 0x57, 0x50, 0x0e, 0x00, 0x00, 0x00 }; What does the compiler do to this declaration? > + u8 i = 0; Why not int? > + > + /* incomplete header? */ > + if (skb->len < KALMIA_HEADER_LENGTH) > + return 0; > + > + do { > + struct sk_buff *skb2 = NULL; > + u8 *header_start; > + u16 usb_packet_length, ether_packet_length; > + int is_last; > + > + header_start = skb->data; > + > + if (unlikely(header_start[0] != 0x57 || header_start[1] != 0x44)) { > + if (!memcmp(header_start, EXPECTED_UNKNOWN_HEADER_1, > + sizeof(EXPECTED_UNKNOWN_HEADER_1)) || !memcmp( > + header_start, EXPECTED_UNKNOWN_HEADER_2, > + sizeof(EXPECTED_UNKNOWN_HEADER_2))) { > + netdev_dbg( > + dev->net, > + "Received expected unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", > + header_start[0], header_start[1], > + header_start[2], header_start[3], > + header_start[4], header_start[5], > + skb->len - KALMIA_HEADER_LENGTH); > + } > + else { > + netdev_err( > + dev->net, > + "Received unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", > + header_start[0], header_start[1], > + header_start[2], header_start[3], > + header_start[4], header_start[5], > + skb->len - KALMIA_HEADER_LENGTH); > + return 0; > + } > + } > + else > + netdev_dbg( > + dev->net, > + "Received header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", > + header_start[0], header_start[1], header_start[2], > + header_start[3], header_start[4], header_start[5], > + skb->len - KALMIA_HEADER_LENGTH); > + > + /* subtract start header and end header */ > + usb_packet_length = skb->len - (2 * KALMIA_HEADER_LENGTH); > + ether_packet_length = header_start[2] + (header_start[3] << 8); Please use an endianness macro > + skb_pull(skb, KALMIA_HEADER_LENGTH); > + > + /* Some small packets misses end marker */ > + if (usb_packet_length < ether_packet_length) { > + ether_packet_length = usb_packet_length > + + KALMIA_HEADER_LENGTH; > + is_last = true; > + } > + else { > + netdev_dbg(dev->net, "Correct package length #%i", i > + + 1); > + > + is_last = (memcmp(skb->data + ether_packet_length, > + HEADER_END_OF_USB_PACKET, > + sizeof(HEADER_END_OF_USB_PACKET)) == 0); > + if (!is_last) { > + header_start = skb->data + ether_packet_length; > + netdev_dbg( > + dev->net, > + "End header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", > + header_start[0], header_start[1], > + header_start[2], header_start[3], > + header_start[4], header_start[5], > + skb->len - KALMIA_HEADER_LENGTH); > + } > + } > + > + if (is_last) { > + skb2 = skb; > + } > + else { > + skb2 = skb_clone(skb, GFP_ATOMIC); > + if (unlikely(!skb2)) > + return 0; > + } > + > + skb_trim(skb2, ether_packet_length); > + > + if (is_last) { > + return 1; > + } > + else { > + usbnet_skb_return(dev, skb2); > + skb_pull(skb, ether_packet_length); > + } > + > + i++; > + } > + while (skb->len); > + > + return 1; > +} > + > +static const struct driver_info kalmia_info = { > + .description = "Samsung Kalmia LTE USB dongle", > + .flags = FLAG_WWAN, > + .bind = kalmia_bind, > + .rx_fixup = kalmia_rx_fixup, > + .tx_fixup = kalmia_tx_fixup > +}; > + > +/*-------------------------------------------------------------------------*/ > + > +static const struct usb_device_id products[] = { > + /* The unswitched USB ID, to get the module auto loaded: */ > + { USB_DEVICE(0x04e8, 0x689a) }, Why is this needed? Doesn't the switch trigger an autoload? > + /* The stick swithed into modem (by e.g. usb_modeswitch): */ > + { USB_DEVICE(0x04e8, 0x6889), > + .driver_info = (unsigned long) &kalmia_info, }, > + { /* EMPTY == end of list */} }; -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Den 14. juni 2011 10:49, skrev Oliver Neukum: > Am Samstag, 11. Juni 2011, 23:55:18 schrieb Marius B. Kotsbak: > >> +static int >> +kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr) >> +{ >> + char init_msg_1[] = >> + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, >> + 0x00, 0x00 }; >> + char init_msg_2[] = >> + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4, >> + 0x00, 0x00 }; >> + char receive_buf[28]; > You are doing DMA on the stack. This will fail on some architectures. > Okay, a bit strange that this API is available then. Which API functions should be used in this case? >> + int status; >> + >> + status = kalmia_send_init_packet(dev, init_msg_1, sizeof(init_msg_1) >> + / sizeof(init_msg_1[0]), receive_buf, 24); >> + if (status != 0) >> + return status; >> + >> + status = kalmia_send_init_packet(dev, init_msg_2, sizeof(init_msg_2) >> + / sizeof(init_msg_2[0]), receive_buf, 28); >> + if (status != 0) >> + return status; >> + >> + memcpy(ethernet_addr, receive_buf + 10, ETH_ALEN); >> + >> + return status; >> +} >> + >> +static int >> +kalmia_bind(struct usbnet *dev, struct usb_interface *intf) >> +{ >> + u8 status; >> + u8 ethernet_addr[ETH_ALEN]; >> + >> + /* Don't bind to AT command interface */ >> + if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC) >> + return -EINVAL; >> + >> + dev->in = usb_rcvbulkpipe(dev->udev, 0x81& USB_ENDPOINT_NUMBER_MASK); >> + dev->out = usb_sndbulkpipe(dev->udev, 0x02& USB_ENDPOINT_NUMBER_MASK); >> + dev->status = NULL; >> + >> + dev->net->hard_header_len += KALMIA_HEADER_LENGTH; >> + dev->hard_mtu = 1400; >> + dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing >> + >> + status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr); >> + >> + if (status< 0) { >> + usb_set_intfdata(intf, NULL); >> + usb_driver_release_interface(driver_of(intf), intf); >> + return status; > Why are you doing this? What is to be undone? You mean the 3 last lines? I just did the same as done in another similar usbnet based driver. Is it incorrect if the init fails? >> + } >> + >> + memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN); >> + memcpy(dev->net->perm_addr, ethernet_addr, ETH_ALEN); >> + >> + return status; >> +} >> + >> +static struct sk_buff * >> +kalmia_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) >> +{ >> + struct sk_buff *skb2 = NULL; >> + u16 content_len; >> + unsigned char *header_start; >> + unsigned char ether_type_1, ether_type_2; >> + u8 remainder, padlen = 0; >> + >> + if (!skb_cloned(skb)) { >> + int headroom = skb_headroom(skb); >> + int tailroom = skb_tailroom(skb); >> + >> + if ((tailroom>= KALMIA_ALIGN_SIZE)&& (headroom >> + >= KALMIA_HEADER_LENGTH)) >> + goto done; >> + >> + if ((headroom + tailroom)> (KALMIA_HEADER_LENGTH >> + + KALMIA_ALIGN_SIZE)) { >> + skb->data = memmove(skb->head + KALMIA_HEADER_LENGTH, >> + skb->data, skb->len); >> + skb_set_tail_pointer(skb, skb->len); >> + goto done; >> + } >> + } >> + >> + skb2 = skb_copy_expand(skb, KALMIA_HEADER_LENGTH, >> + KALMIA_ALIGN_SIZE, flags); >> + if (!skb2) >> + return NULL; >> + >> + dev_kfree_skb_any(skb); >> + skb = skb2; >> + >> + done: header_start = skb_push(skb, KALMIA_HEADER_LENGTH); > coding style The last line? I see. >> + ether_type_1 = header_start[KALMIA_HEADER_LENGTH + 12]; >> + ether_type_2 = header_start[KALMIA_HEADER_LENGTH + 13]; >> + >> + netdev_dbg(dev->net, "Sending etherType: %02x%02x", ether_type_1, >> + ether_type_2); >> + >> + /* According to empiric data for data packages */ >> + header_start[0] = 0x57; >> + header_start[1] = 0x44; >> + content_len = skb->len - KALMIA_HEADER_LENGTH; >> + header_start[2] = (content_len& 0xff); /* low byte */ >> + header_start[3] = (content_len>> 8); /* high byte */ > Please use an endianness macro Wil fix. It will be very relevant to support other architectures for this driver, as I want to run it on a ARM based NAS as LTE router. >> + header_start[4] = ether_type_1; >> + header_start[5] = ether_type_2; >> + >> + /* Align to 4 bytes by padding with zeros */ >> + remainder = skb->len % KALMIA_ALIGN_SIZE; >> + if (remainder> 0) { >> + padlen = KALMIA_ALIGN_SIZE - remainder; >> + memset(skb_put(skb, padlen), 0, padlen); >> + } >> + >> + netdev_dbg( >> + dev->net, >> + "Sending package with length %i and padding %i. Header: %02x:%02x:%02x:%02x:%02x:%02x.", >> + content_len, padlen, header_start[0], header_start[1], >> + header_start[2], header_start[3], header_start[4], >> + header_start[5]); >> + >> + return skb; >> +} >> + >> +static int >> +kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) >> +{ >> + /* >> + * Our task here is to strip off framing, leaving skb with one >> + * data frame for the usbnet framework code to process. >> + */ >> + const u8 HEADER_END_OF_USB_PACKET[] = >> + { 0x57, 0x5a, 0x00, 0x00, 0x08, 0x00 }; >> + const u8 EXPECTED_UNKNOWN_HEADER_1[] = >> + { 0x57, 0x43, 0x1e, 0x00, 0x15, 0x02 }; >> + const u8 EXPECTED_UNKNOWN_HEADER_2[] = >> + { 0x57, 0x50, 0x0e, 0x00, 0x00, 0x00 }; > What does the compiler do to this declaration? Not sure I understand what you mean here. >> + u8 i = 0; > Why not int? I can change that. Thought int was not to be used because it is of unknown size. >> + >> + /* incomplete header? */ >> + if (skb->len< KALMIA_HEADER_LENGTH) >> + return 0; >> + >> + do { >> + struct sk_buff *skb2 = NULL; >> + u8 *header_start; >> + u16 usb_packet_length, ether_packet_length; >> + int is_last; >> + >> + header_start = skb->data; >> + >> + if (unlikely(header_start[0] != 0x57 || header_start[1] != 0x44)) { >> + if (!memcmp(header_start, EXPECTED_UNKNOWN_HEADER_1, >> + sizeof(EXPECTED_UNKNOWN_HEADER_1)) || !memcmp( >> + header_start, EXPECTED_UNKNOWN_HEADER_2, >> + sizeof(EXPECTED_UNKNOWN_HEADER_2))) { >> + netdev_dbg( >> + dev->net, >> + "Received expected unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", >> + header_start[0], header_start[1], >> + header_start[2], header_start[3], >> + header_start[4], header_start[5], >> + skb->len - KALMIA_HEADER_LENGTH); >> + } >> + else { >> + netdev_err( >> + dev->net, >> + "Received unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", >> + header_start[0], header_start[1], >> + header_start[2], header_start[3], >> + header_start[4], header_start[5], >> + skb->len - KALMIA_HEADER_LENGTH); >> + return 0; >> + } >> + } >> + else >> + netdev_dbg( >> + dev->net, >> + "Received header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", >> + header_start[0], header_start[1], header_start[2], >> + header_start[3], header_start[4], header_start[5], >> + skb->len - KALMIA_HEADER_LENGTH); >> + >> + /* subtract start header and end header */ >> + usb_packet_length = skb->len - (2 * KALMIA_HEADER_LENGTH); >> + ether_packet_length = header_start[2] + (header_start[3]<< 8); > Please use an endianness macro Oki. >> + skb_pull(skb, KALMIA_HEADER_LENGTH); >> + >> + /* Some small packets misses end marker */ >> + if (usb_packet_length< ether_packet_length) { >> + ether_packet_length = usb_packet_length >> + + KALMIA_HEADER_LENGTH; >> + is_last = true; >> + } >> + else { >> + netdev_dbg(dev->net, "Correct package length #%i", i >> + + 1); >> + >> + is_last = (memcmp(skb->data + ether_packet_length, >> + HEADER_END_OF_USB_PACKET, >> + sizeof(HEADER_END_OF_USB_PACKET)) == 0); >> + if (!is_last) { >> + header_start = skb->data + ether_packet_length; >> + netdev_dbg( >> + dev->net, >> + "End header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", >> + header_start[0], header_start[1], >> + header_start[2], header_start[3], >> + header_start[4], header_start[5], >> + skb->len - KALMIA_HEADER_LENGTH); >> + } >> + } >> + >> + if (is_last) { >> + skb2 = skb; >> + } >> + else { >> + skb2 = skb_clone(skb, GFP_ATOMIC); >> + if (unlikely(!skb2)) >> + return 0; >> + } >> + >> + skb_trim(skb2, ether_packet_length); >> + >> + if (is_last) { >> + return 1; >> + } >> + else { >> + usbnet_skb_return(dev, skb2); >> + skb_pull(skb, ether_packet_length); >> + } >> + >> + i++; >> + } >> + while (skb->len); >> + >> + return 1; >> +} >> + >> +static const struct driver_info kalmia_info = { >> + .description = "Samsung Kalmia LTE USB dongle", >> + .flags = FLAG_WWAN, >> + .bind = kalmia_bind, >> + .rx_fixup = kalmia_rx_fixup, >> + .tx_fixup = kalmia_tx_fixup >> +}; >> + >> +/*-------------------------------------------------------------------------*/ >> + >> +static const struct usb_device_id products[] = { >> + /* The unswitched USB ID, to get the module auto loaded: */ >> + { USB_DEVICE(0x04e8, 0x689a) }, > Why is this needed? Doesn't the switch trigger an autoload? Please see the comment from Dan Williams. Will test his proposal. Anyway it should not do any damage for anyone (I think even the driver disk is available with this included). The module could in fact also do the switch into modem mode to avoid the dependency on usb_modeswitch. -- Marius -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Dienstag, 14. Juni 2011, 11:32:00 schrieb Marius Kotsbak: > Den 14. juni 2011 10:49, skrev Oliver Neukum: > > Am Samstag, 11. Juni 2011, 23:55:18 schrieb Marius B. Kotsbak: > > > >> +static int > >> +kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr) > >> +{ > >> + char init_msg_1[] = > >> + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, > >> + 0x00, 0x00 }; > >> + char init_msg_2[] = > >> + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4, > >> + 0x00, 0x00 }; > >> + char receive_buf[28]; > > You are doing DMA on the stack. This will fail on some architectures. > > > > Okay, a bit strange that this API is available then. Which API functions > should be used in this case? The API is correct. You just need to copy the init strings into buffers allocated with kmalloc. > >> + if (status< 0) { > >> + usb_set_intfdata(intf, NULL); > >> + usb_driver_release_interface(driver_of(intf), intf); > >> + return status; > > Why are you doing this? What is to be undone? > > You mean the 3 last lines? I just did the same as done in another > similar usbnet based driver. Is it incorrect if the init fails? Yes, the last three lines. If all drivers do that this is an opportunity to share common code in usbnet. I'll look at it. > >> +static int > >> +kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) > >> +{ > >> + /* > >> + * Our task here is to strip off framing, leaving skb with one > >> + * data frame for the usbnet framework code to process. > >> + */ > >> + const u8 HEADER_END_OF_USB_PACKET[] = > >> + { 0x57, 0x5a, 0x00, 0x00, 0x08, 0x00 }; > >> + const u8 EXPECTED_UNKNOWN_HEADER_1[] = > >> + { 0x57, 0x43, 0x1e, 0x00, 0x15, 0x02 }; > >> + const u8 EXPECTED_UNKNOWN_HEADER_2[] = > >> + { 0x57, 0x50, 0x0e, 0x00, 0x00, 0x00 }; > > What does the compiler do to this declaration? > > Not sure I understand what you mean here. Will the compiler put those strings into the image or build them on the stack each time the function is called? Shouldn't they be static? > >> + u8 i = 0; > > Why not int? > > I can change that. Thought int was not to be used because it is of > unknown size. Well, then are you sure i will never be larger than 255? > Anyway it should not do any damage for anyone (I think even the driver > disk is available with this included). The module could in fact also do > the switch into modem mode to avoid the dependency on usb_modeswitch. Please don't do that. It has been decided to put such things into usb_modeswitch for now. Regards Oliver -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 14. juni 2011 11:46, Oliver Neukum wrote: > Am Dienstag, 14. Juni 2011, 11:32:00 schrieb Marius Kotsbak: >> Den 14. juni 2011 10:49, skrev Oliver Neukum: >>> Am Samstag, 11. Juni 2011, 23:55:18 schrieb Marius B. Kotsbak: >>> >>>> +static int >>>> +kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr) >>>> +{ >>>> + char init_msg_1[] = >>>> + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, >>>> + 0x00, 0x00 }; >>>> + char init_msg_2[] = >>>> + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4, >>>> + 0x00, 0x00 }; >>>> + char receive_buf[28]; >>> You are doing DMA on the stack. This will fail on some architectures. >>> >> Okay, a bit strange that this API is available then. Which API functions >> should be used in this case? > The API is correct. You just need to copy the init strings into buffers > allocated with kmalloc. > This should be addressed in the extra patch just sent. And it still works on my x86-64. The 2 patches might be squashed if desired. > > Will the compiler put those strings into the image or build them on > the stack each time the function is called? Shouldn't they be static? > Fixed. It probably improves performance too. >> Anyway it should not do any damage for anyone (I think even the driver >> disk is available with this included). The module could in fact also do >> the switch into modem mode to avoid the dependency on usb_modeswitch. > Please don't do that. It has been decided to put such things into usb_modeswitch > for now. Okay, I can see the reasoning behind that. The problem is just that it would be nice to avoid it because >1.1.4 versions of it does not work with this modem, but that can be addressed there as well. -- Marius -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Am Sonntag, 19. Juni 2011, 23:53:28 schrieb Marius Kotsbak: > On 14. juni 2011 11:46, Oliver Neukum wrote: > > Am Dienstag, 14. Juni 2011, 11:32:00 schrieb Marius Kotsbak: > >> Den 14. juni 2011 10:49, skrev Oliver Neukum: > > The API is correct. You just need to copy the init strings into buffers > > allocated with kmalloc. > > > > This should be addressed in the extra patch just sent. And it still > works on my x86-64. x86-64 works. ppc and arm are hurt. > The 2 patches might be squashed if desired. David? > Okay, I can see the reasoning behind that. The problem is just that it > would be nice to avoid it because >1.1.4 versions of it does not work > with this modem, but that can be addressed there as well. All's well, as far as I can see. Regards Oliver -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 9d4f911..b6e4efc 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig @@ -385,6 +385,16 @@ config USB_NET_CX82310_ETH router with USB ethernet port. This driver is for routers only, it will not work with ADSL modems (use cxacru driver instead). +config CONFIG_USB_NET_KALMIA + tristate "Samsung Kalmia based LTE USB modem" + depends on USB_USBNET + help + Choose this option if you have a Samsung Kalmia based USB modem + as Samsung GT-B3730. + + To compile this driver as a module, choose M here: the + module will be called kalmia. + config USB_HSO tristate "Option USB High Speed Mobile Devices" depends on USB && RFKILL diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile index c7ec8a5..c203fa2 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_USB_NET_MCS7830) += mcs7830.o obj-$(CONFIG_USB_USBNET) += usbnet.o obj-$(CONFIG_USB_NET_INT51X1) += int51x1.o obj-$(CONFIG_USB_CDC_PHONET) += cdc-phonet.o +obj-$(CONFIG_USB_NET_KALMIA) += kalmia.o obj-$(CONFIG_USB_IPHETH) += ipheth.o obj-$(CONFIG_USB_SIERRA_NET) += sierra_net.o obj-$(CONFIG_USB_NET_CX82310_ETH) += cx82310_eth.o diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c new file mode 100644 index 0000000..d965fb1 --- /dev/null +++ b/drivers/net/usb/kalmia.c @@ -0,0 +1,384 @@ +/* + * USB network interface driver for Samsung Kalmia based LTE USB modem like the + * Samsung GT-B3730 and GT-B3710. + * + * Copyright (C) 2011 Marius Bjoernstad Kotsbak <marius@kotsbak.com> + * + * Sponsored by Quicklink Video Distribution Services Ltd. + * + * Based on the cdc_eem module. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/netdevice.h> +#include <linux/etherdevice.h> +#include <linux/ctype.h> +#include <linux/ethtool.h> +#include <linux/workqueue.h> +#include <linux/mii.h> +#include <linux/usb.h> +#include <linux/crc32.h> +#include <linux/usb/cdc.h> +#include <linux/usb/usbnet.h> +#include <linux/gfp.h> + +/* + * The Samsung Kalmia based LTE USB modems have a CDC ACM port for modem control + * handled by the "option" module and an ethernet data port handled by this + * module. + * + * The stick must first be switched into modem mode by usb_modeswitch + * or similar tool. Then the modem gets sent two initialization packets by + * this module, which gives the MAC address of the device. User space can then + * connect the modem using AT commands through the ACM port and then use + * DHCP on the network interface exposed by this module. Network packets are + * sent to and from the modem in a proprietary format discovered after watching + * the behavior of the windows driver for the modem. + * + * More information about the use of the modem is available in usb_modeswitch + * forum and the project page: + * + * http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465 + * https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver + */ + +/* #define DEBUG */ +/* #define VERBOSE */ + +#define KALMIA_HEADER_LENGTH 6 +#define KALMIA_ALIGN_SIZE 4 +#define KALMIA_USB_TIMEOUT 10000 + +/*-------------------------------------------------------------------------*/ + +static int +kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len, + u8 *buffer, u8 expected_len) +{ + int act_len; + int status; + + netdev_dbg(dev->net, "Sending init packet"); + + status = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 0x02), + init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT); + if (status != 0) { + netdev_err(dev->net, + "Error sending init packet. Status %i, length %i\n", + status, act_len); + return status; + } + else if (act_len != init_msg_len) { + netdev_err(dev->net, + "Did not send all of init packet. Bytes sent: %i", + act_len); + } + else { + netdev_dbg(dev->net, "Successfully sent init packet."); + } + + status = usb_bulk_msg(dev->udev, usb_rcvbulkpipe(dev->udev, 0x81), + buffer, expected_len, &act_len, KALMIA_USB_TIMEOUT); + + if (status != 0) + netdev_err(dev->net, + "Error receiving init result. Status %i, length %i\n", + status, act_len); + else if (act_len != expected_len) + netdev_err(dev->net, "Unexpected init result length: %i\n", + act_len); + + return status; +} + +static int +kalmia_init_and_get_ethernet_addr(struct usbnet *dev, u8 *ethernet_addr) +{ + char init_msg_1[] = + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, + 0x00, 0x00 }; + char init_msg_2[] = + { 0x57, 0x50, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf4, + 0x00, 0x00 }; + char receive_buf[28]; + int status; + + status = kalmia_send_init_packet(dev, init_msg_1, sizeof(init_msg_1) + / sizeof(init_msg_1[0]), receive_buf, 24); + if (status != 0) + return status; + + status = kalmia_send_init_packet(dev, init_msg_2, sizeof(init_msg_2) + / sizeof(init_msg_2[0]), receive_buf, 28); + if (status != 0) + return status; + + memcpy(ethernet_addr, receive_buf + 10, ETH_ALEN); + + return status; +} + +static int +kalmia_bind(struct usbnet *dev, struct usb_interface *intf) +{ + u8 status; + u8 ethernet_addr[ETH_ALEN]; + + /* Don't bind to AT command interface */ + if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC) + return -EINVAL; + + dev->in = usb_rcvbulkpipe(dev->udev, 0x81 & USB_ENDPOINT_NUMBER_MASK); + dev->out = usb_sndbulkpipe(dev->udev, 0x02 & USB_ENDPOINT_NUMBER_MASK); + dev->status = NULL; + + dev->net->hard_header_len += KALMIA_HEADER_LENGTH; + dev->hard_mtu = 1400; + dev->rx_urb_size = dev->hard_mtu * 10; // Found as optimal after testing + + status = kalmia_init_and_get_ethernet_addr(dev, ethernet_addr); + + if (status < 0) { + usb_set_intfdata(intf, NULL); + usb_driver_release_interface(driver_of(intf), intf); + return status; + } + + memcpy(dev->net->dev_addr, ethernet_addr, ETH_ALEN); + memcpy(dev->net->perm_addr, ethernet_addr, ETH_ALEN); + + return status; +} + +static struct sk_buff * +kalmia_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) +{ + struct sk_buff *skb2 = NULL; + u16 content_len; + unsigned char *header_start; + unsigned char ether_type_1, ether_type_2; + u8 remainder, padlen = 0; + + if (!skb_cloned(skb)) { + int headroom = skb_headroom(skb); + int tailroom = skb_tailroom(skb); + + if ((tailroom >= KALMIA_ALIGN_SIZE) && (headroom + >= KALMIA_HEADER_LENGTH)) + goto done; + + if ((headroom + tailroom) > (KALMIA_HEADER_LENGTH + + KALMIA_ALIGN_SIZE)) { + skb->data = memmove(skb->head + KALMIA_HEADER_LENGTH, + skb->data, skb->len); + skb_set_tail_pointer(skb, skb->len); + goto done; + } + } + + skb2 = skb_copy_expand(skb, KALMIA_HEADER_LENGTH, + KALMIA_ALIGN_SIZE, flags); + if (!skb2) + return NULL; + + dev_kfree_skb_any(skb); + skb = skb2; + + done: header_start = skb_push(skb, KALMIA_HEADER_LENGTH); + ether_type_1 = header_start[KALMIA_HEADER_LENGTH + 12]; + ether_type_2 = header_start[KALMIA_HEADER_LENGTH + 13]; + + netdev_dbg(dev->net, "Sending etherType: %02x%02x", ether_type_1, + ether_type_2); + + /* According to empiric data for data packages */ + header_start[0] = 0x57; + header_start[1] = 0x44; + content_len = skb->len - KALMIA_HEADER_LENGTH; + header_start[2] = (content_len & 0xff); /* low byte */ + header_start[3] = (content_len >> 8); /* high byte */ + + header_start[4] = ether_type_1; + header_start[5] = ether_type_2; + + /* Align to 4 bytes by padding with zeros */ + remainder = skb->len % KALMIA_ALIGN_SIZE; + if (remainder > 0) { + padlen = KALMIA_ALIGN_SIZE - remainder; + memset(skb_put(skb, padlen), 0, padlen); + } + + netdev_dbg( + dev->net, + "Sending package with length %i and padding %i. Header: %02x:%02x:%02x:%02x:%02x:%02x.", + content_len, padlen, header_start[0], header_start[1], + header_start[2], header_start[3], header_start[4], + header_start[5]); + + return skb; +} + +static int +kalmia_rx_fixup(struct usbnet *dev, struct sk_buff *skb) +{ + /* + * Our task here is to strip off framing, leaving skb with one + * data frame for the usbnet framework code to process. + */ + const u8 HEADER_END_OF_USB_PACKET[] = + { 0x57, 0x5a, 0x00, 0x00, 0x08, 0x00 }; + const u8 EXPECTED_UNKNOWN_HEADER_1[] = + { 0x57, 0x43, 0x1e, 0x00, 0x15, 0x02 }; + const u8 EXPECTED_UNKNOWN_HEADER_2[] = + { 0x57, 0x50, 0x0e, 0x00, 0x00, 0x00 }; + u8 i = 0; + + /* incomplete header? */ + if (skb->len < KALMIA_HEADER_LENGTH) + return 0; + + do { + struct sk_buff *skb2 = NULL; + u8 *header_start; + u16 usb_packet_length, ether_packet_length; + int is_last; + + header_start = skb->data; + + if (unlikely(header_start[0] != 0x57 || header_start[1] != 0x44)) { + if (!memcmp(header_start, EXPECTED_UNKNOWN_HEADER_1, + sizeof(EXPECTED_UNKNOWN_HEADER_1)) || !memcmp( + header_start, EXPECTED_UNKNOWN_HEADER_2, + sizeof(EXPECTED_UNKNOWN_HEADER_2))) { + netdev_dbg( + dev->net, + "Received expected unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", + header_start[0], header_start[1], + header_start[2], header_start[3], + header_start[4], header_start[5], + skb->len - KALMIA_HEADER_LENGTH); + } + else { + netdev_err( + dev->net, + "Received unknown frame header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", + header_start[0], header_start[1], + header_start[2], header_start[3], + header_start[4], header_start[5], + skb->len - KALMIA_HEADER_LENGTH); + return 0; + } + } + else + netdev_dbg( + dev->net, + "Received header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", + header_start[0], header_start[1], header_start[2], + header_start[3], header_start[4], header_start[5], + skb->len - KALMIA_HEADER_LENGTH); + + /* subtract start header and end header */ + usb_packet_length = skb->len - (2 * KALMIA_HEADER_LENGTH); + ether_packet_length = header_start[2] + (header_start[3] << 8); + skb_pull(skb, KALMIA_HEADER_LENGTH); + + /* Some small packets misses end marker */ + if (usb_packet_length < ether_packet_length) { + ether_packet_length = usb_packet_length + + KALMIA_HEADER_LENGTH; + is_last = true; + } + else { + netdev_dbg(dev->net, "Correct package length #%i", i + + 1); + + is_last = (memcmp(skb->data + ether_packet_length, + HEADER_END_OF_USB_PACKET, + sizeof(HEADER_END_OF_USB_PACKET)) == 0); + if (!is_last) { + header_start = skb->data + ether_packet_length; + netdev_dbg( + dev->net, + "End header: %02x:%02x:%02x:%02x:%02x:%02x. Package length: %i\n", + header_start[0], header_start[1], + header_start[2], header_start[3], + header_start[4], header_start[5], + skb->len - KALMIA_HEADER_LENGTH); + } + } + + if (is_last) { + skb2 = skb; + } + else { + skb2 = skb_clone(skb, GFP_ATOMIC); + if (unlikely(!skb2)) + return 0; + } + + skb_trim(skb2, ether_packet_length); + + if (is_last) { + return 1; + } + else { + usbnet_skb_return(dev, skb2); + skb_pull(skb, ether_packet_length); + } + + i++; + } + while (skb->len); + + return 1; +} + +static const struct driver_info kalmia_info = { + .description = "Samsung Kalmia LTE USB dongle", + .flags = FLAG_WWAN, + .bind = kalmia_bind, + .rx_fixup = kalmia_rx_fixup, + .tx_fixup = kalmia_tx_fixup +}; + +/*-------------------------------------------------------------------------*/ + +static const struct usb_device_id products[] = { + /* The unswitched USB ID, to get the module auto loaded: */ + { USB_DEVICE(0x04e8, 0x689a) }, + /* The stick swithed into modem (by e.g. usb_modeswitch): */ + { USB_DEVICE(0x04e8, 0x6889), + .driver_info = (unsigned long) &kalmia_info, }, + { /* EMPTY == end of list */} }; +MODULE_DEVICE_TABLE( usb, products); + +static struct usb_driver kalmia_driver = { + .name = "kalmia", + .id_table = products, + .probe = usbnet_probe, + .disconnect = usbnet_disconnect, + .suspend = usbnet_suspend, + .resume = usbnet_resume +}; + +static int __init kalmia_init(void) +{ + return usb_register(&kalmia_driver); +} +module_init( kalmia_init); + +static void __exit kalmia_exit(void) +{ + usb_deregister(&kalmia_driver); +} +module_exit( kalmia_exit); + +MODULE_AUTHOR("Marius Bjoernstad Kotsbak <marius@kotsbak.com>"); +MODULE_DESCRIPTION("Samsung Kalmia USB network driver"); +MODULE_LICENSE("GPL");
Introducing driver for the network port of Samsung Kalmia based USB LTE modems. It has also an ACM interface that previous patches associates with the "option" module. To access those interfaces, the modem must first be switched from modem mode using a tool like usb_modeswitch. As the proprietary protocol has been discovered by watching the MS Windows driver behavior, there might be errors in the protocol handling, but stable and fast connection has been established for hours with Norwegian operator NetCom that distributes this modem with their LTE/4G subscription. More and updated information about how to use this driver is available here: http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=465 https://github.com/mkotsbak/Samsung-GT-B3730-linux-driver Signed-off-by: Marius B. Kotsbak <marius@kotsbak.com> --- drivers/net/usb/Kconfig | 10 ++ drivers/net/usb/Makefile | 1 + drivers/net/usb/kalmia.c | 384 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 395 insertions(+), 0 deletions(-) create mode 100644 drivers/net/usb/kalmia.c