Linux 3.0.36
Greg KH
maintainerI'm announcing the release of the 3.0.36 kernel.
All users of the 3.0 kernel series must upgrade.
The updated 3.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/mach-imx/mach-mx21ads.c | 2 arch/x86/xen/enlighten.c | 8 +++ drivers/pci/pci.c | 5 + drivers/pci/quirks.c | 26 ++++++++++ drivers/usb/class/cdc-acm.c | 8 +++ drivers/usb/core/hcd-pci.c | 9 --- drivers/usb/core/message.c | 3 - drivers/usb/host/ehci-pci.c | 8 --- drivers/usb/host/xhci.c | 8 +-- drivers/usb/serial/cp210x.c | 1 drivers/usb/serial/ftdi_sio.c | 1 drivers/usb/serial/ftdi_sio_ids.h | 1 drivers/usb/serial/mct_u232.c | 13 +++-- drivers/usb/serial/mos7840.c | 2 drivers/usb/serial/option.c | 96 ++++++++++++++++++-------------------- drivers/usb/serial/qcserial.c | 6 ++ drivers/usb/serial/sierra.c | 4 + drivers/usb/serial/usb-serial.c | 6 +- fs/hfsplus/wrapper.c | 2 include/linux/pci.h | 2 include/linux/usb/hcd.h | 2 net/sunrpc/svc.c | 3 - 23 files changed, 133 insertions(+), 85 deletions(-)
Alan Cox (1):
USB: mct_u232: Fix incorrect TIOCMSET return
Alan Stern (1):
USB: add NO_D3_DURING_SLEEP flag and revert 151b61284776be2
Andiry Xu (1):
xHCI: Increase the timeout for controller save/restore state operation
Andre Przywara (1):
xen/setup: filter APERFMPERF cpuid feature out
Andrew Bird (1):
USB: option: Updated Huawei K4605 has better id
Bjørn Mork (3):
USB: option: Add Vodafone/Huawei K5005 support
USB: qcserial: Add Sierra Wireless device IDs
USB: serial: Enforce USB driver and USB serial driver match
Daniel Mack (1):
USB: fix gathering of interface associations
Evan McNabb (1):
USB: ftdi-sio: Add support for RT Systems USB-RTS01 serial adapter
Greg Kroah-Hartman (1):
Linux 3.0.36
Jaccon Bastiaansen (1):
ARM i.MX imx21ads: Fix overlapping static i/o mappings
Janne Kalliomäki (1):
hfsplus: fix overflow in sector calculations in hfsplus_submit_bio
Johan Hovold (2):
USB: option: fix memory leak
USB: option: fix port-data abuse
Mikko Tuumanen (1):
USB: serial: cp210x: add Optris MS Pro usb id
Otto Meta (1):
usb: cdc-acm: fix devices not unthrottled on open
Tom Cassidy (1):
USB: serial: sierra: Add support for Sierra Wireless AirCard 320U modem
Tony Zelenoff (1):
USB: mos7840: Fix compilation of usb serial driver
Trond Myklebust (1):
NFSv4.1: Fix a request leak on the back channel
说不得 (1):
USB: option: add more YUGA device ids
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 35 +SUBLEVEL = 36 EXTRAVERSION = NAME = Sneaky Weasel
arch/arm/mach-imx/mach-mx21ads.c +1 -1
@@ -32,7 +32,7 @@* Memory-mapped I/O on MX21ADS base board */ #define MX21ADS_MMIO_BASE_ADDR 0xf5000000 -#define MX21ADS_MMIO_SIZE SZ_16M +#define MX21ADS_MMIO_SIZE 0xc00000#define MX21ADS_REG_ADDR (offset) (void __force __iomem *) \ (MX21ADS_MMIO_BASE_ADDR + (offset))
arch/x86/xen/enlighten.c +8 -0
@@ -198,6 +198,9 @@ static void __init xen_banner(void) xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : ""); } +#define CPUID_THERM_POWER_LEAF 6 +#define APERFMPERF_PRESENT 0 +static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0 ;static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0 ;
@@ -218,6 +221,11 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, maskedx = cpuid_leaf1_edx_mask;break ; +case CPUID_THERM_POWER_LEAF : +/* Disabling APERFMPERF for kernel usage */ + maskecx = ~(1 <<APERFMPERF_PRESENT ); +break ; +case 0xb :/* Suppress extended topology stuff */ maskebx =0 ;
drivers/pci/pci.c +5 -0
@@ -1682,6 +1682,11 @@ int pci_prepare_to_sleep(struct pci_dev *dev)if (target_state ==PCI_POWER_ERROR )return -EIO ; +/* Some devices mustn't be in D3 during system sleep */ +if (target_state == PCI_D3hot && + (dev->dev_flags &PCI_DEV_FLAGS_NO_D3_DURING_SLEEP )) +return 0 ; +pci_enable_wake (dev, target_state,device_may_wakeup (&dev->dev)); error =pci_set_power_state (dev, target_state);
drivers/pci/quirks.c +26 -0
@@ -2856,6 +2856,32 @@ static void __devinit disable_igfx_irq(struct pci_dev *dev)DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x0102 , disable_igfx_irq);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x010a , disable_igfx_irq); +/* +* The Intel 6 Series/C200 Series chipset's EHCI controllers on many +* ASUS motherboards will cause memory corruption or a system crash +* if they are in D3 while the system is put into S3 sleep. +*/ +static void __devinit asus_ehci_no_d3 (struct pci_dev *dev) +{ +const char *sys_info; +static const char good_Asus_board[] ="P8Z68-V" ; + +if (dev->dev_flags &PCI_DEV_FLAGS_NO_D3_DURING_SLEEP ) +return ; +if (dev->subsystem_vendor !=PCI_VENDOR_ID_ASUSTEK ) +return ; + sys_info =dmi_get_system_info (DMI_BOARD_NAME ); +if (sys_info &&memcmp (sys_info, good_Asus_board, +sizeof (good_Asus_board) -1 ) ==0 ) +return ; + +dev_info (&dev->dev,"broken D3 during system sleep on ASUS\n" ); + dev->dev_flags |=PCI_DEV_FLAGS_NO_D3_DURING_SLEEP ; +device_set_wakeup_capable (&dev->dev, false); +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x1c26 , asus_ehci_no_d3); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x1c2d , asus_ehci_no_d3); +static void pci_do_fixups (struct pci_dev *dev,struct pci_fixup *f,struct pci_fixup *end) {
drivers/usb/class/cdc-acm.c +8 -0
@@ -498,6 +498,14 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)usb_autopm_put_interface (acm->control); +/* +* Unthrottle device in case the TTY was closed while throttled. +*/ +spin_lock_irq (&acm->read_lock); + acm->throttled =0 ; + acm->throttle_req =0 ; +spin_unlock_irq (&acm->read_lock); +if (acm_submit_read_urbs (acm,GFP_KERNEL )) goto bail_out;
drivers/usb/core/hcd-pci.c +0 -9
@@ -495,15 +495,6 @@ static int hcd_pci_suspend_noirq(struct device *dev)pci_save_state (pci_dev); -/* -* Some systems crash if an EHCI controller is in D3 during -* a sleep transition. We have to leave such controllers in D0. -*/ -if (hcd->broken_pci_sleep) { -dev_dbg (dev,"Staying in PCI D0\n" ); -return retval; - } -/* If the root hub is dead rather than suspended, disallow remote * wakeup. usb_hc_died() should ensure that both hosts are marked as * dying, so we only need to check the primary roothub.
drivers/usb/core/message.c +2 -1
@@ -1803,7 +1803,6 @@ free_interfaces: intfc = cp->intf_cache[i]; intf->altsetting = intfc->altsetting; intf->num_altsetting = intfc->num_altsetting; - intf->intf_assoc =find_iad (dev, cp, i);kref_get (&intfc->ref); alt =usb_altnum_to_altsetting (intf,0 );
@@ -1816,6 +1815,8 @@ free_interfaces:if (!alt) alt = &intf->altsetting[0 ]; + intf->intf_assoc = +find_iad (dev, cp, alt->desc.bInterfaceNumber); intf->cur_altsetting = alt;usb_enable_interface (dev, intf, true); intf->dev.parent = &dev->dev;
drivers/usb/host/ehci-pci.c +0 -8
@@ -144,14 +144,6 @@ static int ehci_pci_setup(struct usb_hcd *hcd) hcd->has_tt =1 ;tdi_reset (ehci); } -if (pdev->subsystem_vendor ==PCI_VENDOR_ID_ASUSTEK ) { -/* EHCI #1 or #2 on 6 Series/C200 Series chipset */ -if (pdev->device ==0x1c26 || pdev->device ==0x1c2d ) { -ehci_info (ehci,"broken D3 during system sleep on ASUS\n" ); - hcd->broken_pci_sleep =1 ; -device_set_wakeup_capable (&pdev->dev, false); - } - }break ;case PCI_VENDOR_ID_TDI :if (pdev->device ==PCI_DEVICE_ID_TDI_EHCI ) {
drivers/usb/host/xhci.c +4 -4
@@ -730,8 +730,8 @@ int xhci_suspend(struct xhci_hcd *xhci) command =xhci_readl (xhci, &xhci->op_regs->command); command |=CMD_CSS ;xhci_writel (xhci, command, &xhci->op_regs->command); -if (handshake (xhci, &xhci->op_regs->status,STS_SAVE ,0 ,10 *100 )) { -xhci_warn (xhci,"WARN: xHC CMD_CSS timeout\n" ); +if (handshake (xhci, &xhci->op_regs->status,STS_SAVE ,0 ,10 *1000 )) { +xhci_warn (xhci,"WARN: xHC save state timeout\n" );spin_unlock_irq (&xhci->lock);return -ETIMEDOUT ; }
@@ -786,8 +786,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) command |=CMD_CRS ;xhci_writel (xhci, command, &xhci->op_regs->command);if (handshake (xhci, &xhci->op_regs->status, -STS_RESTORE ,0 ,10 *100 )) { -xhci_dbg (xhci,"WARN: xHC CMD_CSS timeout\n" ); +STS_RESTORE ,0 ,10 *1000 )) { +xhci_warn (xhci,"WARN: xHC restore state timeout\n" );spin_unlock_irq (&xhci->lock);return -ETIMEDOUT ; }
drivers/usb/serial/cp210x.c +1 -0
@@ -82,6 +82,7 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */ { USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */ { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */ + { USB_DEVICE(0x10C4, 0x80C4) }, /* Cygnal Integrated Products, Inc., Optris infrared thermometer */ { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */ { USB_DEVICE(0x10C4, 0x80DD) }, /* Tracient RFID */ { USB_DEVICE(0x10C4, 0x80F6) }, /* Suunto sports instrument */
drivers/usb/serial/ftdi_sio.c +1 -0
@@ -735,6 +735,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) }, { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_CT29B_PID) }, + { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_RTS01_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) }, { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) }, { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },
drivers/usb/serial/ftdi_sio_ids.h +1 -0
@@ -784,6 +784,7 @@#define RTSYSTEMS_VID 0x2100/* Vendor ID */ #define RTSYSTEMS_SERIAL_VX7_PID 0x9e52/* Serial converter for VX-7 Radios using FT232RL */ #define RTSYSTEMS_CT29B_PID 0x9e54/* CT29B Radio Cable */ +#define RTSYSTEMS_RTS01_PID 0x9e57/* USB-RTS01 Radio Cable */ /*
drivers/usb/serial/mct_u232.c +8 -5
@@ -359,13 +359,16 @@ static int mct_u232_set_modem_ctrl(struct usb_serial *serial,MCT_U232_SET_REQUEST_TYPE ,0 ,0 , buf,MCT_U232_SET_MODEM_CTRL_SIZE , WDR_TIMEOUT); -if (rc <0 ) -dev_err (&serial->dev->dev, -"Set MODEM CTRL 0x%x failed (error = %d)\n" , mcr, rc); +kfree (buf); +dbg ("set_modem_ctrl: state=0x%x ==> mcr=0x%x" , control_state, mcr); -kfree (buf); -return rc; +if (rc <0 ) { +dev_err (&serial->dev->dev, +"Set MODEM CTRL 0x%x failed (error = %d)\n" , mcr, rc); +return rc; + } +return 0 ; }/* mct_u232_set_modem_ctrl */ static int mct_u232_get_modem_stat(struct usb_serial *serial,
drivers/usb/serial/mos7840.c +1 -1
@@ -206,7 +206,7 @@ static const struct usb_device_id moschip_port_id_table[] = { {}/* terminating entry */ }; -static const struct usb_device_id moschip_id_table_combined[]__devinitconst = { +static const struct usb_device_id moschip_id_table_combined[] = { {USB_DEVICE (USB_VENDOR_ID_MOSCHIP ,MOSCHIP_DEVICE_ID_7840 )}, {USB_DEVICE (USB_VENDOR_ID_MOSCHIP ,MOSCHIP_DEVICE_ID_7820 )}, {USB_DEVICE (USB_VENDOR_ID_BANDB ,BANDB_DEVICE_ID_USO9ML2_2 )},
drivers/usb/serial/option.c +47 -49
168 lines not on this page · raw message
drivers/usb/serial/qcserial.c +6 -0
@@ -104,7 +104,13 @@ static const struct usb_device_id id_table[] = { {USB_DEVICE(0x1410, 0xa021)}, /* Novatel Gobi 3000 Composite */ {USB_DEVICE(0x413c, 0x8193)}, /* Dell Gobi 3000 QDL */ {USB_DEVICE(0x413c, 0x8194)}, /* Dell Gobi 3000 Composite */ + {USB_DEVICE(0x1199, 0x9010)}, /* Sierra Wireless Gobi 3000 QDL */ + {USB_DEVICE(0x1199, 0x9012)}, /* Sierra Wireless Gobi 3000 QDL */ {USB_DEVICE(0x1199, 0x9013)}, /* Sierra Wireless Gobi 3000 Modem device (MC8355) */ + {USB_DEVICE(0x1199, 0x9014)}, /* Sierra Wireless Gobi 3000 QDL */ + {USB_DEVICE(0x1199, 0x9015)}, /* Sierra Wireless Gobi 3000 Modem device */ + {USB_DEVICE(0x1199, 0x9018)}, /* Sierra Wireless Gobi 3000 QDL */ + {USB_DEVICE(0x1199, 0x9019)}, /* Sierra Wireless Gobi 3000 Modem device */ {USB_DEVICE(0x12D1, 0x14F0)}, /* Sony Gobi 3000 QDL */ {USB_DEVICE(0x12D1, 0x14F1)}, /* Sony Gobi 3000 Composite */ { } /* Terminating entry */
drivers/usb/serial/sierra.c +4 -0
@@ -304,6 +304,10 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless Direct IP modems */ .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist }, +/* AT&T Direct IP LTE modems */ + { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF), + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist + }, { USB_DEVICE(0x0f3d, 0x68A3), /* Airprime/Sierra Wireless Direct IP modems */ .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist },
drivers/usb/serial/usb-serial.c +4 -2
@@ -669,12 +669,14 @@ exit:static struct usb_serial_driver *search_serial_device (struct usb_interface *iface) { -const struct usb_device_id *id; +const struct usb_device_id *id =NULL ;struct usb_serial_driver *drv; +struct usb_driver *driver =to_usb_driver (iface->dev.driver);/* Check if the usb id matches a known device */ list_for_each_entry (drv, &usb_serial_driver_list, driver_list) { - id =get_iface_id (drv, iface); +if (drv->usb_driver == driver) + id =get_iface_id (drv, iface);if (id)return drv; }
fs/hfsplus/wrapper.c +1 -1
@@ -56,7 +56,7 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector,DECLARE_COMPLETION_ONSTACK (wait);struct bio *bio;int ret =0 ; -unsigned int io_size; +u64 io_size;loff_t start;int offset;
include/linux/pci.h +2 -0
@@ -174,6 +174,8 @@ enum pci_dev_flags {PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t )1 ,/* Device configuration is irrevocably lost if disabled into D3 */ PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t )2 , +/* Device causes system crash if in D3 during S3 sleep */ + PCI_DEV_FLAGS_NO_D3_DURING_SLEEP = (__force pci_dev_flags_t) 8, }; enum pci_irq_reroute_variant {
include/linux/usb/hcd.h +0 -2
@@ -128,8 +128,6 @@ struct usb_hcd { unsigned wireless:1; /* Wireless USB HCD */ unsigned authorized_default:1; unsigned has_tt:1; /* Integrated TT in root hub */ - unsigned broken_pci_sleep:1; /* Don't put the -controller in PCI-D3 for system sleep */ int irq;/* irq allocated */ void __iomem *regs;/* device memory/io */
net/sunrpc/svc.c +2 -1
@@ -1302,7 +1302,8 @@ bc_svc_process(struct svc_serv *serv, struct rpc_rqst *req, sizeof(req->rq_snd_buf));return bc_send (req); }else { -/* Nothing to do to drop request */ +/* drop request */ +xprt_free_bc_request (req);return 0 ; } }