mirror of https://gitee.com/openkylin/linux.git
USB patches for 3.6-rc3
Here are a number of small USB patches for 3.6-rc3. The "large" one is just a number of device id updates to the option driver, done by the manufacturer, properly fixing up the device ids based on shipping devices. Other than that, some gadget driver fixes, the obligitary XHCI patches, and some other device ids and bugs fixed. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAlAuedoACgkQMUfUDdst+yl2DwCgzuMNDjzik/MKCTTCYARznsJ0 QIwAoMOGh+7xvCNYf9Cp8MMr/mmHZmF3 =ZEBb -----END PGP SIGNATURE----- Merge tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB patches from Greg Kroah-Hartman: "Here are a number of small USB patches for 3.6-rc3. The "large" one is just a number of device id updates to the option driver, done by the manufacturer, properly fixing up the device ids based on shipping devices. Other than that, some gadget driver fixes, the obligitary XHCI patches, and some other device ids and bugs fixed. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'usb-3.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits) USB: qcserial: fix port handling on Gobi 1K and 2K+ USB: serial: Fix mos7840 timeout USB: option: add ZTE K5006-Z usb: gadget: u_ether: fix kworker 100% CPU issue with still used interfaces in eth_stop usb: host: tegra: fix warning messages in ehci_remove usb: host: mips: sead3: Update for EHCI register structure. usb: renesas_usbhs: fixup resume method for autonomy mode usb: renesas_usbhs: mod_host: add missing .bus_suspend/resume update MAINTAINERS for Oliver Neukum usb: usb_wwan: resume/suspend can be called after port is gone usb: serial: prevent suspend/resume from racing against probe/remove usb: usb_wwan: replace release and disconnect with a port_remove hook usb: serial: mos7840: Fixup mos7840_chars_in_buffer() USB: isp1362-hcd.c: usb message always saved in case of underrun OMAP: USB : Fix the EHCI enumeration and core retention issue usb: chipidea: fix and improve dependencies if usb host or gadget support is built as module USB: support the new interfaces of Huawei Data Card devices in option driver USB: ftdi_sio: Add VID/PID for Kondo Serial USB xhci: Switch PPT ports to EHCI on shutdown. xhci: Fix bug after deq ptr set to link TRB. ...
This commit is contained in:
Linus Torvalds
commit
9134e7d270
10
MAINTAINERS
10
MAINTAINERS
|
|
@ -2217,7 +2217,7 @@ S: Maintained
|
|||
F: drivers/scsi/tmscsim.*
|
||||
|
||||
DC395x SCSI driver
|
||||
M: Oliver Neukum <oliver@neukum.name>
|
||||
M: Oliver Neukum <oliver@neukum.org>
|
||||
M: Ali Akcaagac <aliakc@web.de>
|
||||
M: Jamie Lenehan <lenehan@twibble.org>
|
||||
W: http://twibble.org/dist/dc395x/
|
||||
|
|
@ -4537,7 +4537,7 @@ S: Supported
|
|||
F: arch/microblaze/
|
||||
|
||||
MICROTEK X6 SCANNER
|
||||
M: Oliver Neukum <oliver@neukum.name>
|
||||
M: Oliver Neukum <oliver@neukum.org>
|
||||
S: Maintained
|
||||
F: drivers/usb/image/microtek.*
|
||||
|
||||
|
|
@ -7076,7 +7076,7 @@ F: include/linux/mtd/ubi.h
|
|||
F: include/mtd/ubi-user.h
|
||||
|
||||
USB ACM DRIVER
|
||||
M: Oliver Neukum <oliver@neukum.name>
|
||||
M: Oliver Neukum <oliver@neukum.org>
|
||||
L: linux-usb@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/usb/acm.txt
|
||||
|
|
@ -7097,7 +7097,7 @@ S: Supported
|
|||
F: drivers/block/ub.c
|
||||
|
||||
USB CDC ETHERNET DRIVER
|
||||
M: Oliver Neukum <oliver@neukum.name>
|
||||
M: Oliver Neukum <oliver@neukum.org>
|
||||
L: linux-usb@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/net/usb/cdc_*.c
|
||||
|
|
@ -7170,7 +7170,7 @@ F: drivers/usb/host/isp116x*
|
|||
F: include/linux/usb/isp116x.h
|
||||
|
||||
USB KAWASAKI LSI DRIVER
|
||||
M: Oliver Neukum <oliver@neukum.name>
|
||||
M: Oliver Neukum <oliver@neukum.org>
|
||||
L: linux-usb@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/usb/serial/kl5kusb105.*
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
config USB_CHIPIDEA
|
||||
tristate "ChipIdea Highspeed Dual Role Controller"
|
||||
depends on USB
|
||||
depends on USB || USB_GADGET
|
||||
help
|
||||
Say Y here if your system has a dual role high speed USB
|
||||
controller based on ChipIdea silicon IP. Currently, only the
|
||||
Say Y here if your system has a dual role high speed USB
|
||||
controller based on ChipIdea silicon IP. Currently, only the
|
||||
peripheral mode is supported.
|
||||
|
||||
When compiled dynamically, the module will be called ci-hdrc.ko.
|
||||
|
|
@ -12,7 +12,7 @@ if USB_CHIPIDEA
|
|||
|
||||
config USB_CHIPIDEA_UDC
|
||||
bool "ChipIdea device controller"
|
||||
depends on USB_GADGET
|
||||
depends on USB_GADGET=y || USB_GADGET=USB_CHIPIDEA
|
||||
select USB_GADGET_DUALSPEED
|
||||
help
|
||||
Say Y here to enable device controller functionality of the
|
||||
|
|
@ -20,6 +20,7 @@ config USB_CHIPIDEA_UDC
|
|||
|
||||
config USB_CHIPIDEA_HOST
|
||||
bool "ChipIdea host controller"
|
||||
depends on USB=y || USB=USB_CHIPIDEA
|
||||
select USB_EHCI_ROOT_HUB_TT
|
||||
help
|
||||
Say Y here to enable host controller functionality of the
|
||||
|
|
|
|||
|
|
@ -669,6 +669,8 @@ static int eth_stop(struct net_device *net)
|
|||
spin_lock_irqsave(&dev->lock, flags);
|
||||
if (dev->port_usb) {
|
||||
struct gether *link = dev->port_usb;
|
||||
const struct usb_endpoint_descriptor *in;
|
||||
const struct usb_endpoint_descriptor *out;
|
||||
|
||||
if (link->close)
|
||||
link->close(link);
|
||||
|
|
@ -682,10 +684,14 @@ static int eth_stop(struct net_device *net)
|
|||
* their own pace; the network stack can handle old packets.
|
||||
* For the moment we leave this here, since it works.
|
||||
*/
|
||||
in = link->in_ep->desc;
|
||||
out = link->out_ep->desc;
|
||||
usb_ep_disable(link->in_ep);
|
||||
usb_ep_disable(link->out_ep);
|
||||
if (netif_carrier_ok(net)) {
|
||||
DBG(dev, "host still using in/out endpoints\n");
|
||||
link->in_ep->desc = in;
|
||||
link->out_ep->desc = out;
|
||||
usb_ep_enable(link->in_ep);
|
||||
usb_ep_enable(link->out_ep);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,15 +56,6 @@
|
|||
#define EHCI_INSNREG05_ULPI_EXTREGADD_SHIFT 8
|
||||
#define EHCI_INSNREG05_ULPI_WRDATA_SHIFT 0
|
||||
|
||||
/* Errata i693 */
|
||||
static struct clk *utmi_p1_fck;
|
||||
static struct clk *utmi_p2_fck;
|
||||
static struct clk *xclk60mhsp1_ck;
|
||||
static struct clk *xclk60mhsp2_ck;
|
||||
static struct clk *usbhost_p1_fck;
|
||||
static struct clk *usbhost_p2_fck;
|
||||
static struct clk *init_60m_fclk;
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static const struct hc_driver ehci_omap_hc_driver;
|
||||
|
|
@ -80,40 +71,6 @@ static inline u32 ehci_read(void __iomem *base, u32 reg)
|
|||
return __raw_readl(base + reg);
|
||||
}
|
||||
|
||||
/* Erratum i693 workaround sequence */
|
||||
static void omap_ehci_erratum_i693(struct ehci_hcd *ehci)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
/* Switch to the internal 60 MHz clock */
|
||||
ret = clk_set_parent(utmi_p1_fck, init_60m_fclk);
|
||||
if (ret != 0)
|
||||
ehci_err(ehci, "init_60m_fclk set parent"
|
||||
"failed error:%d\n", ret);
|
||||
|
||||
ret = clk_set_parent(utmi_p2_fck, init_60m_fclk);
|
||||
if (ret != 0)
|
||||
ehci_err(ehci, "init_60m_fclk set parent"
|
||||
"failed error:%d\n", ret);
|
||||
|
||||
clk_enable(usbhost_p1_fck);
|
||||
clk_enable(usbhost_p2_fck);
|
||||
|
||||
/* Wait 1ms and switch back to the external clock */
|
||||
mdelay(1);
|
||||
ret = clk_set_parent(utmi_p1_fck, xclk60mhsp1_ck);
|
||||
if (ret != 0)
|
||||
ehci_err(ehci, "xclk60mhsp1_ck set parent"
|
||||
"failed error:%d\n", ret);
|
||||
|
||||
ret = clk_set_parent(utmi_p2_fck, xclk60mhsp2_ck);
|
||||
if (ret != 0)
|
||||
ehci_err(ehci, "xclk60mhsp2_ck set parent"
|
||||
"failed error:%d\n", ret);
|
||||
|
||||
clk_disable(usbhost_p1_fck);
|
||||
clk_disable(usbhost_p2_fck);
|
||||
}
|
||||
|
||||
static void omap_ehci_soft_phy_reset(struct usb_hcd *hcd, u8 port)
|
||||
{
|
||||
|
|
@ -195,50 +152,6 @@ static int omap_ehci_init(struct usb_hcd *hcd)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int omap_ehci_hub_control(
|
||||
struct usb_hcd *hcd,
|
||||
u16 typeReq,
|
||||
u16 wValue,
|
||||
u16 wIndex,
|
||||
char *buf,
|
||||
u16 wLength
|
||||
)
|
||||
{
|
||||
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
|
||||
u32 __iomem *status_reg = &ehci->regs->port_status[
|
||||
(wIndex & 0xff) - 1];
|
||||
u32 temp;
|
||||
unsigned long flags;
|
||||
int retval = 0;
|
||||
|
||||
spin_lock_irqsave(&ehci->lock, flags);
|
||||
|
||||
if (typeReq == SetPortFeature && wValue == USB_PORT_FEAT_SUSPEND) {
|
||||
temp = ehci_readl(ehci, status_reg);
|
||||
if ((temp & PORT_PE) == 0 || (temp & PORT_RESET) != 0) {
|
||||
retval = -EPIPE;
|
||||
goto done;
|
||||
}
|
||||
|
||||
temp &= ~PORT_WKCONN_E;
|
||||
temp |= PORT_WKDISC_E | PORT_WKOC_E;
|
||||
ehci_writel(ehci, temp | PORT_SUSPEND, status_reg);
|
||||
|
||||
omap_ehci_erratum_i693(ehci);
|
||||
|
||||
set_bit((wIndex & 0xff) - 1, &ehci->suspended_ports);
|
||||
goto done;
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&ehci->lock, flags);
|
||||
|
||||
/* Handle the hub control events here */
|
||||
return ehci_hub_control(hcd, typeReq, wValue, wIndex, buf, wLength);
|
||||
done:
|
||||
spin_unlock_irqrestore(&ehci->lock, flags);
|
||||
return retval;
|
||||
}
|
||||
|
||||
static void disable_put_regulator(
|
||||
struct ehci_hcd_omap_platform_data *pdata)
|
||||
{
|
||||
|
|
@ -351,79 +264,9 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
|
|||
goto err_pm_runtime;
|
||||
}
|
||||
|
||||
/* get clocks */
|
||||
utmi_p1_fck = clk_get(dev, "utmi_p1_gfclk");
|
||||
if (IS_ERR(utmi_p1_fck)) {
|
||||
ret = PTR_ERR(utmi_p1_fck);
|
||||
dev_err(dev, "utmi_p1_gfclk failed error:%d\n", ret);
|
||||
goto err_add_hcd;
|
||||
}
|
||||
|
||||
xclk60mhsp1_ck = clk_get(dev, "xclk60mhsp1_ck");
|
||||
if (IS_ERR(xclk60mhsp1_ck)) {
|
||||
ret = PTR_ERR(xclk60mhsp1_ck);
|
||||
dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);
|
||||
goto err_utmi_p1_fck;
|
||||
}
|
||||
|
||||
utmi_p2_fck = clk_get(dev, "utmi_p2_gfclk");
|
||||
if (IS_ERR(utmi_p2_fck)) {
|
||||
ret = PTR_ERR(utmi_p2_fck);
|
||||
dev_err(dev, "utmi_p2_gfclk failed error:%d\n", ret);
|
||||
goto err_xclk60mhsp1_ck;
|
||||
}
|
||||
|
||||
xclk60mhsp2_ck = clk_get(dev, "xclk60mhsp2_ck");
|
||||
if (IS_ERR(xclk60mhsp2_ck)) {
|
||||
ret = PTR_ERR(xclk60mhsp2_ck);
|
||||
dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);
|
||||
goto err_utmi_p2_fck;
|
||||
}
|
||||
|
||||
usbhost_p1_fck = clk_get(dev, "usb_host_hs_utmi_p1_clk");
|
||||
if (IS_ERR(usbhost_p1_fck)) {
|
||||
ret = PTR_ERR(usbhost_p1_fck);
|
||||
dev_err(dev, "usbhost_p1_fck failed error:%d\n", ret);
|
||||
goto err_xclk60mhsp2_ck;
|
||||
}
|
||||
|
||||
usbhost_p2_fck = clk_get(dev, "usb_host_hs_utmi_p2_clk");
|
||||
if (IS_ERR(usbhost_p2_fck)) {
|
||||
ret = PTR_ERR(usbhost_p2_fck);
|
||||
dev_err(dev, "usbhost_p2_fck failed error:%d\n", ret);
|
||||
goto err_usbhost_p1_fck;
|
||||
}
|
||||
|
||||
init_60m_fclk = clk_get(dev, "init_60m_fclk");
|
||||
if (IS_ERR(init_60m_fclk)) {
|
||||
ret = PTR_ERR(init_60m_fclk);
|
||||
dev_err(dev, "init_60m_fclk failed error:%d\n", ret);
|
||||
goto err_usbhost_p2_fck;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err_usbhost_p2_fck:
|
||||
clk_put(usbhost_p2_fck);
|
||||
|
||||
err_usbhost_p1_fck:
|
||||
clk_put(usbhost_p1_fck);
|
||||
|
||||
err_xclk60mhsp2_ck:
|
||||
clk_put(xclk60mhsp2_ck);
|
||||
|
||||
err_utmi_p2_fck:
|
||||
clk_put(utmi_p2_fck);
|
||||
|
||||
err_xclk60mhsp1_ck:
|
||||
clk_put(xclk60mhsp1_ck);
|
||||
|
||||
err_utmi_p1_fck:
|
||||
clk_put(utmi_p1_fck);
|
||||
|
||||
err_add_hcd:
|
||||
usb_remove_hcd(hcd);
|
||||
|
||||
err_pm_runtime:
|
||||
disable_put_regulator(pdata);
|
||||
pm_runtime_put_sync(dev);
|
||||
|
|
@ -454,14 +297,6 @@ static int ehci_hcd_omap_remove(struct platform_device *pdev)
|
|||
iounmap(hcd->regs);
|
||||
usb_put_hcd(hcd);
|
||||
|
||||
clk_put(utmi_p1_fck);
|
||||
clk_put(utmi_p2_fck);
|
||||
clk_put(xclk60mhsp1_ck);
|
||||
clk_put(xclk60mhsp2_ck);
|
||||
clk_put(usbhost_p1_fck);
|
||||
clk_put(usbhost_p2_fck);
|
||||
clk_put(init_60m_fclk);
|
||||
|
||||
pm_runtime_put_sync(dev);
|
||||
pm_runtime_disable(dev);
|
||||
|
||||
|
|
@ -532,7 +367,7 @@ static const struct hc_driver ehci_omap_hc_driver = {
|
|||
* root hub support
|
||||
*/
|
||||
.hub_status_data = ehci_hub_status_data,
|
||||
.hub_control = omap_ehci_hub_control,
|
||||
.hub_control = ehci_hub_control,
|
||||
.bus_suspend = ehci_bus_suspend,
|
||||
.bus_resume = ehci_bus_resume,
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ static int ehci_sead3_setup(struct usb_hcd *hcd)
|
|||
ehci->need_io_watchdog = 0;
|
||||
|
||||
/* Set burst length to 16 words. */
|
||||
ehci_writel(ehci, 0x1010, &ehci->regs->reserved[1]);
|
||||
ehci_writel(ehci, 0x1010, &ehci->regs->reserved1[1]);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -799,11 +799,12 @@ static int tegra_ehci_remove(struct platform_device *pdev)
|
|||
#endif
|
||||
|
||||
usb_remove_hcd(hcd);
|
||||
usb_put_hcd(hcd);
|
||||
|
||||
tegra_usb_phy_close(tegra->phy);
|
||||
iounmap(hcd->regs);
|
||||
|
||||
usb_put_hcd(hcd);
|
||||
|
||||
clk_disable_unprepare(tegra->clk);
|
||||
clk_put(tegra->clk);
|
||||
|
||||
|
|
|
|||
|
|
@ -543,12 +543,12 @@ static void postproc_ep(struct isp1362_hcd *isp1362_hcd, struct isp1362_ep *ep)
|
|||
usb_pipein(urb->pipe) ? "IN" : "OUT", ep->nextpid,
|
||||
short_ok ? "" : "not_",
|
||||
PTD_GET_COUNT(ptd), ep->maxpacket, len);
|
||||
/* save the data underrun error code for later and
|
||||
* proceed with the status stage
|
||||
*/
|
||||
urb->actual_length += PTD_GET_COUNT(ptd);
|
||||
if (usb_pipecontrol(urb->pipe)) {
|
||||
ep->nextpid = USB_PID_ACK;
|
||||
/* save the data underrun error code for later and
|
||||
* proceed with the status stage
|
||||
*/
|
||||
urb->actual_length += PTD_GET_COUNT(ptd);
|
||||
BUG_ON(urb->actual_length > urb->transfer_buffer_length);
|
||||
|
||||
if (urb->status == -EINPROGRESS)
|
||||
|
|
|
|||
|
|
@ -800,6 +800,13 @@ void usb_enable_xhci_ports(struct pci_dev *xhci_pdev)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(usb_enable_xhci_ports);
|
||||
|
||||
void usb_disable_xhci_ports(struct pci_dev *xhci_pdev)
|
||||
{
|
||||
pci_write_config_dword(xhci_pdev, USB_INTEL_USB3_PSSEN, 0x0);
|
||||
pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR, 0x0);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(usb_disable_xhci_ports);
|
||||
|
||||
/**
|
||||
* PCI Quirks for xHCI.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ void usb_amd_quirk_pll_disable(void);
|
|||
void usb_amd_quirk_pll_enable(void);
|
||||
bool usb_is_intel_switchable_xhci(struct pci_dev *pdev);
|
||||
void usb_enable_xhci_ports(struct pci_dev *xhci_pdev);
|
||||
void usb_disable_xhci_ports(struct pci_dev *xhci_pdev);
|
||||
#else
|
||||
static inline void usb_amd_quirk_pll_disable(void) {}
|
||||
static inline void usb_amd_quirk_pll_enable(void) {}
|
||||
|
|
|
|||
|
|
@ -94,11 +94,21 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
|
|||
xhci->quirks |= XHCI_EP_LIMIT_QUIRK;
|
||||
xhci->limit_active_eps = 64;
|
||||
xhci->quirks |= XHCI_SW_BW_CHECKING;
|
||||
/*
|
||||
* PPT desktop boards DH77EB and DH77DF will power back on after
|
||||
* a few seconds of being shutdown. The fix for this is to
|
||||
* switch the ports from xHCI to EHCI on shutdown. We can't use
|
||||
* DMI information to find those particular boards (since each
|
||||
* vendor will change the board name), so we have to key off all
|
||||
* PPT chipsets.
|
||||
*/
|
||||
xhci->quirks |= XHCI_SPURIOUS_REBOOT;
|
||||
}
|
||||
if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
|
||||
pdev->device == PCI_DEVICE_ID_ASROCK_P67) {
|
||||
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
||||
xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
|
||||
xhci->quirks |= XHCI_TRUST_TX_LENGTH;
|
||||
}
|
||||
if (pdev->vendor == PCI_VENDOR_ID_VIA)
|
||||
xhci->quirks |= XHCI_RESET_ON_RESUME;
|
||||
|
|
|
|||
|
|
@ -145,29 +145,37 @@ static void next_trb(struct xhci_hcd *xhci,
|
|||
*/
|
||||
static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring)
|
||||
{
|
||||
union xhci_trb *next;
|
||||
unsigned long long addr;
|
||||
|
||||
ring->deq_updates++;
|
||||
|
||||
/* If this is not event ring, there is one more usable TRB */
|
||||
/*
|
||||
* If this is not event ring, and the dequeue pointer
|
||||
* is not on a link TRB, there is one more usable TRB
|
||||
*/
|
||||
if (ring->type != TYPE_EVENT &&
|
||||
!last_trb(xhci, ring, ring->deq_seg, ring->dequeue))
|
||||
ring->num_trbs_free++;
|
||||
next = ++(ring->dequeue);
|
||||
|
||||
/* Update the dequeue pointer further if that was a link TRB or we're at
|
||||
* the end of an event ring segment (which doesn't have link TRBS)
|
||||
*/
|
||||
while (last_trb(xhci, ring, ring->deq_seg, next)) {
|
||||
if (ring->type == TYPE_EVENT && last_trb_on_last_seg(xhci,
|
||||
ring, ring->deq_seg, next)) {
|
||||
ring->cycle_state = (ring->cycle_state ? 0 : 1);
|
||||
do {
|
||||
/*
|
||||
* Update the dequeue pointer further if that was a link TRB or
|
||||
* we're at the end of an event ring segment (which doesn't have
|
||||
* link TRBS)
|
||||
*/
|
||||
if (last_trb(xhci, ring, ring->deq_seg, ring->dequeue)) {
|
||||
if (ring->type == TYPE_EVENT &&
|
||||
last_trb_on_last_seg(xhci, ring,
|
||||
ring->deq_seg, ring->dequeue)) {
|
||||
ring->cycle_state = (ring->cycle_state ? 0 : 1);
|
||||
}
|
||||
ring->deq_seg = ring->deq_seg->next;
|
||||
ring->dequeue = ring->deq_seg->trbs;
|
||||
} else {
|
||||
ring->dequeue++;
|
||||
}
|
||||
ring->deq_seg = ring->deq_seg->next;
|
||||
ring->dequeue = ring->deq_seg->trbs;
|
||||
next = ring->dequeue;
|
||||
}
|
||||
} while (last_trb(xhci, ring, ring->deq_seg, ring->dequeue));
|
||||
|
||||
addr = (unsigned long long) xhci_trb_virt_to_dma(ring->deq_seg, ring->dequeue);
|
||||
}
|
||||
|
||||
|
|
@ -2073,8 +2081,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
|
|||
if (xhci->quirks & XHCI_TRUST_TX_LENGTH)
|
||||
trb_comp_code = COMP_SHORT_TX;
|
||||
else
|
||||
xhci_warn(xhci, "WARN Successful completion on short TX: "
|
||||
"needs XHCI_TRUST_TX_LENGTH quirk?\n");
|
||||
xhci_warn_ratelimited(xhci,
|
||||
"WARN Successful completion on short TX: needs XHCI_TRUST_TX_LENGTH quirk?\n");
|
||||
case COMP_SHORT_TX:
|
||||
break;
|
||||
case COMP_STOP:
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ int xhci_reset(struct xhci_hcd *xhci)
|
|||
xhci_writel(xhci, command, &xhci->op_regs->command);
|
||||
|
||||
ret = handshake(xhci, &xhci->op_regs->command,
|
||||
CMD_RESET, 0, 250 * 1000);
|
||||
CMD_RESET, 0, 10 * 1000 * 1000);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
@ -175,7 +175,8 @@ int xhci_reset(struct xhci_hcd *xhci)
|
|||
* xHCI cannot write to any doorbells or operational registers other
|
||||
* than status until the "Controller Not Ready" flag is cleared.
|
||||
*/
|
||||
ret = handshake(xhci, &xhci->op_regs->status, STS_CNR, 0, 250 * 1000);
|
||||
ret = handshake(xhci, &xhci->op_regs->status,
|
||||
STS_CNR, 0, 10 * 1000 * 1000);
|
||||
|
||||
for (i = 0; i < 2; ++i) {
|
||||
xhci->bus_state[i].port_c_suspend = 0;
|
||||
|
|
@ -658,6 +659,9 @@ void xhci_shutdown(struct usb_hcd *hcd)
|
|||
{
|
||||
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
|
||||
|
||||
if (xhci->quirks && XHCI_SPURIOUS_REBOOT)
|
||||
usb_disable_xhci_ports(to_pci_dev(hcd->self.controller));
|
||||
|
||||
spin_lock_irq(&xhci->lock);
|
||||
xhci_halt(xhci);
|
||||
spin_unlock_irq(&xhci->lock);
|
||||
|
|
|
|||
|
|
@ -1494,6 +1494,7 @@ struct xhci_hcd {
|
|||
#define XHCI_TRUST_TX_LENGTH (1 << 10)
|
||||
#define XHCI_LPM_SUPPORT (1 << 11)
|
||||
#define XHCI_INTEL_HOST (1 << 12)
|
||||
#define XHCI_SPURIOUS_REBOOT (1 << 13)
|
||||
unsigned int num_active_eps;
|
||||
unsigned int limit_active_eps;
|
||||
/* There are two roothubs to keep track of bus suspend info for */
|
||||
|
|
@ -1537,6 +1538,8 @@ static inline struct usb_hcd *xhci_to_hcd(struct xhci_hcd *xhci)
|
|||
dev_err(xhci_to_hcd(xhci)->self.controller , fmt , ## args)
|
||||
#define xhci_warn(xhci, fmt, args...) \
|
||||
dev_warn(xhci_to_hcd(xhci)->self.controller , fmt , ## args)
|
||||
#define xhci_warn_ratelimited(xhci, fmt, args...) \
|
||||
dev_warn_ratelimited(xhci_to_hcd(xhci)->self.controller , fmt , ## args)
|
||||
|
||||
/* TODO: copied from ehci.h - can be refactored? */
|
||||
/* xHCI spec says all registers are little endian */
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ config USB_MUSB_HDRC
|
|||
tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
|
||||
depends on USB && USB_GADGET
|
||||
select NOP_USB_XCEIV if (ARCH_DAVINCI || MACH_OMAP3EVM || BLACKFIN)
|
||||
select NOP_USB_XCEIV if (SOC_OMAPTI81XX || SOC_OMAPAM33XX)
|
||||
select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX)
|
||||
select TWL4030_USB if MACH_OMAP_3430SDP
|
||||
select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA
|
||||
select USB_OTG_UTILS
|
||||
|
|
@ -57,7 +57,7 @@ config USB_MUSB_AM35X
|
|||
|
||||
config USB_MUSB_DSPS
|
||||
tristate "TI DSPS platforms"
|
||||
depends on SOC_OMAPTI81XX || SOC_OMAPAM33XX
|
||||
depends on SOC_TI81XX || SOC_AM33XX
|
||||
|
||||
config USB_MUSB_BLACKFIN
|
||||
tristate "Blackfin"
|
||||
|
|
|
|||
|
|
@ -479,9 +479,9 @@ static int __devinit dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
|
|||
ret = -ENODEV;
|
||||
goto err0;
|
||||
}
|
||||
strcpy((u8 *)res->name, "mc");
|
||||
res->parent = NULL;
|
||||
resources[1] = *res;
|
||||
resources[1].name = "mc";
|
||||
|
||||
/* allocate the child platform device */
|
||||
musb = platform_device_alloc("musb-hdrc", -1);
|
||||
|
|
@ -566,27 +566,28 @@ static int __devinit dsps_probe(struct platform_device *pdev)
|
|||
}
|
||||
platform_set_drvdata(pdev, glue);
|
||||
|
||||
/* create the child platform device for first instances of musb */
|
||||
ret = dsps_create_musb_pdev(glue, 0);
|
||||
if (ret != 0) {
|
||||
dev_err(&pdev->dev, "failed to create child pdev\n");
|
||||
goto err2;
|
||||
}
|
||||
|
||||
/* enable the usbss clocks */
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
ret = pm_runtime_get_sync(&pdev->dev);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "pm_runtime_get_sync FAILED");
|
||||
goto err2;
|
||||
}
|
||||
|
||||
/* create the child platform device for first instances of musb */
|
||||
ret = dsps_create_musb_pdev(glue, 0);
|
||||
if (ret != 0) {
|
||||
dev_err(&pdev->dev, "failed to create child pdev\n");
|
||||
goto err3;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
err3:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
pm_runtime_put(&pdev->dev);
|
||||
err2:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
kfree(glue->wrp);
|
||||
err1:
|
||||
kfree(glue);
|
||||
|
|
|
|||
|
|
@ -603,12 +603,12 @@ static int usbhsc_resume(struct device *dev)
|
|||
struct usbhs_priv *priv = dev_get_drvdata(dev);
|
||||
struct platform_device *pdev = usbhs_priv_to_pdev(priv);
|
||||
|
||||
usbhs_platform_call(priv, phy_reset, pdev);
|
||||
|
||||
if (!usbhsc_flags_has(priv, USBHSF_RUNTIME_PWCTRL))
|
||||
usbhsc_power_ctrl(priv, 1);
|
||||
|
||||
usbhsc_hotplug(priv);
|
||||
usbhs_platform_call(priv, phy_reset, pdev);
|
||||
|
||||
usbhsc_drvcllbck_notify_hotplug(pdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1266,6 +1266,12 @@ static int usbhsh_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int usbhsh_bus_nop(struct usb_hcd *hcd)
|
||||
{
|
||||
/* nothing to do */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct hc_driver usbhsh_driver = {
|
||||
.description = usbhsh_hcd_name,
|
||||
.hcd_priv_size = sizeof(struct usbhsh_hpriv),
|
||||
|
|
@ -1290,6 +1296,8 @@ static struct hc_driver usbhsh_driver = {
|
|||
*/
|
||||
.hub_status_data = usbhsh_hub_status_data,
|
||||
.hub_control = usbhsh_hub_control,
|
||||
.bus_suspend = usbhsh_bus_nop,
|
||||
.bus_resume = usbhsh_bus_nop,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -61,18 +61,23 @@ static int usb_serial_device_probe(struct device *dev)
|
|||
goto exit;
|
||||
}
|
||||
|
||||
/* make sure suspend/resume doesn't race against port_probe */
|
||||
retval = usb_autopm_get_interface(port->serial->interface);
|
||||
if (retval)
|
||||
goto exit;
|
||||
|
||||
driver = port->serial->type;
|
||||
if (driver->port_probe) {
|
||||
retval = driver->port_probe(port);
|
||||
if (retval)
|
||||
goto exit;
|
||||
goto exit_with_autopm;
|
||||
}
|
||||
|
||||
retval = device_create_file(dev, &dev_attr_port_number);
|
||||
if (retval) {
|
||||
if (driver->port_remove)
|
||||
retval = driver->port_remove(port);
|
||||
goto exit;
|
||||
goto exit_with_autopm;
|
||||
}
|
||||
|
||||
minor = port->number;
|
||||
|
|
@ -81,6 +86,8 @@ static int usb_serial_device_probe(struct device *dev)
|
|||
"%s converter now attached to ttyUSB%d\n",
|
||||
driver->description, minor);
|
||||
|
||||
exit_with_autopm:
|
||||
usb_autopm_put_interface(port->serial->interface);
|
||||
exit:
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -96,6 +103,9 @@ static int usb_serial_device_remove(struct device *dev)
|
|||
if (!port)
|
||||
return -ENODEV;
|
||||
|
||||
/* make sure suspend/resume doesn't race against port_remove */
|
||||
usb_autopm_get_interface(port->serial->interface);
|
||||
|
||||
device_remove_file(&port->dev, &dev_attr_port_number);
|
||||
|
||||
driver = port->serial->type;
|
||||
|
|
@ -107,6 +117,7 @@ static int usb_serial_device_remove(struct device *dev)
|
|||
dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
|
||||
driver->description, minor);
|
||||
|
||||
usb_autopm_put_interface(port->serial->interface);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -811,6 +811,7 @@ static struct usb_device_id id_table_combined [] = {
|
|||
{ USB_DEVICE(LARSENBRUSGAARD_VID, LB_ALTITRACK_PID) },
|
||||
{ USB_DEVICE(GN_OTOMETRICS_VID, AURICAL_USB_PID) },
|
||||
{ USB_DEVICE(PI_VID, PI_E861_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 },
|
||||
|
|
|
|||
|
|
@ -794,6 +794,13 @@
|
|||
#define PI_VID 0x1a72 /* Vendor ID */
|
||||
#define PI_E861_PID 0x1008 /* E-861 piezo controller USB connection */
|
||||
|
||||
/*
|
||||
* Kondo Kagaku Co.Ltd.
|
||||
* http://www.kondo-robot.com/EN
|
||||
*/
|
||||
#define KONDO_VID 0x165c
|
||||
#define KONDO_USB_SERIAL_PID 0x0002
|
||||
|
||||
/*
|
||||
* Bayer Ascensia Contour blood glucose meter USB-converter cable.
|
||||
* http://winglucofacts.com/cables/
|
||||
|
|
|
|||
|
|
@ -227,7 +227,6 @@ static void ipw_release(struct usb_serial *serial)
|
|||
{
|
||||
struct usb_wwan_intf_private *data = usb_get_serial_data(serial);
|
||||
|
||||
usb_wwan_release(serial);
|
||||
usb_set_serial_data(serial, NULL);
|
||||
kfree(data);
|
||||
}
|
||||
|
|
@ -309,12 +308,12 @@ static struct usb_serial_driver ipw_device = {
|
|||
.description = "IPWireless converter",
|
||||
.id_table = id_table,
|
||||
.num_ports = 1,
|
||||
.disconnect = usb_wwan_disconnect,
|
||||
.open = ipw_open,
|
||||
.close = ipw_close,
|
||||
.probe = ipw_probe,
|
||||
.attach = usb_wwan_startup,
|
||||
.release = ipw_release,
|
||||
.port_remove = usb_wwan_port_remove,
|
||||
.dtr_rts = ipw_dtr_rts,
|
||||
.write = usb_wwan_write,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -82,8 +82,7 @@
|
|||
* Defines used for sending commands to port
|
||||
*/
|
||||
|
||||
#define WAIT_FOR_EVER (HZ * 0) /* timeout urb is wait for ever */
|
||||
#define MOS_WDR_TIMEOUT (HZ * 5) /* default urb timeout */
|
||||
#define MOS_WDR_TIMEOUT 5000 /* default urb timeout */
|
||||
|
||||
#define MOS_PORT1 0x0200
|
||||
#define MOS_PORT2 0x0300
|
||||
|
|
@ -1232,9 +1231,12 @@ static int mos7840_chars_in_buffer(struct tty_struct *tty)
|
|||
return 0;
|
||||
|
||||
spin_lock_irqsave(&mos7840_port->pool_lock, flags);
|
||||
for (i = 0; i < NUM_URBS; ++i)
|
||||
if (mos7840_port->busy[i])
|
||||
chars += URB_TRANSFER_BUFFER_SIZE;
|
||||
for (i = 0; i < NUM_URBS; ++i) {
|
||||
if (mos7840_port->busy[i]) {
|
||||
struct urb *urb = mos7840_port->write_urb_pool[i];
|
||||
chars += urb->transfer_buffer_length;
|
||||
}
|
||||
}
|
||||
spin_unlock_irqrestore(&mos7840_port->pool_lock, flags);
|
||||
dbg("%s - returns %d", __func__, chars);
|
||||
return chars;
|
||||
|
|
@ -1344,7 +1346,7 @@ static void mos7840_close(struct usb_serial_port *port)
|
|||
static void mos7840_block_until_chase_response(struct tty_struct *tty,
|
||||
struct moschip_port *mos7840_port)
|
||||
{
|
||||
int timeout = 1 * HZ;
|
||||
int timeout = msecs_to_jiffies(1000);
|
||||
int wait = 10;
|
||||
int count;
|
||||
|
||||
|
|
@ -2672,7 +2674,7 @@ static int mos7840_startup(struct usb_serial *serial)
|
|||
|
||||
/* setting configuration feature to one */
|
||||
usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
|
||||
(__u8) 0x03, 0x00, 0x01, 0x00, NULL, 0x00, 5 * HZ);
|
||||
(__u8) 0x03, 0x00, 0x01, 0x00, NULL, 0x00, MOS_WDR_TIMEOUT);
|
||||
return 0;
|
||||
error:
|
||||
for (/* nothing */; i >= 0; i--) {
|
||||
|
|
|
|||
|
|
@ -80,85 +80,9 @@ static void option_instat_callback(struct urb *urb);
|
|||
#define OPTION_PRODUCT_GTM380_MODEM 0x7201
|
||||
|
||||
#define HUAWEI_VENDOR_ID 0x12D1
|
||||
#define HUAWEI_PRODUCT_E600 0x1001
|
||||
#define HUAWEI_PRODUCT_E220 0x1003
|
||||
#define HUAWEI_PRODUCT_E220BIS 0x1004
|
||||
#define HUAWEI_PRODUCT_E1401 0x1401
|
||||
#define HUAWEI_PRODUCT_E1402 0x1402
|
||||
#define HUAWEI_PRODUCT_E1403 0x1403
|
||||
#define HUAWEI_PRODUCT_E1404 0x1404
|
||||
#define HUAWEI_PRODUCT_E1405 0x1405
|
||||
#define HUAWEI_PRODUCT_E1406 0x1406
|
||||
#define HUAWEI_PRODUCT_E1407 0x1407
|
||||
#define HUAWEI_PRODUCT_E1408 0x1408
|
||||
#define HUAWEI_PRODUCT_E1409 0x1409
|
||||
#define HUAWEI_PRODUCT_E140A 0x140A
|
||||
#define HUAWEI_PRODUCT_E140B 0x140B
|
||||
#define HUAWEI_PRODUCT_E140C 0x140C
|
||||
#define HUAWEI_PRODUCT_E140D 0x140D
|
||||
#define HUAWEI_PRODUCT_E140E 0x140E
|
||||
#define HUAWEI_PRODUCT_E140F 0x140F
|
||||
#define HUAWEI_PRODUCT_E1410 0x1410
|
||||
#define HUAWEI_PRODUCT_E1411 0x1411
|
||||
#define HUAWEI_PRODUCT_E1412 0x1412
|
||||
#define HUAWEI_PRODUCT_E1413 0x1413
|
||||
#define HUAWEI_PRODUCT_E1414 0x1414
|
||||
#define HUAWEI_PRODUCT_E1415 0x1415
|
||||
#define HUAWEI_PRODUCT_E1416 0x1416
|
||||
#define HUAWEI_PRODUCT_E1417 0x1417
|
||||
#define HUAWEI_PRODUCT_E1418 0x1418
|
||||
#define HUAWEI_PRODUCT_E1419 0x1419
|
||||
#define HUAWEI_PRODUCT_E141A 0x141A
|
||||
#define HUAWEI_PRODUCT_E141B 0x141B
|
||||
#define HUAWEI_PRODUCT_E141C 0x141C
|
||||
#define HUAWEI_PRODUCT_E141D 0x141D
|
||||
#define HUAWEI_PRODUCT_E141E 0x141E
|
||||
#define HUAWEI_PRODUCT_E141F 0x141F
|
||||
#define HUAWEI_PRODUCT_E1420 0x1420
|
||||
#define HUAWEI_PRODUCT_E1421 0x1421
|
||||
#define HUAWEI_PRODUCT_E1422 0x1422
|
||||
#define HUAWEI_PRODUCT_E1423 0x1423
|
||||
#define HUAWEI_PRODUCT_E1424 0x1424
|
||||
#define HUAWEI_PRODUCT_E1425 0x1425
|
||||
#define HUAWEI_PRODUCT_E1426 0x1426
|
||||
#define HUAWEI_PRODUCT_E1427 0x1427
|
||||
#define HUAWEI_PRODUCT_E1428 0x1428
|
||||
#define HUAWEI_PRODUCT_E1429 0x1429
|
||||
#define HUAWEI_PRODUCT_E142A 0x142A
|
||||
#define HUAWEI_PRODUCT_E142B 0x142B
|
||||
#define HUAWEI_PRODUCT_E142C 0x142C
|
||||
#define HUAWEI_PRODUCT_E142D 0x142D
|
||||
#define HUAWEI_PRODUCT_E142E 0x142E
|
||||
#define HUAWEI_PRODUCT_E142F 0x142F
|
||||
#define HUAWEI_PRODUCT_E1430 0x1430
|
||||
#define HUAWEI_PRODUCT_E1431 0x1431
|
||||
#define HUAWEI_PRODUCT_E1432 0x1432
|
||||
#define HUAWEI_PRODUCT_E1433 0x1433
|
||||
#define HUAWEI_PRODUCT_E1434 0x1434
|
||||
#define HUAWEI_PRODUCT_E1435 0x1435
|
||||
#define HUAWEI_PRODUCT_E1436 0x1436
|
||||
#define HUAWEI_PRODUCT_E1437 0x1437
|
||||
#define HUAWEI_PRODUCT_E1438 0x1438
|
||||
#define HUAWEI_PRODUCT_E1439 0x1439
|
||||
#define HUAWEI_PRODUCT_E143A 0x143A
|
||||
#define HUAWEI_PRODUCT_E143B 0x143B
|
||||
#define HUAWEI_PRODUCT_E143C 0x143C
|
||||
#define HUAWEI_PRODUCT_E143D 0x143D
|
||||
#define HUAWEI_PRODUCT_E143E 0x143E
|
||||
#define HUAWEI_PRODUCT_E143F 0x143F
|
||||
#define HUAWEI_PRODUCT_K4505 0x1464
|
||||
#define HUAWEI_PRODUCT_K3765 0x1465
|
||||
#define HUAWEI_PRODUCT_E14AC 0x14AC
|
||||
#define HUAWEI_PRODUCT_K3806 0x14AE
|
||||
#define HUAWEI_PRODUCT_K4605 0x14C6
|
||||
#define HUAWEI_PRODUCT_K5005 0x14C8
|
||||
#define HUAWEI_PRODUCT_K3770 0x14C9
|
||||
#define HUAWEI_PRODUCT_K3771 0x14CA
|
||||
#define HUAWEI_PRODUCT_K4510 0x14CB
|
||||
#define HUAWEI_PRODUCT_K4511 0x14CC
|
||||
#define HUAWEI_PRODUCT_ETS1220 0x1803
|
||||
#define HUAWEI_PRODUCT_E353 0x1506
|
||||
#define HUAWEI_PRODUCT_E173S 0x1C05
|
||||
|
||||
#define QUANTA_VENDOR_ID 0x0408
|
||||
#define QUANTA_PRODUCT_Q101 0xEA02
|
||||
|
|
@ -615,104 +539,123 @@ static const struct usb_device_id option_ids[] = {
|
|||
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
|
||||
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
|
||||
{ USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1401, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1402, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1403, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1404, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1405, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1406, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1407, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1408, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1409, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140A, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140B, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140C, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140D, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140E, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E140F, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1410, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1411, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1412, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1413, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1414, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1415, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1416, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1417, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1418, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1419, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141A, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141B, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141C, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141D, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141E, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E141F, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1420, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1421, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1422, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1423, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1424, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1425, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1426, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1427, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1428, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1429, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142A, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142B, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142C, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142D, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142E, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E142F, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1430, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1431, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1432, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1433, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1434, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1435, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1436, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1437, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1438, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1439, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143A, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143B, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143C, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
|
||||
.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
|
||||
.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3806, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff),
|
||||
.driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x31) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0x01, 0x32) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x31) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x32) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K5005, 0xff, 0x01, 0x33) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x31) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3770, 0xff, 0x02, 0x32) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x31) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3771, 0xff, 0x02, 0x32) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x31) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4510, 0xff, 0x01, 0x32) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x31) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4511, 0xff, 0x01, 0x32) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x01) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x02) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x03) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x10) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x12) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x13) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x01) }, /* E398 3G Modem */
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x02) }, /* E398 3G PC UI Interface */
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x02, 0x03) }, /* E398 3G Application Interface */
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0xff, 0xff) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x01) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x02) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x03) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x04) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x05) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x06) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x0A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x0B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x0D) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x0E) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x0F) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x10) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x12) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x13) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x14) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x15) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x17) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x18) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x19) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x1A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x1B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x1C) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x31) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x32) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x33) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x34) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x35) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x36) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x3A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x3B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x3D) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x3E) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x3F) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x48) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x49) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x4A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x4B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x4C) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x61) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x62) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x63) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x64) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x65) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x66) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6D) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6E) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x6F) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x78) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x79) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x7A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x7B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x7C) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x01) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x02) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x03) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x04) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x05) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x06) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x0A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x0B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x0D) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x0E) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x0F) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x10) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x12) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x13) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x14) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x15) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x17) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x18) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x19) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x1A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x1B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x1C) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x31) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x32) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x33) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x34) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x35) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x36) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x3A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x3B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x3D) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x3E) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x3F) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x48) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x49) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x4A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x4B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x4C) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x61) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x62) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x63) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x64) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x65) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x66) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6D) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6E) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x6F) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x78) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x79) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7A) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7B) },
|
||||
{ USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x02, 0x7C) },
|
||||
|
||||
|
||||
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) },
|
||||
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) },
|
||||
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) },
|
||||
|
|
@ -943,6 +886,8 @@ static const struct usb_device_id option_ids[] = {
|
|||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
|
||||
.driver_info = (kernel_ulong_t)&net_intf4_blacklist },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff),
|
||||
.driver_info = (kernel_ulong_t)&net_intf3_blacklist },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1058, 0xff, 0xff, 0xff) },
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1059, 0xff, 0xff, 0xff) },
|
||||
|
|
@ -1297,8 +1242,8 @@ static struct usb_serial_driver option_1port_device = {
|
|||
.tiocmset = usb_wwan_tiocmset,
|
||||
.ioctl = usb_wwan_ioctl,
|
||||
.attach = usb_wwan_startup,
|
||||
.disconnect = usb_wwan_disconnect,
|
||||
.release = option_release,
|
||||
.port_remove = usb_wwan_port_remove,
|
||||
.read_int_callback = option_instat_callback,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = usb_wwan_suspend,
|
||||
|
|
@ -1414,8 +1359,6 @@ static void option_release(struct usb_serial *serial)
|
|||
struct usb_wwan_intf_private *intfdata = usb_get_serial_data(serial);
|
||||
struct option_private *priv = intfdata->private;
|
||||
|
||||
usb_wwan_release(serial);
|
||||
|
||||
kfree(priv);
|
||||
kfree(intfdata);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -199,43 +199,49 @@ static int qcprobe(struct usb_serial *serial, const struct usb_device_id *id)
|
|||
|
||||
/* default to enabling interface */
|
||||
altsetting = 0;
|
||||
switch (ifnum) {
|
||||
/* Composite mode; don't bind to the QMI/net interface as that
|
||||
* gets handled by other drivers.
|
||||
*/
|
||||
|
||||
/* Composite mode; don't bind to the QMI/net interface as that
|
||||
* gets handled by other drivers.
|
||||
*/
|
||||
|
||||
if (is_gobi1k) {
|
||||
/* Gobi 1K USB layout:
|
||||
* 0: serial port (doesn't respond)
|
||||
* 1: serial port (doesn't respond)
|
||||
* 2: AT-capable modem port
|
||||
* 3: QMI/net
|
||||
*
|
||||
* Gobi 2K+ USB layout:
|
||||
*/
|
||||
if (ifnum == 2)
|
||||
dev_dbg(dev, "Modem port found\n");
|
||||
else
|
||||
altsetting = -1;
|
||||
} else {
|
||||
/* Gobi 2K+ USB layout:
|
||||
* 0: QMI/net
|
||||
* 1: DM/DIAG (use libqcdm from ModemManager for communication)
|
||||
* 2: AT-capable modem port
|
||||
* 3: NMEA
|
||||
*/
|
||||
|
||||
case 1:
|
||||
if (is_gobi1k)
|
||||
switch (ifnum) {
|
||||
case 0:
|
||||
/* Don't claim the QMI/net interface */
|
||||
altsetting = -1;
|
||||
else
|
||||
break;
|
||||
case 1:
|
||||
dev_dbg(dev, "Gobi 2K+ DM/DIAG interface found\n");
|
||||
break;
|
||||
case 2:
|
||||
dev_dbg(dev, "Modem port found\n");
|
||||
break;
|
||||
case 3:
|
||||
if (is_gobi1k)
|
||||
altsetting = -1;
|
||||
else
|
||||
break;
|
||||
case 2:
|
||||
dev_dbg(dev, "Modem port found\n");
|
||||
break;
|
||||
case 3:
|
||||
/*
|
||||
* NMEA (serial line 9600 8N1)
|
||||
* # echo "\$GPS_START" > /dev/ttyUSBx
|
||||
* # echo "\$GPS_STOP" > /dev/ttyUSBx
|
||||
*/
|
||||
dev_dbg(dev, "Gobi 2K+ NMEA GPS interface found\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
done:
|
||||
|
|
@ -262,8 +268,7 @@ static void qc_release(struct usb_serial *serial)
|
|||
{
|
||||
struct usb_wwan_intf_private *priv = usb_get_serial_data(serial);
|
||||
|
||||
/* Call usb_wwan release & free the private data allocated in qcprobe */
|
||||
usb_wwan_release(serial);
|
||||
/* Free the private data allocated in qcprobe */
|
||||
usb_set_serial_data(serial, NULL);
|
||||
kfree(priv);
|
||||
}
|
||||
|
|
@ -283,8 +288,8 @@ static struct usb_serial_driver qcdevice = {
|
|||
.write_room = usb_wwan_write_room,
|
||||
.chars_in_buffer = usb_wwan_chars_in_buffer,
|
||||
.attach = usb_wwan_startup,
|
||||
.disconnect = usb_wwan_disconnect,
|
||||
.release = qc_release,
|
||||
.port_remove = usb_wwan_port_remove,
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = usb_wwan_suspend,
|
||||
.resume = usb_wwan_resume,
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@ extern void usb_wwan_dtr_rts(struct usb_serial_port *port, int on);
|
|||
extern int usb_wwan_open(struct tty_struct *tty, struct usb_serial_port *port);
|
||||
extern void usb_wwan_close(struct usb_serial_port *port);
|
||||
extern int usb_wwan_startup(struct usb_serial *serial);
|
||||
extern void usb_wwan_disconnect(struct usb_serial *serial);
|
||||
extern void usb_wwan_release(struct usb_serial *serial);
|
||||
extern int usb_wwan_port_remove(struct usb_serial_port *port);
|
||||
extern int usb_wwan_write_room(struct tty_struct *tty);
|
||||
extern void usb_wwan_set_termios(struct tty_struct *tty,
|
||||
struct usb_serial_port *port,
|
||||
|
|
|
|||
|
|
@ -565,6 +565,33 @@ int usb_wwan_startup(struct usb_serial *serial)
|
|||
}
|
||||
EXPORT_SYMBOL(usb_wwan_startup);
|
||||
|
||||
int usb_wwan_port_remove(struct usb_serial_port *port)
|
||||
{
|
||||
int i;
|
||||
struct usb_wwan_port_private *portdata;
|
||||
|
||||
portdata = usb_get_serial_port_data(port);
|
||||
usb_set_serial_port_data(port, NULL);
|
||||
|
||||
/* Stop reading/writing urbs and free them */
|
||||
for (i = 0; i < N_IN_URB; i++) {
|
||||
usb_kill_urb(portdata->in_urbs[i]);
|
||||
usb_free_urb(portdata->in_urbs[i]);
|
||||
free_page((unsigned long)portdata->in_buffer[i]);
|
||||
}
|
||||
for (i = 0; i < N_OUT_URB; i++) {
|
||||
usb_kill_urb(portdata->out_urbs[i]);
|
||||
usb_free_urb(portdata->out_urbs[i]);
|
||||
kfree(portdata->out_buffer[i]);
|
||||
}
|
||||
|
||||
/* Now free port private data */
|
||||
kfree(portdata);
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(usb_wwan_port_remove);
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static void stop_read_write_urbs(struct usb_serial *serial)
|
||||
{
|
||||
int i, j;
|
||||
|
|
@ -575,6 +602,8 @@ static void stop_read_write_urbs(struct usb_serial *serial)
|
|||
for (i = 0; i < serial->num_ports; ++i) {
|
||||
port = serial->port[i];
|
||||
portdata = usb_get_serial_port_data(port);
|
||||
if (!portdata)
|
||||
continue;
|
||||
for (j = 0; j < N_IN_URB; j++)
|
||||
usb_kill_urb(portdata->in_urbs[j]);
|
||||
for (j = 0; j < N_OUT_URB; j++)
|
||||
|
|
@ -582,45 +611,6 @@ static void stop_read_write_urbs(struct usb_serial *serial)
|
|||
}
|
||||
}
|
||||
|
||||
void usb_wwan_disconnect(struct usb_serial *serial)
|
||||
{
|
||||
stop_read_write_urbs(serial);
|
||||
}
|
||||
EXPORT_SYMBOL(usb_wwan_disconnect);
|
||||
|
||||
void usb_wwan_release(struct usb_serial *serial)
|
||||
{
|
||||
int i, j;
|
||||
struct usb_serial_port *port;
|
||||
struct usb_wwan_port_private *portdata;
|
||||
|
||||
/* Now free them */
|
||||
for (i = 0; i < serial->num_ports; ++i) {
|
||||
port = serial->port[i];
|
||||
portdata = usb_get_serial_port_data(port);
|
||||
|
||||
for (j = 0; j < N_IN_URB; j++) {
|
||||
usb_free_urb(portdata->in_urbs[j]);
|
||||
free_page((unsigned long)
|
||||
portdata->in_buffer[j]);
|
||||
portdata->in_urbs[j] = NULL;
|
||||
}
|
||||
for (j = 0; j < N_OUT_URB; j++) {
|
||||
usb_free_urb(portdata->out_urbs[j]);
|
||||
kfree(portdata->out_buffer[j]);
|
||||
portdata->out_urbs[j] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* Now free per port private data */
|
||||
for (i = 0; i < serial->num_ports; i++) {
|
||||
port = serial->port[i];
|
||||
kfree(usb_get_serial_port_data(port));
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(usb_wwan_release);
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
int usb_wwan_suspend(struct usb_serial *serial, pm_message_t message)
|
||||
{
|
||||
struct usb_wwan_intf_private *intfdata = serial->private;
|
||||
|
|
@ -712,7 +702,7 @@ int usb_wwan_resume(struct usb_serial *serial)
|
|||
|
||||
/* skip closed ports */
|
||||
spin_lock_irq(&intfdata->susp_lock);
|
||||
if (!portdata->opened) {
|
||||
if (!portdata || !portdata->opened) {
|
||||
spin_unlock_irq(&intfdata->susp_lock);
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue