Linux 3.0.49
Greg KH
maintainerI'm announcing the release of the 3.0.49 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/sparc/kernel/perf_event.c | 15 - arch/sparc/kernel/sys_sparc_64.c | 10 - arch/sparc/kernel/syscalls.S | 32 +-- arch/sparc/mm/init_64.c | 28 ++ arch/tile/Makefile | 4 arch/x86/kernel/entry_32.S | 8 arch/x86/kernel/entry_64.S | 2 arch/x86/kernel/setup.c | 17 + arch/x86/oprofile/nmi_int.c | 2 drivers/edac/amd64_edac.c | 11 - drivers/gpu/drm/i915/i915_reg.h | 5 drivers/gpu/drm/i915/intel_display.c | 4 drivers/media/video/au0828/au0828-video.c | 12 - drivers/net/skge.c | 7 drivers/pcmcia/pxa2xx_sharpsl.c | 2 drivers/usb/class/cdc-acm.c | 22 +- drivers/usb/host/xhci-mem.c | 7 drivers/usb/host/xhci-ring.c | 282 +++++++++++++++++++++++++++++- drivers/usb/host/xhci.c | 33 ++- drivers/usb/host/xhci.h | 22 ++ drivers/usb/serial/option.c | 92 +++++++-- fs/lockd/clntxdr.c | 2 fs/lockd/mon.c | 4 fs/lockd/svcproc.c | 3 kernel/cgroup.c | 3 kernel/sys.c | 12 - net/core/neighbour.c | 6 net/ipv4/tcp_ipv4.c | 7 net/ipv6/tcp_ipv6.c | 3 net/rds/send.c | 2 net/sunrpc/cache.c | 4 32 files changed, 545 insertions(+), 120 deletions(-)
Al Viro (1):
sparc64: fix ptrace interaction with force_successful_syscall_return()
Alexey Kuznetsov (1):
tcp: resets are misrouted
Andrew Morton (1):
amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]
Arnd Bergmann (1):
pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops
Bjørn Mork (2):
USB: option: blacklist net interface on ZTE devices
USB: option: add more ZTE devices
Chris Metcalf (1):
arch/tile: avoid generating .eh_frame information in modules
Daisuke Nishimura (1):
cgroup: notify_on_release may not be triggered in some cases
Dan Carpenter (1):
oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()
David S. Miller (3):
sparc64: Like x86 we should check current->mm during perf backtrace generation.
sparc64: Fix bit twiddling in sparc_pmu_enable_event().
sparc64: Be less verbose during vmemmap population.
David Vrabel (1):
xen/x86: don't corrupt %eip when returning from a signal handler
Devin Heitmueller (1):
media: au0828: fix case where STREAMOFF being called on stopped stream causes BUG()
Elric Fu (4):
xHCI: add cmd_ring_state
xHCI: add aborting command ring function
xHCI: cancel command after command timeout
xHCI: handle command after aborting the command ring
Graham Gower (1):
skge: Add DMA mask quirk for Marvell 88E8001 on ASUS P5NSLI motherboard
Greg Kroah-Hartman (2):
Revert: lockd: use rpc client's cl_nodename for id encoding Linux 3.0.49
Jacob Shin (1):
x86: Exclude E820_RESERVED regions and memory holes above 4 GB from direct mapping.
Jesse Barnes (1):
drm/i915: apply timing generator bug workaround on CPT and PPT
Jiri Kosina (1):
sparc64: do not clobber personality flags in sys_sparc64_personality()
Kees Cook (2):
kernel/sys.c: fix stack memory content leak via UNAME26 use clamp_t in UNAME26 fix
Ming Lei (1):
USB: cdc-acm: fix pipe type of write endpoint
Nicolas Boullis (1):
usb: acm: fix the computation of the number of data bits
Sasha Levin (1):
SUNRPC: Prevent kernel stack corruption on long values of flush
Trond Myklebust (1):
NLM: nlm_lookup_file() may return NLMv4-specific error codes
jeff.liu (1):
RDS: fix rds-ping spinlock recursion
[email protected] (1):
net: Fix skb_under_panic oops in neigh_resolve_output
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 0 -SUBLEVEL = 48 +SUBLEVEL = 49 EXTRAVERSION = NAME = Sneaky Weasel
arch/sparc/kernel/perf_event.c +9 -6
@@ -513,11 +513,13 @@ static u64 nop_for_index(int idx)static inline void sparc_pmu_enable_event (struct cpu_hw_events *cpuc,struct hw_perf_event *hwc,int idx) { -u64 val, mask =mask_for_index (idx); +u64 enc, val, mask =mask_for_index (idx); + + enc =perf_event_get_enc (cpuc->events[idx]); val = cpuc->pcr; val &= ~mask; - val |= hwc->config; + val |=event_encoding (enc, idx); cpuc->pcr = val; pcr_ops->write (cpuc->pcr);
@@ -1380,8 +1382,6 @@ static void perf_callchain_user_64(struct perf_callchain_entry *entry, {unsigned long ufp; -perf_callchain_store (entry, regs->tpc); - ufp = regs->u_regs[UREG_I6 ] +STACK_BIAS ; do { struct sparc_stackf *usf, sf;
@@ -1402,8 +1402,6 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry, {unsigned long ufp; -perf_callchain_store (entry, regs->tpc); - ufp = regs->u_regs[UREG_I6 ] &0xffffffffUL ; do { struct sparc_stackf32 *usf, sf;
@@ -1422,6 +1420,11 @@ static void perf_callchain_user_32(struct perf_callchain_entry *entry,void perf_callchain_user (struct perf_callchain_entry *entry,struct pt_regs *regs) { +perf_callchain_store (entry, regs->tpc); + +if (!current->mm) +return ; +flushw_user ();if (test_thread_flag (TIF_32BIT ))perf_callchain_user_32 (entry, regs);
arch/sparc/kernel/sys_sparc_64.c +5 -5
@@ -519,12 +519,12 @@ SYSCALL_DEFINE1(sparc64_personality, unsigned long, personality) {int ret; -if (current->personality ==PER_LINUX32 && - personality ==PER_LINUX ) - personality =PER_LINUX32 ; +if (personality (current->personality) ==PER_LINUX32 && +personality (personality) ==PER_LINUX ) + personality |=PER_LINUX32 ; ret =sys_personality (personality); -if (ret ==PER_LINUX32 ) - ret =PER_LINUX ; +if (personality (ret) ==PER_LINUX32 ) + ret &= ~PER_LINUX32 ;return ret; }
arch/sparc/kernel/syscalls.S +14 -18
@@ -212,24 +212,20 @@ linux_sparc_syscall: 3: stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] ret_sys_call: ldx [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3 - ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc sra %o0, 0, %o0 mov %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2 sllx %g2, 32, %g2 - /* Check if force_successful_syscall_return() - * was invoked. - */ - ldub [%g6 + TI_SYS_NOERROR], %l2 - brnz,a,pn %l2, 80f - stb %g0, [%g6 + TI_SYS_NOERROR] - cmp %o0, -ERESTART_RESTARTBLOCK bgeu,pn %xcc, 1f - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6 -80: + andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0 + ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc + +2: + stb %g0, [%g6 + TI_SYS_NOERROR] /* System call success, clear Carry condition code. */ andn %g3, %g2, %g3 +3: stx %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE] bne,pn %icc, linux_syscall_trace2 add %l1, 0x4, %l2 ! npc = npc+4
@@ -238,20 +234,20 @@ ret_sys_call: stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] 1: + /* Check if force_successful_syscall_return() + * was invoked. + */ + ldub [%g6 + TI_SYS_NOERROR], %l2 + brnz,pn %l2, 2b + ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc /* System call failure, set Carry condition code. * Also, get abs(errno) to return to the process. */ - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %l6 sub %g0, %o0, %o0 - or %g3, %g2, %g3 stx %o0, [%sp + PTREGS_OFF + PT_V9_I0] - stx %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE] - bne,pn %icc, linux_syscall_trace2 - add %l1, 0x4, %l2 ! npc = npc+4 - stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC] + ba,pt %xcc, 3b + or %g3, %g2, %g3 - b,pt %xcc, rtrap - stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC] linux_syscall_trace2: call syscall_trace_leave add %sp, PTREGS_OFF, %o0
arch/sparc/mm/init_64.c +23 -5
@@ -2118,6 +2118,9 @@ EXPORT_SYMBOL(_PAGE_CACHE);#ifdef CONFIG_SPARSEMEM_VMEMMAP unsigned long vmemmap_table[VMEMMAP_SIZE ]; +static long __meminitdata addr_start, addr_end; +static int __meminitdata node_start; +int __meminit vmemmap_populate (struct page *start,unsigned long nr,int node) {unsigned long vstart = (unsigned long ) start;
@@ -2148,15 +2151,30 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node) *vmem_pp = pte_base |__pa (block); -printk (KERN_INFO "[%p-%p] page_structs=%lu " -"node=%d entry=%lu/%lu\n" , start, block, nr, - node, - addr >>VMEMMAP_CHUNK_SHIFT , - VMEMMAP_SIZE); +/* check to see if we have contiguous blocks */ +if (addr_end != addr || node_start != node) { +if (addr_start) +printk (KERN_DEBUG " [%lx-%lx] on node %d\n" , + addr_start, addr_end-1 , node_start); + addr_start = addr; + node_start = node; + } + addr_end = addr + VMEMMAP_CHUNK; } }return 0 ; } + +void __meminit vmemmap_populate_print_last (void ) +{ +if (addr_start) { +printk (KERN_DEBUG " [%lx-%lx] on node %d\n" , + addr_start, addr_end-1 , node_start); + addr_start =0 ; + addr_end =0 ; + node_start =0 ; + } +}#endif /* CONFIG_SPARSEMEM_VMEMMAP */ static void prot_init_common(unsigned long page_none,
arch/tile/Makefile +4 -0
@@ -26,6 +26,10 @@ $(error Set TILERA_ROOT or CROSS_COMPILE when building $(ARCH) on $(HOST_ARCH)) endif endif +# The tile compiler may emit .eh_frame information for backtracing. +# In kernel modules, this causes load failures due to unsupported relocations. +KBUILD_CFLAGS += -fno-asynchronous-unwind-tables + ifneq ($(CONFIG_DEBUG_EXTRA_FLAGS),"") KBUILD_CFLAGS += $(CONFIG_DEBUG_EXTRA_FLAGS) endif
arch/x86/kernel/entry_32.S +5 -3
@@ -1029,7 +1029,7 @@ ENTRY(xen_sysenter_target) ENTRY(xen_hypervisor_callback) CFI_STARTPROC - pushl_cfi $0 + pushl_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL TRACE_IRQS_OFF
@@ -1071,14 +1071,16 @@ ENTRY(xen_failsafe_callback) 2: mov 8(%esp),%es 3: mov 12(%esp),%fs 4: mov 16(%esp),%gs + /* EAX == 0 => Category 1 (Bad segment) + EAX != 0 => Category 2 (Bad IRET) */ testl %eax,%eax popl_cfi %eax lea 16(%esp),%esp CFI_ADJUST_CFA_OFFSET -16 jz 5f addl $16,%esp - jmp iret_exc # EAX != 0 => Category 2 (Bad IRET) -5: pushl_cfi $0 # EAX == 0 => Category 1 (Bad segment) + jmp iret_exc +5: pushl_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL jmp ret_from_exception CFI_ENDPROC
arch/x86/kernel/entry_64.S +1 -1
@@ -1308,7 +1308,7 @@ ENTRY(xen_failsafe_callback) CFI_RESTORE r11 addq $0x30,%rsp CFI_ADJUST_CFA_OFFSET -0x30 - pushq_cfi $0 + pushq_cfi $-1 /* orig_ax = -1 => not a system call */ SAVE_ALL jmp error_exit CFI_ENDPROC
arch/x86/kernel/setup.c +15 -2
@@ -937,8 +937,21 @@ void __init setup_arch(char **cmdline_p)#ifdef CONFIG_X86_64 if (max_pfn > max_low_pfn) { - max_pfn_mapped =init_memory_mapping (1UL <<32 , - max_pfn<<PAGE_SHIFT ); +int i; +for (i =0 ; i < e820.nr_map; i++) { +struct e820entry *ei = &e820.map[i]; + +if (ei->addr + ei->size <=1UL <<32 ) +continue ; + +if (ei->type ==E820_RESERVED ) +continue ; + + max_pfn_mapped =init_memory_mapping ( + ei->addr <1UL <<32 ?1UL <<32 : ei->addr, + ei->addr + ei->size); + } +/* can we preseve max_low_pfn ?*/ max_low_pfn = max_pfn; }
arch/x86/oprofile/nmi_int.c +1 -1
@@ -55,7 +55,7 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, val |= counter_config->extra; event &= model->event_mask ? model->event_mask :0xFF ; val |= event &0xFF ; - val |= (event &0x0F00 ) <<24 ; + val |= (u64)(event &0x0F00 ) <<24 ;return val; }
drivers/edac/amd64_edac.c +4 -7
@@ -161,8 +161,11 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)* memory controller and apply to register. Search for the first * bandwidth entry that is greater or equal than the setting requested * and program that. If at last entry, turn off DRAM scrubbing. +* +* If no suitable bandwidth is found, turn off DRAM scrubbing entirely +* by falling back to the last element in scrubrates[]. */ -for (i =0 ; i <ARRAY_SIZE (scrubrates); i++) { +for (i =0 ; i <ARRAY_SIZE (scrubrates) -1 ; i++) {/* * skip scrub rates which aren't recommended * (see F10 BKDG, F3x58)
@@ -172,12 +175,6 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)if (scrubrates[i].bandwidth <= new_bw)break ; - -/* -* if no suitable bandwidth found, turn off DRAM scrubbing -* entirely by falling back to the last element in the -* scrubrates array. -*/ } scrubval = scrubrates[i].scrubval;
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -3113,6 +3113,11 @@#define TRANS_6BPC (2<<5)#define TRANS_12BPC (3<<5) +#define _TRANSA_CHICKEN2 0xf0064 +#define _TRANSB_CHICKEN2 0xf1064 +#define TRANS_CHICKEN2 (pipe) _PIPE(pipe, _TRANSA_CHICKEN2, _TRANSB_CHICKEN2) +#define TRANS_AUTOTRAIN_GEN_STALL_DIS (1<<31) +#define SOUTH_CHICKEN2 0xc2004#define DPLS_EDP_PPS_FIX_DIS (1<<0)
drivers/gpu/drm/i915/intel_display.c +4 -0
@@ -7584,6 +7584,7 @@ static void ibx_init_clock_gating(struct drm_device *dev)static void cpt_init_clock_gating (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private; +int pipe;/* * On Ibex Peak and Cougar Point, we need to disable clock
@@ -7593,6 +7594,9 @@ static void cpt_init_clock_gating(struct drm_device *dev)I915_WRITE (SOUTH_DSPCLK_GATE_D ,PCH_DPLSUNIT_CLOCK_GATE_DISABLE );I915_WRITE (SOUTH_CHICKEN2 ,I915_READ (SOUTH_CHICKEN2 ) |DPLS_EDP_PPS_FIX_DIS ); +/* Without this, mode sets may fail silently on FDI */ +for_each_pipe (pipe) +I915_WRITE (TRANS_CHICKEN2 (pipe),TRANS_AUTOTRAIN_GEN_STALL_DIS ); }static void ironlake_teardown_rc6 (struct drm_device *dev)
drivers/media/video/au0828/au0828-video.c +8 -4
@@ -1697,14 +1697,18 @@ static int vidioc_streamoff(struct file *file, void *priv, (AUVI_INPUT (i).audio_setup)(dev,0 ); } -videobuf_streamoff (&fh->vb_vidq); -res_free (fh,AU0828_RESOURCE_VIDEO ); +if (res_check (fh,AU0828_RESOURCE_VIDEO )) { +videobuf_streamoff (&fh->vb_vidq); +res_free (fh,AU0828_RESOURCE_VIDEO ); + } }else if (fh->type ==V4L2_BUF_TYPE_VBI_CAPTURE ) { dev->vbi_timeout_running =0 ;del_timer_sync (&dev->vbi_timeout); -videobuf_streamoff (&fh->vb_vbiq); -res_free (fh,AU0828_RESOURCE_VBI ); +if (res_check (fh,AU0828_RESOURCE_VBI )) { +videobuf_streamoff (&fh->vb_vbiq); +res_free (fh,AU0828_RESOURCE_VBI ); + } }return 0 ;
drivers/net/skge.c +7 -0
@@ -4097,6 +4097,13 @@ static struct dmi_system_id skge_32bit_dma_boards[] = { DMI_MATCH(DMI_BOARD_NAME, "nForce"), }, }, + { + .ident = "ASUS P5NSLI", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P5NSLI") + }, + }, {} };
drivers/pcmcia/pxa2xx_sharpsl.c +1 -1
@@ -222,7 +222,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)sharpsl_pcmcia_init_reset (skt); } -static struct pcmcia_low_level sharpsl_pcmcia_ops__initdata = { +static struct pcmcia_low_level sharpsl_pcmcia_ops = { .owner =THIS_MODULE , .hw_init = sharpsl_pcmcia_hw_init, .hw_shutdown = sharpsl_pcmcia_hw_shutdown,
drivers/usb/class/cdc-acm.c +16 -6
@@ -760,10 +760,6 @@ static const __u32 acm_tty_speed[] = { 2500000, 3000000, 3500000, 4000000 }; -static const __u8 acm_tty_size[] = { -5 ,6 ,7 ,8 -}; -static void acm_tty_set_termios (struct tty_struct *tty,struct ktermios *termios_old) {
@@ -780,7 +776,21 @@ static void acm_tty_set_termios(struct tty_struct *tty, newline.bParityType = termios->c_cflag &PARENB ? (termios->c_cflag &PARODD ?1 :2 ) + (termios->c_cflag &CMSPAR ?2 :0 ) :0 ; - newline.bDataBits = acm_tty_size[(termios->c_cflag &CSIZE ) >>4 ]; +switch (termios->c_cflag &CSIZE ) { +case CS5 : + newline.bDataBits =5 ; +break ; +case CS6 : + newline.bDataBits =6 ; +break ; +case CS7 : + newline.bDataBits =7 ; +break ; +case CS8 : +default : + newline.bDataBits =8 ; +break ; + }/* FIXME: Needs to clear unsupported bits in the termios */ acm->clocal = ((termios->c_cflag &CLOCAL ) !=0 );
@@ -1172,7 +1182,7 @@ made_compressed_probe:if (usb_endpoint_xfer_int (epwrite))usb_fill_int_urb (snd->urb, usb_dev, -usb_sndbulkpipe (usb_dev, epwrite->bEndpointAddress), +usb_sndintpipe (usb_dev, epwrite->bEndpointAddress),NULL , acm->writesize, acm_write_bulk, snd, epwrite->bInterval);else usb_fill_bulk_urb(snd->urb, usb_dev,
drivers/usb/host/xhci-mem.c +7 -0
@@ -1505,6 +1505,7 @@ void xhci_free_command(struct xhci_hcd *xhci,void xhci_mem_cleanup (struct xhci_hcd *xhci) {struct pci_dev *pdev =to_pci_dev (xhci_to_hcd (xhci)->self.controller); +struct xhci_cd *cur_cd, *next_cd;int size;int i;
@@ -1525,6 +1526,11 @@ void xhci_mem_cleanup(struct xhci_hcd *xhci)xhci_ring_free (xhci, xhci->cmd_ring); xhci->cmd_ring =NULL ;xhci_dbg (xhci,"Freed command ring\n" ); +list_for_each_entry_safe (cur_cd, next_cd, + &xhci->cancel_cmd_list, cancel_cmd_list) { +list_del (&cur_cd->cancel_cmd_list); +kfree (cur_cd); + }for (i =1 ; i <MAX_HC_SLOTS ; ++i)xhci_free_virt_device (xhci, i);
@@ -2014,6 +2020,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) xhci->cmd_ring =xhci_ring_alloc (xhci,1 , true, false, flags);if (!xhci->cmd_ring) goto fail; +INIT_LIST_HEAD (&xhci->cancel_cmd_list);xhci_dbg (xhci,"Allocated command ring at %p\n" , xhci->cmd_ring);xhci_dbg (xhci,"First segment DMA is 0x%llx\n" , (unsigned long long )xhci->cmd_ring->first_seg->dma);
drivers/usb/host/xhci-ring.c +276 -6
315 lines not on this page · raw message
drivers/usb/host/xhci.c +24 -9
@@ -51,7 +51,7 @@ MODULE_PARM_DESC(link_quirk, "Don't clear the chain bit on a link TRB");* handshake done). There are two failure modes: "usec" have passed (major * hardware flakeout), or the register reads as all-ones (hardware removed). */ -static int handshake (struct xhci_hcd *xhci,void __iomem *ptr, +int handshake (struct xhci_hcd *xhci,void __iomem *ptr,u32 mask,u32 done,int usec) {u32 result;
@@ -104,8 +104,10 @@ int xhci_halt(struct xhci_hcd *xhci) ret =handshake (xhci, &xhci->op_regs->status,STS_HALT ,STS_HALT ,XHCI_MAX_HALT_USEC ); -if (!ret) +if (!ret) { xhci->xhc_state |=XHCI_STATE_HALTED ; + xhci->cmd_ring_state =CMD_RING_STATE_STOPPED ; + }return ret; }
@@ -390,6 +392,7 @@ static int xhci_run_finished(struct xhci_hcd *xhci)return -ENODEV ; } xhci->shared_hcd->state =HC_STATE_RUNNING ; + xhci->cmd_ring_state =CMD_RING_STATE_RUNNING ;if (xhci->quirks &XHCI_NEC_HOST )xhci_ring_cmd_db (xhci);
@@ -1775,6 +1778,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,struct completion *cmd_completion;u32 *cmd_status;struct xhci_virt_device *virt_dev; +union xhci_trb *cmd_trb;spin_lock_irqsave (&xhci->lock, flags); virt_dev = xhci->devs[udev->slot_id];
@@ -1817,6 +1821,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, }init_completion (cmd_completion); + cmd_trb = xhci->cmd_ring->dequeue;if (!ctx_change) ret =xhci_queue_configure_endpoint (xhci, in_ctx->dma, udev->slot_id, must_succeed);
@@ -1838,14 +1843,17 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,/* Wait for the configure endpoint command to complete */ timeleft =wait_for_completion_interruptible_timeout ( cmd_completion, -USB_CTRL_SET_TIMEOUT ); +XHCI_CMD_DEFAULT_TIMEOUT );if (timeleft <=0 ) {xhci_warn (xhci,"%s while waiting for %s command\n" , timeleft ==0 ?"Timeout" :"Signal" , ctx_change ==0 ?"configure endpoint" :"evaluate context" ); -/* FIXME cancel the configure endpoint command */ +/* cancel the configure endpoint command */ + ret =xhci_cancel_cmd (xhci, command, cmd_trb); +if (ret <0 ) +return ret;return -ETIME ; }
@@ -2778,8 +2786,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)unsigned long flags;int timeleft;int ret; +union xhci_trb *cmd_trb;spin_lock_irqsave (&xhci->lock, flags); + cmd_trb = xhci->cmd_ring->dequeue; ret =xhci_queue_slot_control (xhci,TRB_ENABLE_SLOT ,0 );if (ret) {spin_unlock_irqrestore (&xhci->lock, flags);
@@ -2791,12 +2801,12 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)/* XXX: how much time for xHC slot assignment? */ timeleft =wait_for_completion_interruptible_timeout (&xhci->addr_dev, -USB_CTRL_SET_TIMEOUT ); +XHCI_CMD_DEFAULT_TIMEOUT );if (timeleft <=0 ) {xhci_warn (xhci,"%s while waiting for a slot\n" , timeleft ==0 ?"Timeout" :"Signal" ); -/* FIXME cancel the enable slot request */ -return 0 ; +/* cancel the enable slot request */ +return xhci_cancel_cmd (xhci,NULL , cmd_trb); }if (!xhci->slot_id) {
@@ -2857,6 +2867,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)struct xhci_slot_ctx *slot_ctx;struct xhci_input_control_ctx *ctrl_ctx;u64 temp_64; +union xhci_trb *cmd_trb;if (!udev->slot_id) {xhci_dbg (xhci,"Bad Slot ID %d\n" , udev->slot_id);
@@ -2895,6 +2906,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)xhci_dbg_ctx (xhci, virt_dev->in_ctx,2 );spin_lock_irqsave (&xhci->lock, flags); + cmd_trb = xhci->cmd_ring->dequeue; ret =xhci_queue_address_device (xhci, virt_dev->in_ctx->dma, udev->slot_id);if (ret) {
@@ -2907,7 +2919,7 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)/* ctrl tx can take up to 5 sec; XXX: need more time for xHC? */ timeleft =wait_for_completion_interruptible_timeout (&xhci->addr_dev, -USB_CTRL_SET_TIMEOUT ); +XHCI_CMD_DEFAULT_TIMEOUT );/* FIXME: From section 4.3.4: "Software shall be responsible for timing * the SetAddress() "recovery interval" required by USB and aborting the * command on a timeout.
@@ -2915,7 +2927,10 @@ int xhci_address_device(struct usb_hcd *hcd, struct usb_device *udev)if (timeleft <=0 ) {xhci_warn (xhci,"%s while waiting for a slot\n" , timeleft ==0 ?"Timeout" :"Signal" ); -/* FIXME cancel the address device command */ +/* cancel the address device command */ + ret =xhci_cancel_cmd (xhci,NULL , cmd_trb); +if (ret <0 ) +return ret;return -ETIME ; }
drivers/usb/host/xhci.h +22 -0
@@ -1070,6 +1070,9 @@ union xhci_trb {#define TRB_MFINDEX_WRAP 39/* TRB IDs 40-47 reserved, 48-63 is vendor-defined */ +#define TRB_TYPE_LINK_LE32 (x) (((x) & cpu_to_le32(TRB_TYPE_BITMASK)) == \ + cpu_to_le32(TRB_TYPE(TRB_LINK))) +/* Nec vendor-specific command completion event. */ #define TRB_NEC_CMD_COMP 48/* Get NEC firmware revision. */
@@ -1111,6 +1114,16 @@ struct xhci_td {union xhci_trb *last_trb; }; +/* xHCI command default timeout value */ +#define XHCI_CMD_DEFAULT_TIMEOUT (5 * HZ) + +/* command descriptor */ +struct xhci_cd { +struct list_head cancel_cmd_list; +struct xhci_command *command; +union xhci_trb *cmd_trb; +}; +struct xhci_dequeue_state {struct xhci_segment *new_deq_seg;union xhci_trb *new_deq_ptr;
@@ -1252,6 +1265,11 @@ struct xhci_hcd {/* data structures */ struct xhci_device_context_array *dcbaa;struct xhci_ring *cmd_ring; +unsigned int cmd_ring_state; +#define CMD_RING_STATE_RUNNING (1 << 0) +#define CMD_RING_STATE_ABORTED (1 << 1) +#define CMD_RING_STATE_STOPPED (1 << 2) +struct list_head cancel_cmd_list;unsigned int cmd_ring_reserved_trbs;struct xhci_ring *event_ring;struct xhci_erst erst;
@@ -1486,6 +1504,8 @@ void xhci_unregister_pci(void);#endif /* xHCI host controller glue */ +int handshake (struct xhci_hcd *xhci,void __iomem *ptr, +u32 mask,u32 done,int usec);void xhci_quiesce (struct xhci_hcd *xhci);int xhci_halt (struct xhci_hcd *xhci);int xhci_reset (struct xhci_hcd *xhci);
@@ -1568,6 +1588,8 @@ void xhci_queue_config_ep_quirk(struct xhci_hcd *xhci, unsigned int slot_id, unsigned int ep_index, struct xhci_dequeue_state *deq_state);void xhci_stop_endpoint_command_watchdog (unsigned long arg); +int xhci_cancel_cmd (struct xhci_hcd *xhci,struct xhci_command *command, +union xhci_trb *cmd_trb);void xhci_ring_ep_doorbell (struct xhci_hcd *xhci,unsigned int slot_id,unsigned int ep_index,unsigned int stream_id);
drivers/usb/serial/option.c +70 -22
151 lines not on this page · raw message
fs/lockd/clntxdr.c +1 -1
@@ -223,7 +223,7 @@ static void encode_nlm_stat(struct xdr_stream *xdr, {__be32 *p; -BUG_ON (be32_to_cpu (stat) >NLM_LCK_DENIED_GRACE_PERIOD ); +WARN_ON_ONCE (be32_to_cpu (stat) >NLM_LCK_DENIED_GRACE_PERIOD ); p =xdr_reserve_space (xdr,4 ); *p = stat; }
fs/lockd/mon.c +1 -3
@@ -40,7 +40,6 @@ struct nsm_args {u32 proc;char *mon_name; -char *nodename; };struct nsm_res {
@@ -94,7 +93,6 @@ static int nsm_mon_unmon(struct nsm_handle *nsm, u32 proc, struct nsm_res *res) .vers = 3, .proc = NLMPROC_NSM_NOTIFY, .mon_name = nsm->sm_mon_name, - .nodename = utsname()->nodename, };struct rpc_message msg = { .rpc_argp = &args,
@@ -431,7 +429,7 @@ static void encode_my_id(struct xdr_stream *xdr, const struct nsm_args *argp) {__be32 *p; -encode_nsm_string (xdr, argp->nodename); +encode_nsm_string (xdr,utsname ()->nodename); p =xdr_reserve_space (xdr,4 +4 +4 ); *p++ =cpu_to_be32 (argp->prog); *p++ =cpu_to_be32 (argp->vers);
fs/lockd/svcproc.c +2 -1
@@ -67,7 +67,8 @@ nlmsvc_retrieve_args(struct svc_rqst *rqstp, struct nlm_args *argp,/* Obtain file pointer. Not used by FREE_ALL call. */ if (filp !=NULL ) { -if ((error =nlm_lookup_file (rqstp, &file, &lock->fh)) !=0 ) + error =cast_status (nlm_lookup_file (rqstp, &file, &lock->fh)); +if (error !=0 ) goto no_locks; *filp = file;
kernel/cgroup.c +1 -2
@@ -1800,9 +1800,8 @@ static int cgroup_task_migrate(struct cgroup *cgrp, struct cgroup *oldcgrp,* trading it for newcg is protected by cgroup_mutex, we're safe to drop * it here; it will be freed under RCU. */ -put_css_set (oldcg); -set_bit (CGRP_RELEASABLE , &oldcgrp->flags); +put_css_set (oldcg);return 0 ; }
kernel/sys.c +7 -5
@@ -1133,15 +1133,16 @@ DECLARE_RWSEM(uts_sem);* Work around broken programs that cannot handle "Linux 3.0". * Instead we map 3.x to 2.6.40+x, so e.g. 3.0 would be 2.6.40 */ -static int override_release (char __user *release,int len) +static int override_release (char __user *release,size_t len) {int ret =0 ; -char buf[65 ];if (current->personality &UNAME26 ) { -char *rest =UTS_RELEASE ; +const char *rest =UTS_RELEASE ; +char buf[65 ] = {0 };int ndots =0 ;unsigned v; +size_t copy;while (*rest) {if (*rest =='.' && ++ndots >=3 )
@@ -1151,8 +1152,9 @@ static int override_release(char __user *release, int len) rest++; } v = ((LINUX_VERSION_CODE >>8 ) &0xff ) +40 ; -snprintf (buf, len,"2.6.%u%s" , v, rest); - ret =copy_to_user (release, buf, len); + copy =clamp_t (size_t, len,1 ,sizeof (buf)); + copy =scnprintf (buf, copy,"2.6.%u%s" , v, rest); + ret =copy_to_user (release, buf, copy +1 ); }return ret; }
net/core/neighbour.c +2 -4
@@ -1313,8 +1313,6 @@ int neigh_resolve_output(struct sk_buff *skb)if (!dst) goto discard; -__skb_pull (skb,skb_network_offset (skb)); -if (!neigh_event_send (neigh, skb)) {int err;struct net_device *dev = neigh->dev;
@@ -1326,6 +1324,7 @@ int neigh_resolve_output(struct sk_buff *skb)neigh_hh_init (neigh, dst, dst->ops->protocol); do { + __skb_pull(skb, skb_network_offset(skb)); seq = read_seqbegin(&neigh->ha_lock); err = dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, NULL, skb->len);
@@ -1358,9 +1357,8 @@ int neigh_connected_output(struct sk_buff *skb)struct net_device *dev = neigh->dev;unsigned int seq; -__skb_pull (skb,skb_network_offset (skb)); - do { + __skb_pull(skb, skb_network_offset(skb)); seq = read_seqbegin(&neigh->ha_lock); err = dev_hard_header(skb, dev, ntohs(skb->protocol), neigh->ha, NULL, skb->len);
net/ipv4/tcp_ipv4.c +4 -3
@@ -651,10 +651,11 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb) arg.csumoffset = offsetof(struct tcphdr , check) /2 ; arg.flags = (sk &&inet_sk (sk)->transparent) ?IP_REPLY_ARG_NOSRCCHECK :0 ;/* When socket is gone, all binding information is lost. -* routing might fail in this case. using iif for oif to -* make sure we can deliver it +* routing might fail in this case. No choice here, if we choose to force +* input interface, we will misroute in case of asymmetric route. */ - arg.bound_dev_if = sk ? sk->sk_bound_dev_if :inet_iif (skb); +if (sk) + arg.bound_dev_if = sk->sk_bound_dev_if; net =dev_net (skb_dst (skb)->dev); ip_send_reply(net->ipv4.tcp_sock, skb, ip_hdr(skb)->saddr,
net/ipv6/tcp_ipv6.c +2 -1
@@ -1060,7 +1060,8 @@ static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,__tcp_v6_send_check (buff, &fl6.saddr, &fl6.daddr); fl6.flowi6_proto =IPPROTO_TCP ; - fl6.flowi6_oif =inet6_iif (skb); +if (ipv6_addr_type (&fl6.daddr) &IPV6_ADDR_LINKLOCAL ) + fl6.flowi6_oif =inet6_iif (skb); fl6.fl6_dport = t1->dest; fl6.fl6_sport = t1->source;security_skb_classify_flow (skb,flowi6_to_flowi (&fl6));
net/rds/send.c +1 -1
@@ -1121,7 +1121,7 @@ rds_send_pong(struct rds_connection *conn, __be16 dport)rds_stats_inc (s_send_pong);if (!test_bit (RDS_LL_SEND_FULL , &conn->c_flags)) -rds_send_xmit (conn); +queue_delayed_work (rds_wq, &conn->c_send_w,0 );rds_message_put (rm);return 0 ;
net/sunrpc/cache.c +2 -2
@@ -1404,11 +1404,11 @@ static ssize_t read_flush(struct file *file, char __user *buf, size_t count, loff_t *ppos, struct cache_detail *cd) { - char tbuf[20]; + char tbuf[22];unsigned long p = *ppos;size_t len; -sprintf (tbuf,"%lu\n" ,convert_to_wallclock (cd->flush_time)); +snprintf (tbuf,sizeof (tbuf),"%lu\n" ,convert_to_wallclock (cd->flush_time)); len =strlen (tbuf);if (p >= len)return 0 ;