Linux 3.0.63
Greg KH
maintainerI'm announcing the release of the 3.0.63 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/x86/ia32/ia32entry.S | 4 drivers/gpu/drm/radeon/evergreen.c | 2 drivers/gpu/drm/radeon/radeon_combios.c | 8 drivers/gpu/drm/radeon/radeon_display.c | 4 drivers/rtc/rtc-isl1208.c | 3 drivers/usb/host/ehci-sched.c | 2 drivers/usb/host/xhci-ring.c | 6 drivers/usb/serial/ftdi_sio.c | 2 drivers/usb/serial/ftdi_sio_ids.h | 9 drivers/usb/serial/option.c | 13 + drivers/usb/serial/qcserial.c | 1 drivers/usb/storage/initializers.c | 76 +++++++ drivers/usb/storage/initializers.h | 4 drivers/usb/storage/unusual_devs.h | 329 -------------------------------- drivers/usb/storage/usb.c | 12 + drivers/usb/storage/usual-tables.c | 15 + fs/nilfs2/ioctl.c | 5 18 files changed, 158 insertions(+), 339 deletions(-)
Alan Stern (2):
USB: EHCI: fix bug in scheduling periodic split transfers
USB: XHCI: fix memory leak of URB-private data
Alex Deucher (2):
drm/radeon/evergreen+: wait for the MC to settle after MC blackout drm/radeon: add quirk for RV100 board
Bjørn Mork (1):
USB: option: add Changhong CH690
Daniele Palmas (2):
USB: option: add support for Telit LE920
USB: qcserial: add Telit Gobi QDL device
Greg Kroah-Hartman (1):
Linux 3.0.63
Jan Beulich (1):
x86-64: Replace left over sti/cli in ia32 audit exit code
Jan Luebbe (1):
drivers/rtc/rtc-isl1208.c: call rtc_update_irq() from the alarm irq handler
Petr Kubánek (1):
USB: ftdi_sio: add Zolix FTDI PID
Sarah Sharp (1):
xhci: Fix isoc TD encoding.
Sven Killig (1):
USB: ftdi_sio: add PID/VID entries for ELV WS 300 PC II
Vyacheslav Dubeyko (1):
nilfs2: fix fix very long mount time issue
fangxiaozhi (2):
USB: storage: Define a new macro for USB storage match rules
USB: storage: optimize to match the Huawei USB storage devices and support new switch command
liu chuansheng (1):
drm/radeon: Calling object_unrefer() when creating fb failure
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 62 +SUBLEVEL = 63 EXTRAVERSION = NAME = Sneaky Weasel
arch/x86/ia32/ia32entry.S +2 -2
@@ -208,7 +208,7 @@ sysexit_from_sys_call: testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10) jnz ia32_ret_from_sys_call TRACE_IRQS_ON - sti + ENABLE_INTERRUPTS(CLBR_NONE) movl %eax,%esi /* second arg, syscall return value */ cmpl $0,%eax /* is it < 0? */ setl %al /* 1 if so, 0 if not */
@@ -218,7 +218,7 @@ sysexit_from_sys_call: GET_THREAD_INFO(%r10) movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */ movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi - cli + DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF testl %edi,TI_flags(%r10) jz \exit
drivers/gpu/drm/radeon/evergreen.c +2 -0
@@ -1065,6 +1065,8 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *savWREG32 (EVERGREEN_D5VGA_CONTROL ,0 );WREG32 (EVERGREEN_D6VGA_CONTROL ,0 ); } +/* wait for the MC to settle */ +udelay (100 ); }void evergreen_mc_resume (struct radeon_device *rdev,struct evergreen_mc_save *save)
drivers/gpu/drm/radeon/radeon_combios.c +8 -0
@@ -2338,6 +2338,14 @@ bool radeon_get_legacy_connector_info_from_bios(struct drm_device *dev) 1), ATOM_DEVICE_CRT1_SUPPORT); } +/* RV100 board with external TDMS bit mis-set. +* Actually uses internal TMDS, clear the bit. +*/ +if (dev->pdev->device ==0x5159 && + dev->pdev->subsystem_vendor ==0x1014 && + dev->pdev->subsystem_device ==0x029A ) { + tmp &= ~(1 <<4 ); + }if ((tmp >>4 ) &0x1 ) { devices |=ATOM_DEVICE_DFP2_SUPPORT ; radeon_add_legacy_encoder(dev,
drivers/gpu/drm/radeon/radeon_display.c +3 -1
@@ -1158,8 +1158,10 @@ radeon_user_framebuffer_create(struct drm_device *dev, } radeon_fb =kzalloc (sizeof (*radeon_fb),GFP_KERNEL ); -if (radeon_fb ==NULL ) +if (radeon_fb ==NULL ) { +drm_gem_object_unreference_unlocked (obj);return ERR_PTR (-ENOMEM ); + }radeon_framebuffer_init (dev, radeon_fb, mode_cmd, obj);
drivers/rtc/rtc-isl1208.c +3 -0
@@ -494,6 +494,7 @@ isl1208_rtc_interrupt(int irq, void *data) {unsigned long timeout = jiffies +msecs_to_jiffies (1000 );struct i2c_client *client = data; +struct rtc_device *rtc =i2c_get_clientdata (client);int handled =0 , sr, err;/*
@@ -516,6 +517,8 @@ isl1208_rtc_interrupt(int irq, void *data)if (sr &ISL1208_REG_SR_ALM ) {dev_dbg (&client->dev,"alarm!\n" ); +rtc_update_irq (rtc,1 ,RTC_IRQF |RTC_AF ); +/* Clear the alarm */ sr &= ~ISL1208_REG_SR_ALM ; sr =i2c_smbus_write_byte_data (client,ISL1208_REG_SR , sr);
drivers/usb/host/ehci-sched.c +1 -1
@@ -236,7 +236,7 @@ static inline unsigned char tt_start_uframe(struct ehci_hcd *ehci, __hc32 mask) }static const unsigned char -max_tt_usecs[] = {125 ,125 ,125 ,125 ,125 ,125 ,30 ,0 }; +max_tt_usecs[] = {125 ,125 ,125 ,125 ,125 ,125 ,125 ,25 };/* carryover low/fullspeed bandwidth that crosses uframe boundries */ static inline void carryover_tt_bandwidth (unsigned short tt_usecs[8 ])
drivers/usb/host/xhci-ring.c +5 -1
@@ -2506,6 +2506,8 @@ cleanup: (trb_comp_code != COMP_STALL && trb_comp_code != COMP_BABBLE))xhci_urb_free_priv (xhci, urb_priv); + else +kfree (urb_priv );usb_hcd_unlink_urb_from_ep (bus_to_hcd (urb->dev->bus), urb); if ((urb->actual_length != urb->transfer_buffer_length &&
@@ -3613,9 +3615,11 @@ static int xhci_queue_isoc_tx(struct xhci_hcd *xhci, gfp_t mem_flags, td = urb_priv->td[i];for (j =0 ; j < trbs_per_td; j++) {u32 remainder =0 ; - field =TRB_TBC (burst_count) |TRB_TLBPC (residue); + field =0 ;if (first_trb) { + field =TRB_TBC (burst_count) | +TRB_TLBPC (residue);/* Queue the isoc TRB */ field |=TRB_TYPE (TRB_ISOC );/* Assume URB_ISO_ASAP is set */
drivers/usb/serial/ftdi_sio.c +2 -0
@@ -588,6 +588,7 @@ static struct usb_device_id id_table_combined [] = {/* * ELV devices: */ + { USB_DEVICE(FTDI_ELV_VID, FTDI_ELV_WS300_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ELV_USR_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ELV_MSM1_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ELV_KL100_PID) },
@@ -674,6 +675,7 @@ static struct usb_device_id id_table_combined [] = { { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_5_PID) }, { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_6_PID) }, { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) }, + { USB_DEVICE(FTDI_VID, FTDI_OMNI1509) }, { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) }, { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) }, { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },
drivers/usb/serial/ftdi_sio_ids.h +8 -1
@@ -147,6 +147,11 @@#define XSENS_CONVERTER_6_PID 0xD38E#define XSENS_CONVERTER_7_PID 0xD38F +/** +* Zolix (www.zolix.com.cb) product ids +*/ +#define FTDI_OMNI1509 0xD491/* Omni1509 embedded USB-serial */ +/* * NDI (www.ndigital.com) product ids */
@@ -204,7 +209,7 @@/* * ELV USB devices submitted by Christian Abt of ELV (www.elv.de). -* All of these devices use FTDI's vendor ID (0x0403). +* Almost all of these devices use FTDI's vendor ID (0x0403). * Further IDs taken from ELV Windows .inf file. * * The previously included PID for the UO 100 module was incorrect.
@@ -212,6 +217,8 @@* * Armin Laeuger originally sent the PID for the UM 100 module. */ +#define FTDI_ELV_VID 0x1B1F/* ELV AG */ +#define FTDI_ELV_WS300_PID 0xC006/* eQ3 WS 300 PC II */ #define FTDI_ELV_USR_PID 0xE000/* ELV Universal-Sound-Recorder */ #define FTDI_ELV_MSM1_PID 0xE001/* ELV Mini-Sound-Modul */ #define FTDI_ELV_KL100_PID 0xE002/* ELV Kfz-Leistungsmesser KL 100 */
drivers/usb/serial/option.c +13 -0
@@ -242,6 +242,7 @@ static void option_instat_callback(struct urb *urb);#define TELIT_PRODUCT_CC864_DUAL 0x1005#define TELIT_PRODUCT_CC864_SINGLE 0x1006#define TELIT_PRODUCT_DE910_DUAL 0x1010 +#define TELIT_PRODUCT_LE920 0x1200/* ZTE PRODUCTS */ #define ZTE_VENDOR_ID 0x19d2
@@ -453,6 +454,10 @@ static void option_instat_callback(struct urb *urb);#define TPLINK_VENDOR_ID 0x2357#define TPLINK_PRODUCT_MA180 0x0201 +/* Changhong products */ +#define CHANGHONG_VENDOR_ID 0x2077 +#define CHANGHONG_PRODUCT_CH690 0x7001 +/* some devices interfaces need special handling due to a number of reasons */ enum option_blacklist_reason {OPTION_BLACKLIST_NONE =0 ,
@@ -534,6 +539,11 @@ static const struct option_blacklist_info zte_1255_blacklist = { .reserved = BIT(3) | BIT(4), }; +static const struct option_blacklist_info telit_le920_blacklist = { + .sendsetup =BIT (0 ), + .reserved =BIT (1 ) |BIT (5 ), +}; +static const struct usb_device_id option_ids[] = { {USB_DEVICE (OPTION_VENDOR_ID ,OPTION_PRODUCT_COLT ) }, {USB_DEVICE (OPTION_VENDOR_ID ,OPTION_PRODUCT_RICOLA ) },
@@ -784,6 +794,8 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_DUAL) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920), + .driver_info = (kernel_ulong_t)&telit_le920_blacklist }, { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
@@ -1318,6 +1330,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) }, { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180), .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) }, { } /* Terminating entry */ };MODULE_DEVICE_TABLE (usb, option_ids);
drivers/usb/serial/qcserial.c +1 -0
@@ -54,6 +54,7 @@ static const struct usb_device_id id_table[] = { {DEVICE_G1K(0x05c6, 0x9221)}, /* Generic Gobi QDL device */ {DEVICE_G1K(0x05c6, 0x9231)}, /* Generic Gobi QDL device */ {DEVICE_G1K(0x1f45, 0x0001)}, /* Unknown Gobi QDL device */ + {DEVICE_G1K(0x1bc7, 0x900e)}, /* Telit Gobi QDL device *//* Gobi 2000 devices */ {USB_DEVICE(0x1410, 0xa010)}, /* Novatel Gobi 2000 QDL device */
drivers/usb/storage/initializers.c +74 -2
85 lines not on this page · raw message
drivers/usb/storage/initializers.h +2 -2
@@ -46,5 +46,5 @@ int usb_stor_euscsi_init(struct us_data *us);* flash reader */ int usb_stor_ucr61s2b_init (struct us_data *us); -/* This places the HUAWEI E220 devices in multi-port mode */ -int usb_stor_huawei_e220_init (struct us_data *us); +/* This places the HUAWEI usb dongles in multi-port mode */ +int usb_stor_huawei_init (struct us_data *us);
drivers/usb/storage/unusual_devs.h +2 -327
337 lines not on this page · raw message
drivers/usb/storage/usb.c +12 -0
@@ -120,6 +120,17 @@ MODULE_PARM_DESC(quirks, "supplemental list of device IDs and their quirks"); .useTransport = use_transport, \ } +#define UNUSUAL_VENDOR_INTF (idVendor, cl, sc, pr, \ + vendor_name, product_name, use_protocol, use_transport, \ + init_function, Flags) \ +{ \ + .vendorName = vendor_name, \ + .productName = product_name, \ + .useProtocol = use_protocol, \ + .useTransport = use_transport, \ + .initFunction = init_function, \ +} +static struct us_unusual_dev us_unusual_dev_list[] = { # include "unusual_devs.h" { }/* Terminating entry */
@@ -128,6 +139,7 @@ static struct us_unusual_dev us_unusual_dev_list[] = {#undef UNUSUAL_DEV#undef COMPLIANT_DEV#undef USUAL_DEV +#undef UNUSUAL_VENDOR_INTF#ifdef CONFIG_PM /* Minimal support for suspend and resume */
drivers/usb/storage/usual-tables.c +15 -0
@@ -46,6 +46,20 @@ { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \ .driver_info = ((useType)<<24) } +/* Define the device is matched with Vendor ID and interface descriptors */ +#define UNUSUAL_VENDOR_INTF (id_vendor, cl, sc, pr, \ + vendorName, productName, useProtocol, useTransport, \ + initFunction, flags) \ +{ \ + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ + | USB_DEVICE_ID_MATCH_VENDOR, \ + .idVendor = (id_vendor), \ + .bInterfaceClass = (cl), \ + .bInterfaceSubClass = (sc), \ + .bInterfaceProtocol = (pr), \ + .driver_info = (flags) \ +} +struct usb_device_id usb_storage_usb_ids[] = { # include "unusual_devs.h" { }/* Terminating entry */
@@ -57,6 +71,7 @@ MODULE_DEVICE_TABLE(usb, usb_storage_usb_ids);#undef UNUSUAL_DEV#undef COMPLIANT_DEV#undef USUAL_DEV +#undef UNUSUAL_VENDOR_INTF/*
fs/nilfs2/ioctl.c +4 -1
@@ -661,8 +661,11 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,if (ret <0 )printk (KERN_ERR "NILFS: GC failed during preparation: " "cannot read source blocks: err=%d\n" , ret); -else +else { +if (nilfs_sb_need_update (nilfs)) +set_nilfs_discontinued (nilfs); ret =nilfs_clean_segments (inode->i_sb, argv, kbufs); + }nilfs_remove_all_gcinodes (nilfs);clear_nilfs_gc_running (nilfs);