Linux 3.0.61
Greg KH
maintainerI'm announcing the release of the 3.0.61 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/include/asm/traps.h | 26 +++++++++ drivers/acpi/processor_idle.c | 3 + drivers/ata/ahci.c | 6 ++ drivers/dma/ioat/dma_v3.c | 2 drivers/firmware/dmi_scan.c | 78 ++++++++++++++++++++++------- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 21 +++++++ drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/intel_display.c | 4 + drivers/misc/sgi-xp/xpc_main.c | 34 +++++++++++- drivers/pci/pcie/aspm.c | 3 + drivers/scsi/sd.c | 13 ++-- drivers/staging/usbip/usbip_common.c | 11 +--- drivers/staging/usbip/usbip_common.h | 2 drivers/staging/usbip/vhci_rx.c | 3 - drivers/tty/serial/8250.c | 2 drivers/usb/host/uhci-hcd.c | 15 +++-- include/linux/pci_ids.h | 2 kernel/trace/ftrace.c | 2 19 files changed, 188 insertions(+), 44 deletions(-)
Alan Cox (1):
ahci: Add identifiers for ASM106x devices
Alan Stern (1):
USB: UHCI: fix IRQ race during initialization
Bart Westgeest (1):
staging: usbip: changed function return type to void
Chris Wilson (1):
drm/i915: Invalidate the relocation presumed_offsets along the slow path
Colin Ian King (1):
PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
Daniel Vetter (1):
drm/i915: Implement WaDisableHiZPlanesWhenMSAAEnabled
Greg Kroah-Hartman (1):
Linux 3.0.61
Jiri Slaby (1):
serial: 8250, increase PASS_LIMIT
Joel D. Diaz (1):
SCSI: sd: Reshuffle init_sd to avoid crash
Kees Cook (1):
x86: Use enum instead of literals for trap values [PARTIAL]
Konrad Rzeszutek Wilk (1):
ACPI / cpuidle: Fix NULL pointer issues when cpuidle is disabled
Robin Holt (1):
SGI-XP: handle non-fatal traps
Shuah Khan (1):
ioat: Fix DMA memory sync direction correct flag
Steven Rostedt (1):
ftrace: Be first to run code modification on modules
Zhenzhong Duan (2):
drivers/firmware/dmi_scan.c: check dmi version when get system uuid drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 60 +SUBLEVEL = 61 EXTRAVERSION = NAME = Sneaky Weasel
arch/x86/include/asm/traps.h +26 -0
@@ -1,6 +1,7 @@#ifndef _ASM_X86_TRAPS_H#define _ASM_X86_TRAPS_H +#include <linux/kprobes.h> #include <asm/debugreg.h> #include <asm/siginfo.h> /* TRAP_TRACE, ... */
@@ -87,4 +88,29 @@ asmlinkage void smp_thermal_interrupt(void); asmlinkage void mce_threshold_interrupt(void);#endif +/* Interrupts/Exceptions */ +enum { +X86_TRAP_DE =0 ,/* 0, Divide-by-zero */ +X86_TRAP_DB ,/* 1, Debug */ +X86_TRAP_NMI ,/* 2, Non-maskable Interrupt */ +X86_TRAP_BP ,/* 3, Breakpoint */ +X86_TRAP_OF ,/* 4, Overflow */ +X86_TRAP_BR ,/* 5, Bound Range Exceeded */ +X86_TRAP_UD ,/* 6, Invalid Opcode */ +X86_TRAP_NM ,/* 7, Device Not Available */ +X86_TRAP_DF ,/* 8, Double Fault */ +X86_TRAP_OLD_MF ,/* 9, Coprocessor Segment Overrun */ +X86_TRAP_TS ,/* 10, Invalid TSS */ +X86_TRAP_NP ,/* 11, Segment Not Present */ +X86_TRAP_SS ,/* 12, Stack Segment Fault */ +X86_TRAP_GP ,/* 13, General Protection Fault */ +X86_TRAP_PF ,/* 14, Page Fault */ +X86_TRAP_SPURIOUS ,/* 15, Spurious Interrupt */ +X86_TRAP_MF ,/* 16, x87 Floating-Point Exception */ +X86_TRAP_AC ,/* 17, Alignment Check */ +X86_TRAP_MC ,/* 18, Machine Check */ +X86_TRAP_XF ,/* 19, SIMD Floating-Point Exception */ +X86_TRAP_IRET =32 ,/* 32, IRET Exception */ +}; +#endif /* _ASM_X86_TRAPS_H */
drivers/acpi/processor_idle.c +3 -0
@@ -991,6 +991,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)return -EINVAL ; } +if (!dev) +return -EINVAL ; + dev->cpu = pr->id;for (i =0 ; i <CPUIDLE_STATE_MAX ; i++) { dev->states[i].name[0 ] ='\0' ;
drivers/ata/ahci.c +6 -0
@@ -402,6 +402,12 @@ static const struct pci_device_id ahci_pci_tbl[] = {/* Promise */ { PCI_VDEVICE(PROMISE, 0x3f20), board_ahci }, /* PDC42819 */ +/* Asmedia */ + { PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci }, /* ASM1060 */ + { PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci }, /* ASM1060 */ + { PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci }, /* ASM1061 */ + { PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci }, /* ASM1062 */ +/* Generic, PCI class code for AHCI */ { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
drivers/dma/ioat/dma_v3.c +1 -1
@@ -949,7 +949,7 @@ static int __devinit ioat_xor_val_self_test(struct ioatdma_device *device) goto free_resources; } } -dma_sync_single_for_device (dev, dest_dma,PAGE_SIZE ,DMA_TO_DEVICE ); +dma_sync_single_for_device (dev, dest_dma,PAGE_SIZE ,DMA_FROM_DEVICE );/* skip validate if the capability is not present */ if (!dma_has_cap (DMA_XOR_VAL , dma_chan->device->cap_mask))
drivers/firmware/dmi_scan.c +61 -17
137 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_execbuffer.c +21 -0
@@ -655,6 +655,8 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, total =0 ;for (i =0 ; i < count; i++) {struct drm_i915_gem_relocation_entry __user *user_relocs; +u64 invalid_offset = (u64)-1 ; +int j; user_relocs = (void __user *)(uintptr_t )exec[i].relocs_ptr;
@@ -665,6 +667,25 @@ i915_gem_execbuffer_relocate_slow(struct drm_device *dev, goto err; } +/* As we do not update the known relocation offsets after +* relocating (due to the complexities in lock handling), +* we need to mark them as invalid now so that we force the +* relocation processing next time. Just in case the target +* object is evicted and then rebound into its old +* presumed_offset before the next execbuffer - if that +* happened we would make the mistake of assuming that the +* relocations were valid. +*/ +for (j =0 ; j < exec[i].relocation_count; j++) { +if (copy_to_user (&user_relocs[j].presumed_offset, + &invalid_offset, +sizeof (invalid_offset))) { + ret = -EFAULT ; +mutex_lock (&dev->struct_mutex); + goto err; + } + } + reloc_offset[i] = total; total += exec[i].relocation_count; }
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -27,6 +27,8 @@#define _PIPE (pipe, a, b) ((a) + (pipe)*((b)-(a))) +#define _MASKED_BIT_ENABLE (a) (((a) << 16) | (a)) +/* * The Bridge device's PCI config space has information about the * fb aperture size and the amount of pre-reserved memory.
@@ -354,6 +356,7 @@* the enables for writing to the corresponding low bit. */ #define _3D_CHICKEN 0x02084 +#define _3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB (1 << 10)#define _3D_CHICKEN2 0x0208c/* Disables pipelining of read flushes past the SF-WIZ interface. * Required on all Ironlake steppings according to the B-Spec, but the
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -7412,6 +7412,10 @@ static void gen6_init_clock_gating(struct drm_device *dev)I915_READ (ILK_DISPLAY_CHICKEN2 ) | ILK_ELPIN_409_SELECT); +/* WaDisableHiZPlanesWhenMSAAEnabled */ +I915_WRITE (_3D_CHICKEN, +_MASKED_BIT_ENABLE (_3D_CHICKEN_HIZ_PLANE_DISABLE_MSAA_4X_SNB)); +I915_WRITE (WM3_LP_ILK ,0 );I915_WRITE (WM2_LP_ILK ,0 );I915_WRITE (WM1_LP_ILK ,0 );
drivers/misc/sgi-xp/xpc_main.c +32 -2
@@ -53,6 +53,10 @@#include <linux/kthread.h> #include "xpc.h" +#ifdef CONFIG_X86_64 +#include <asm/traps.h> +#endif +/* define two XPC debug device structures to be used with dev_dbg() et al */ struct device_driver xpc_dbg_name = {
@@ -1079,6 +1083,9 @@ xpc_system_reboot(struct notifier_block *nb, unsigned long event, void *unused)return NOTIFY_DONE ; } +/* Used to only allow one cpu to complete disconnect */ +static unsigned int xpc_die_disconnecting; +/* * Notify other partitions to deactivate from us by first disengaging from all * references to our memory.
@@ -1092,6 +1099,9 @@ xpc_die_deactivate(void)long keep_waiting;long wait_to_print; +if (cmpxchg (&xpc_die_disconnecting,0 ,1 )) +return ; +/* keep xpc_hb_checker thread from doing anything (just in case) */ xpc_exiting =1 ;
@@ -1159,7 +1169,7 @@ xpc_die_deactivate(void)* about the lack of a heartbeat. */ static int -xpc_system_die (struct notifier_block *nb,unsigned long event,void *unused) +xpc_system_die (struct notifier_block *nb,unsigned long event,void *_die_args) {#ifdef CONFIG_IA64 /* !!! temporary kludge */ switch (event) {
@@ -1191,7 +1201,27 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *unused) break; }#else -xpc_die_deactivate (); +struct die_args *die_args = _die_args; + +switch (event) { +case DIE_TRAP : +if (die_args->trapnr ==X86_TRAP_DF ) +xpc_die_deactivate (); + +if (((die_args->trapnr ==X86_TRAP_MF ) || + (die_args->trapnr ==X86_TRAP_XF )) && + !user_mode_vm (die_args->regs)) +xpc_die_deactivate (); + +break ; +case DIE_INT3 : +case DIE_DEBUG : +break ; +case DIE_OOPS : +case DIE_GPF : +default : +xpc_die_deactivate (); + }#endif return NOTIFY_DONE ;
drivers/pci/pcie/aspm.c +3 -0
@@ -790,6 +790,9 @@ void pcie_clear_aspm(struct pci_bus *bus) {struct pci_dev *child; +if (aspm_force) +return ; +/* * Clear any ASPM setup that the firmware has carried out on this bus */
drivers/scsi/sd.c +8 -5
@@ -2826,10 +2826,6 @@ static int __init init_sd(void)if (err) goto err_out; - err =scsi_register_driver (&sd_template.gendrv); -if (err) - goto err_out_class; - sd_cdb_cache =kmem_cache_create ("sd_ext_cdb" ,SD_EXT_CDB_SIZE ,0 ,0 ,NULL );if (!sd_cdb_cache) {
@@ -2843,8 +2839,15 @@ static int __init init_sd(void) goto err_out_cache; } + err =scsi_register_driver (&sd_template.gendrv); +if (err) + goto err_out_driver; +return 0 ; +err_out_driver: +mempool_destroy (sd_cdb_pool); + err_out_cache:kmem_cache_destroy (sd_cdb_cache);
@@ -2867,10 +2870,10 @@ static void __exit exit_sd(void)SCSI_LOG_HLQUEUE (3 ,printk ("exit_sd: exiting sd driver\n" )); +scsi_unregister_driver (&sd_template.gendrv);mempool_destroy (sd_cdb_pool);kmem_cache_destroy (sd_cdb_cache); -scsi_unregister_driver (&sd_template.gendrv);class_unregister (&sd_disk_class);for (i =0 ; i <SD_MAJORS ; i++)
drivers/staging/usbip/usbip_common.c +4 -7
@@ -761,26 +761,25 @@ EXPORT_SYMBOL_GPL(usbip_recv_iso);* buffer and iso packets need to be stored and be in propeper endian in urb * before calling this function */ -int usbip_pad_iso (struct usbip_device *ud,struct urb *urb) +void usbip_pad_iso (struct usbip_device *ud,struct urb *urb) {int np = urb->number_of_packets;int i; -int ret;int actualoffset = urb->actual_length;if (!usb_pipeisoc (urb->pipe)) -return 0 ; +return ;/* if no packets or length of data is 0, then nothing to unpack */ if (np ==0 || urb->actual_length ==0 ) -return 0 ; +return ;/* * if actual_length is transfer_buffer_length then no padding is * present. */ if (urb->actual_length == urb->transfer_buffer_length) -return 0 ; +return ;/* * loop over all packets from last to first (to prevent overwritting
@@ -792,8 +791,6 @@ int usbip_pad_iso(struct usbip_device *ud, struct urb *urb) urb->transfer_buffer + actualoffset, urb->iso_frame_desc[i].actual_length); } - -return ret; }EXPORT_SYMBOL_GPL (usbip_pad_iso);
drivers/staging/usbip/usbip_common.h +1 -1
@@ -327,7 +327,7 @@ int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb);/* some members of urb must be substituted before. */ int usbip_recv_iso (struct usbip_device *ud,struct urb *urb);/* some members of urb must be substituted before. */ -int usbip_pad_iso (struct usbip_device *ud,struct urb *urb); +void usbip_pad_iso (struct usbip_device *ud,struct urb *urb);void *usbip_alloc_iso_desc_pdu (struct urb *urb,ssize_t *bufflen);/* usbip_event.c */
drivers/staging/usbip/vhci_rx.c +1 -2
@@ -94,8 +94,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,return ;/* restore the padding in iso packets */ -if (usbip_pad_iso (ud, urb) <0 ) -return ; +usbip_pad_iso (ud, urb);if (usbip_dbg_flag_vhci_rx)usbip_dump_urb (urb);
drivers/tty/serial/8250.c +1 -1
@@ -81,7 +81,7 @@ static unsigned int skip_txen_test; /* force skip of txen test at init time */ #define DEBUG_INTR(fmt...) do { } while (0)#endif -#define PASS_LIMIT 256 +#define PASS_LIMIT 512#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
drivers/usb/host/uhci-hcd.c +9 -6
@@ -446,6 +446,10 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)return IRQ_NONE ;uhci_writew (uhci, status,USBSTS );/* Clear it */ +spin_lock (&uhci->lock); +if (unlikely (!uhci->is_initialized))/* not yet configured */ + goto done; +if (status & ~(USBSTS_USBINT |USBSTS_ERROR |USBSTS_RD )) {if (status &USBSTS_HSE ) dev_err(uhci_dev(uhci), "host system error, "
@@ -454,7 +458,6 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)dev_err (uhci_dev (uhci),"host controller process " "error, something bad happened!\n" );if (status &USBSTS_HCH ) { -spin_lock (&uhci->lock);if (uhci->rh_state >=UHCI_RH_RUNNING ) {dev_err (uhci_dev (uhci), "host controller halted, "
@@ -472,15 +475,15 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)* pending unlinks */ mod_timer (&hcd->rh_timer, jiffies); } -spin_unlock (&uhci->lock); } } -if (status &USBSTS_RD ) +if (status &USBSTS_RD ) { +spin_unlock (&uhci->lock);usb_hcd_poll_rh_status (hcd); -else { -spin_lock (&uhci->lock); + }else {uhci_scan_schedule (uhci); + done:spin_unlock (&uhci->lock); }
@@ -658,9 +661,9 @@ static int uhci_start(struct usb_hcd *hcd)*/ mb (); +spin_lock_irq (&uhci->lock);configure_hc (uhci); uhci->is_initialized =1 ; -spin_lock_irq (&uhci->lock);start_rh (uhci);spin_unlock_irq (&uhci->lock);return 0 ;
include/linux/pci_ids.h +2 -0
@@ -2390,6 +2390,8 @@#define PCI_VENDOR_ID_AZWAVE 0x1a3b +#define PCI_VENDOR_ID_ASMEDIA 0x1b21 +#define PCI_VENDOR_ID_TEKRAM 0x1de1#define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29
kernel/trace/ftrace.c +1 -1
@@ -3460,7 +3460,7 @@ static int ftrace_module_notify(struct notifier_block *self,struct notifier_block ftrace_module_nb = { .notifier_call = ftrace_module_notify, - .priority =0 , + .priority =INT_MAX ,/* Run before anything that can use kprobes */ };extern unsigned long __start_mcount_loc[];