]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agopwm: simplify use of devm_ioremap_resource
Julia Lawall [Wed, 14 Aug 2013 09:11:25 +0000 (11:11 +0200)]
pwm: simplify use of devm_ioremap_resource

Remove unneeded error handling on the result of a call to
platform_get_resource when the value is passed to devm_ioremap_resource.

Move the call to platform_get_resource adjacent to the call to
devm_ioremap_resource to make the connection between them more clear.

A simplified version of the semantic patch that makes this change is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression pdev,res,n,e,e1;
expression ret != 0;
identifier l;
@@

- res = platform_get_resource(pdev, IORESOURCE_MEM, n);
  ... when != res
- if (res == NULL) { ... \(goto l;\|return ret;\) }
  ... when != res
+ res = platform_get_resource(pdev, IORESOURCE_MEM, n);
  e = devm_ioremap_resource(e1, res);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
10 years agopwm: renesas-tpu: Add DT support
Laurent Pinchart [Thu, 25 Jul 2013 22:27:41 +0000 (00:27 +0200)]
pwm: renesas-tpu: Add DT support

Specify DT bindings for the TPU PWM controller and add OF support to the
driver.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
10 years agoARM: dts: Use the PWM polarity flags
Laurent Pinchart [Wed, 17 Jul 2013 22:54:24 +0000 (00:54 +0200)]
ARM: dts: Use the PWM polarity flags

Replace the numerical polarity flags with the PWM_POLARITY_INVERTED
symbolic constant.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
10 years agopwm: Update DT bindings to reference pwm.txt for cells documentation
Laurent Pinchart [Wed, 17 Jul 2013 22:54:23 +0000 (00:54 +0200)]
pwm: Update DT bindings to reference pwm.txt for cells documentation

The PWM client cells format is documented in the generic pwm.txt
documentation and duplicated in all PWM driver bindings. Remove
duplicate information and reference pwm.txt instead.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
10 years agopwm: Use the DT macro directly when parsing PWM DT flags
Laurent Pinchart [Wed, 17 Jul 2013 22:54:22 +0000 (00:54 +0200)]
pwm: Use the DT macro directly when parsing PWM DT flags

Don't redefine a PWM_SPEC_POLARITY macro with a value identical to
PWM_POLARITY_INVERTED, use the PWM DT macro directly.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
10 years agopwm: Add PWM polarity flag macro for DT
Laurent Pinchart [Wed, 17 Jul 2013 22:54:21 +0000 (00:54 +0200)]
pwm: Add PWM polarity flag macro for DT

Define a PWM_POLARITY_INVERTED macro in include/dt-bindings/pwm/pwm.h to
be used by device tree sources.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
10 years agopwm: mxs: Check the return value from stmp_reset_block()
Fabio Estevam [Wed, 10 Jul 2013 02:25:37 +0000 (23:25 -0300)]
pwm: mxs: Check the return value from stmp_reset_block()

stmp_reset_block() may fail, so let's check its return value and
propagate it in the case of error.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
10 years agoMerge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
Ingo Molnar [Tue, 3 Sep 2013 05:46:19 +0000 (07:46 +0200)]
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

 * 'perf trace' arg formatting improvements to allow masking arguments
   in syscalls such as futex and open, where the some arguments are
   ignored and thus should not be printed depending on other args.

 * Beautify futex open, openat, open_by_handle_at, lseek and futex syscalls.

 * Add dummy software event to use when wanting just to keep receiving
   PERF_RECORD_{MMAP,COMM,etc}, add test for it, from Adrian Hunter.

 * Fix symbol offset computation for some dsos in 'perf script', from David Ahern.

 * Skip unsupported hardware events in 'perf list', from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoMerge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck...
Ingo Molnar [Tue, 3 Sep 2013 05:41:11 +0000 (07:41 +0200)]
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu

Pull RCU updates from Paul E. McKenney:

"
 * Update RCU documentation.  These were posted to LKML at
   https://lkml.org/lkml/2013/8/19/611.

 * Miscellaneous fixes.  These were posted to LKML at
   https://lkml.org/lkml/2013/8/19/619.

 * Full-system idle detection.  This is for use by Frederic
   Weisbecker's adaptive-ticks mechanism.  Its purpose is
   to allow the timekeeping CPU to shut off its tick when
   all other CPUs are idle.  These were posted to LKML at
   https://lkml.org/lkml/2013/8/19/648.

 * Improve rcutorture test coverage.  These were posted to LKML at
   https://lkml.org/lkml/2013/8/19/675.
"

Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoLinux 3.11 v3.11
Linus Torvalds [Mon, 2 Sep 2013 20:46:10 +0000 (13:46 -0700)]
Linux 3.11

10 years agoperf trace: Tell arg formatters the arg index
Arnaldo Carvalho de Melo [Mon, 2 Sep 2013 19:40:40 +0000 (16:40 -0300)]
perf trace: Tell arg formatters the arg index

... so that it can mask args relative to its position, like the 'mode' arg
that may or not be printed according to the 'flags' (O_CREAT) value.

 [root@zoo ~]# perf trace -a -e openat,open_by_handle_at | head -1
    469.754 ( 0.034 ms): 1183 openat(dfd: -100, filename: 0x7fbde40014b0, flags: CLOEXEC|DIRECTORY|NONBLOCK) = 23
 [root@zoo ~]#

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-bgokqpkufd4sio7ixxknf1ux@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoperf trace: Add beautifier for open's flags arg
Arnaldo Carvalho de Melo [Mon, 2 Sep 2013 19:22:31 +0000 (16:22 -0300)]
perf trace: Add beautifier for open's flags arg

Suppressing the mode when O_CREAT not present, needs improvements on the
arg masking mechanism to be reused in openat, open_by_handle_at,
mq_open:

[root@zoo ~]# perf trace -a -e open | grep -v 'flags: RDONLY' | head -5
   147.541 ( 0.028 ms): 1188 open(filename: 0x33c17782fb, flags: CLOEXEC   ) = 23
   229.898 ( 0.020 ms): 2071 open(filename: 0x3d93c80, flags: NOATIME      ) = -1 EPERM Operation not permitted

[root@zoo ~]# perf trace -a -e open | grep CREAT
  1406.697 ( 0.024 ms): 616 open(filename: 0x7fffc3a0f910, flags: CREAT|TRUNC|WRONLY, mode: 438 ) = -1 ENOENT No such file or directory
  2032.770 ( 0.804 ms): 4354 open(filename: 0x7f33ac814368, flags: CREAT|EXCL|RDWR, mode: 384   ) = 115
^C[root@zoo ~]#

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-c7vm6klaf995qw1vqdih5t7q@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agolockref: implement lockless reference count updates using cmpxchg()
Linus Torvalds [Mon, 2 Sep 2013 19:12:15 +0000 (12:12 -0700)]
lockref: implement lockless reference count updates using cmpxchg()

Instead of taking the spinlock, the lockless versions atomically check
that the lock is not taken, and do the reference count update using a
cmpxchg() loop.  This is semantically identical to doing the reference
count update protected by the lock, but avoids the "wait for lock"
contention that you get when accesses to the reference count are
contended.

Note that a "lockref" is absolutely _not_ equivalent to an atomic_t.
Even when the lockref reference counts are updated atomically with
cmpxchg, the fact that they also verify the state of the spinlock means
that the lockless updates can never happen while somebody else holds the
spinlock.

So while "lockref_put_or_lock()" looks a lot like just another name for
"atomic_dec_and_lock()", and both optimize to lockless updates, they are
fundamentally different: the decrement done by atomic_dec_and_lock() is
truly independent of any lock (as long as it doesn't decrement to zero),
so a locked region can still see the count change.

The lockref structure, in contrast, really is a *locked* reference
count.  If you hold the spinlock, the reference count will be stable and
you can modify the reference count without using atomics, because even
the lockless updates will see and respect the state of the lock.

In order to enable the cmpxchg lockless code, the architecture needs to
do three things:

 (1) Make sure that the "arch_spinlock_t" and an "unsigned int" can fit
     in an aligned u64, and have a "cmpxchg()" implementation that works
     on such a u64 data type.

 (2) define a helper function to test for a spinlock being unlocked
     ("arch_spin_value_unlocked()")

 (3) select the "ARCH_USE_CMPXCHG_LOCKREF" config variable in its
     Kconfig file.

This enables it for x86-64 (but not 32-bit, we'd need to make sure
cmpxchg() turns into the proper cmpxchg8b in order to enable it for
32-bit mode).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agolockref: uninline lockref helper functions
Linus Torvalds [Mon, 2 Sep 2013 18:58:20 +0000 (11:58 -0700)]
lockref: uninline lockref helper functions

They aren't very good to inline, since they already call external
functions (the spinlock code), and we're going to create rather more
complicated versions of them that can do the reference count updates
locklessly.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agovfs: reimplement d_rcu_to_refcount() using lockref_get_or_lock()
Linus Torvalds [Mon, 2 Sep 2013 18:38:06 +0000 (11:38 -0700)]
vfs: reimplement d_rcu_to_refcount() using lockref_get_or_lock()

This moves __d_rcu_to_refcount() from <linux/dcache.h> into fs/namei.c
and re-implements it using the lockref infrastructure instead.  It also
adds a lot of comments about what is actually going on, because turning
a dentry that was looked up using RCU into a long-lived reference
counted entry is one of the more subtle parts of the rcu walk.

We also used to be _particularly_ subtle in unlazy_walk() where we
re-validate both the dentry and its parent using the same sequence
count.  We used to do it by nesting the locks and then verifying the
sequence count just once.

That was silly, because nested locking is expensive, but the sequence
count check is not.  So this just re-validates the dentry and the parent
separately, avoiding the nested locking, and making the lockref lookup
possible.

Acked-by: Waiman Long <waiman.long@hp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoperf trace: Add beautifier for lseek's whence arg
Arnaldo Carvalho de Melo [Mon, 2 Sep 2013 18:37:32 +0000 (15:37 -0300)]
perf trace: Add beautifier for lseek's whence arg

 [root@zoo ~]# perf trace -a -e lseek | head -1
    546.922 ( 0.004 ms): 1184 lseek(fd: 26, offset: 0, whence: CUR) = 2
 [root@zoo ~]#

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-2eiuhwz9jbnhj80q6jaqeji4@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agovfs: use lockref_get_not_zero() for optimistic lockless dget_parent()
Waiman Long [Mon, 2 Sep 2013 18:29:22 +0000 (11:29 -0700)]
vfs: use lockref_get_not_zero() for optimistic lockless dget_parent()

A valid parent pointer is always going to have a non-zero reference
count, but if we look up the parent optimistically without locking, we
have to protect against the (very unlikely) race against renaming
changing the parent from under us.

We do that by using lockref_get_not_zero(), and then re-checking the
parent pointer after getting a valid reference.

[ This is a re-implementation of a chunk from the original patch by
  Waiman Long: "dcache: Enable lockless update of dentry's refcount".
  I've completely rewritten the patch-series and split it up, but I'm
  attributing this part to Waiman as it's close enough to his earlier
  patch  - Linus ]

Signed-off-by: Waiman Long <Waiman.Long@hp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agolockref: add 'lockref_get_or_lock() helper
Linus Torvalds [Mon, 2 Sep 2013 18:14:19 +0000 (11:14 -0700)]
lockref: add 'lockref_get_or_lock() helper

This behaves like "lockref_get_not_zero()", but instead of doing nothing
if the count was zero, it returns with the lock held.

This allows callers to revalidate the lockref-protected data structure
if required even if the count was zero to begin with, and possibly
increment the count if it passes muster.

In particular, the dentry code wants this when it wants to turn an
RCU-protected dentry into a stable refcounted one: if the dentry count
it zero, but the sequence number still validates the dentry, we can take
a reference to it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
10 years agoperf tools: Fix symbol offset computation for some dsos
David Ahern [Sun, 28 Jul 2013 15:48:32 +0000 (09:48 -0600)]
perf tools: Fix symbol offset computation for some dsos

For some dsos (e.g., libc, libpthread, kernel modules) the symbol offset
is huge. e.g.,

qemu-kvm 17238/17242 [007] 762235.640311:
    ffffffff816288a1 __schedule+0x451 ([kernel.kallsyms])
    ffffffff81629609 schedule+0x29 ([kernel.kallsyms])
    ffffffffa00a6ded kvm_vcpu_block+0xffffffffa00a106d (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00bae6b kvm_arch_vcpu_ioctl_run+0xffffffffa00a118b (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00a4d7a kvm_vcpu_ioctl+0xffffffffa00a141a (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffff811a7bdb do_vfs_ioctl+0x8b ([kernel.kallsyms])
    ffffffff811a80c1 sys_ioctl+0x91 ([kernel.kallsyms])
    ffffffff81633182 system_call+0x72 ([kernel.kallsyms])
        7f882a97af27 __GI___ioctl+0x7f882a891007 (/lib64/libc-2.14.90.so)
           100000002 [unknown] ([unknown])

It seems to be maps with a non-0 start. Taking that into account the
offsets are correct:

qemu-kvm 17238/17242 [007] 762235.640311:
    ffffffff816288a1 __schedule+0x451 ([kernel.kallsyms])
    ffffffff81629609 schedule+0x29 ([kernel.kallsyms])
    ffffffffa00a6ded kvm_vcpu_block+0x6d (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00bae6b kvm_arch_vcpu_ioctl_run+0x18b (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00a4d7a kvm_vcpu_ioctl+0x41a (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffff811a7bdb do_vfs_ioctl+0x8b ([kernel.kallsyms])
    ffffffff811a80c1 sys_ioctl+0x91 ([kernel.kallsyms])
    ffffffff81633182 system_call+0x72 ([kernel.kallsyms])
        7f882a97af27 __GI___ioctl+0x7 (/lib64/libc-2.14.90.so)
           100000002 [unknown] ([unknown])

Signed-off-by: David Ahern <dsahern@gmail.com>
Link: http://lkml.kernel.org/r/1375026512-45826-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoperf list: Skip unsupported events
Namhyung Kim [Tue, 27 Aug 2013 02:41:53 +0000 (11:41 +0900)]
perf list: Skip unsupported events

Some hardware events might not be supported on a system.  Listing those
events seems meaningless and confusing to users.  Let's skip them.

Before:
  $ perf list cache | wc -l
  33

After:
  $ perf list cache | wc -l
  27

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377571313-14722-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoperf tests: Add 'keep tracking' test
Adrian Hunter [Sat, 31 Aug 2013 18:50:53 +0000 (21:50 +0300)]
perf tests: Add 'keep tracking' test

Add a test for the newly added PERF_COUNT_SW_DUMMY event.  The test
checks that tracking events continue when an event is disabled but a
dummy software event is not disabled.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377975053-3811-4-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoperf tools: Add support for PERF_COUNT_SW_DUMMY
Adrian Hunter [Sat, 31 Aug 2013 18:50:52 +0000 (21:50 +0300)]
perf tools: Add support for PERF_COUNT_SW_DUMMY

Add support for the new dummy software event PERF_COUNT_SW_DUMMY.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377975053-3811-3-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoperf: Add a dummy software event to keep tracking
Adrian Hunter [Sat, 31 Aug 2013 18:50:51 +0000 (21:50 +0300)]
perf: Add a dummy software event to keep tracking

When an event is disabled the "tracking" events selected by the 'mmap',
'comm' and 'task' bits of struct perf_event_attr, are also disabled.
However, the information those events provide is necessary to resolve
symbols for when the main event is re-enabled.

The "tracking" events can be kept enabled by putting them on another
event, but that requires an event that otherwise does nothing.  A new
software event PERF_COUNT_SW_DUMMY is added for that purpose.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377975053-3811-2-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoperf trace: Add beautifier for futex 'operation' parm
Arnaldo Carvalho de Melo [Mon, 2 Sep 2013 16:46:44 +0000 (13:46 -0300)]
perf trace: Add beautifier for futex 'operation' parm

That uses the arg mask mechanism just introduced to suppress ignored
arguments according to the futex operation.

Based on an initial patch from David Ahern that showed the need for some
way to allow args to tell how many further args should be shown.

Initial-patch-by: David Ahern <dsahern@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-0k30it46r4hv5eanefbdmj5t@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoperf trace: Allow syscall arg formatters to mask args
Arnaldo Carvalho de Melo [Mon, 2 Sep 2013 13:39:21 +0000 (10:39 -0300)]
perf trace: Allow syscall arg formatters to mask args

The futex syscall ignores some arguments according to the 'operation'
arg, so allow arg formatters to mask those.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-abqrg3oldgfsdnltfrvso9f7@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
10 years agoMerge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Linus Torvalds [Mon, 2 Sep 2013 17:43:13 +0000 (10:43 -0700)]
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fix from James Bottomley:
 "This is a bug fix for the pm80xx driver.  It turns out that when the
  new hardware support was added in 3.10 the IO command size was kept at
  the old hard coded value.  This means that the driver attaches to some
  new cards and then simply hangs the system"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  [SCSI] pm80xx: fix Adaptec 71605H hang

10 years agoMerge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Mon, 2 Sep 2013 16:55:14 +0000 (09:55 -0700)]
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 boot fix from Peter Anvin:
 "A single very small boot fix for very large memory systems (> 0.5T)"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Fix boot crash with DEBUG_PAGE_ALLOC=y and more than 512G RAM

10 years agoMerge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Linus Torvalds [Mon, 2 Sep 2013 16:54:06 +0000 (09:54 -0700)]
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dma fix from Vinod Koul:
 "A fix for resolving TI_EDMA driver's build error in allmodconfig to
  have filter function built in""

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dma/Kconfig: TI_EDMA needs to be boolean

10 years agoperf: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node()
Joe Perches [Thu, 29 Aug 2013 20:59:17 +0000 (13:59 -0700)]
perf: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node()

Use the convenience function instead of __GFP_ZERO.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/f58599ae1a8d7b32d37e9cf283e95fba6452f7f6.1377809875.git.joe@perches.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoperf: Export struct perf_branch_entry to userspace
Vince Weaver [Fri, 23 Aug 2013 19:51:03 +0000 (15:51 -0400)]
perf: Export struct perf_branch_entry to userspace

If PERF_SAMPLE_BRANCH_STACK is enabled then samples are returned
with the format { u64 from, to, flags } but the flags layout
is not specified.

This field has the type struct perf_branch_entry; move this
definition into include/uapi/linux/perf_event.h so users can
access these fields.

This is similar to the existing inclusion of perf_mem_data_src in
the include/uapi/linux/perf_event.h file.

Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
Acked-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/alpine.DEB.2.10.1308231544420.1889@vincent-weaver-1.um.maine.edu
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoperf: Add attr->mmap2 attribute to an event
Stephane Eranian [Wed, 21 Aug 2013 10:10:24 +0000 (12:10 +0200)]
perf: Add attr->mmap2 attribute to an event

Adds a new PERF_RECORD_MMAP2 record type which is essence
an expanded version of PERF_RECORD_MMAP.

Used to request mmap records with more information about
the mapping, including device major, minor and the inode
number and generation for mappings associated with files
or shared memory segments. Works for code and data
(with attr->mmap_data set).

Existing PERF_RECORD_MMAP record is unmodified by this patch.

Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Link: http://lkml.kernel.org/r/1377079825-19057-2-git-send-email-eranian@google.com
[ Added Al to the Cc:. Are the ino, maj/min exports of vma->vm_file OK? ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoperf/x86: Add Silvermont (22nm Atom) support
Yan, Zheng [Thu, 18 Jul 2013 09:02:24 +0000 (17:02 +0800)]
perf/x86: Add Silvermont (22nm Atom) support

Compared to old atom, Silvermont has offcore and has more events
that support PEBS.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1374138144-17278-2-git-send-email-zheng.z.yan@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoperf/x86: use INTEL_UEVENT_EXTRA_REG to define MSR_OFFCORE_RSP_X
Yan, Zheng [Thu, 18 Jul 2013 09:02:23 +0000 (17:02 +0800)]
perf/x86: use INTEL_UEVENT_EXTRA_REG to define MSR_OFFCORE_RSP_X

Silvermont (22nm Atom) has two offcore response configuration MSRs,
unlike other Intel CPU, its event code for MSR_OFFCORE_RSP_1 is 0x02b7.

To avoid complicating intel_fixup_er(), use INTEL_UEVENT_EXTRA_REG to
define MSR_OFFCORE_RSP_X. So intel_fixup_er() can find the event code
for OFFCORE_RSP_N by x86_pmu.extra_regs[N].event.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1374138144-17278-1-git-send-email-zheng.z.yan@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched/fair: Fix the sd_parent_degenerate() code
Peter Zijlstra [Mon, 19 Aug 2013 14:57:04 +0000 (16:57 +0200)]
sched/fair: Fix the sd_parent_degenerate() code

I found that on my WSM box I had a redundant domain:

[    0.949769] CPU0 attaching sched-domain:
[    0.953765]  domain 0: span 0,12 level SIBLING
[    0.958335]   groups: 0 (cpu_power = 587) 12 (cpu_power = 588)
[    0.964548]   domain 1: span 0-5,12-17 level MC
[    0.969206]    groups: 0,12 (cpu_power = 1175) 1,13 (cpu_power = 1176) 2,14 (cpu_power = 1176) 3,15 (cpu_power = 1176) 4,16 (cpu_power = 1176) 5,17 (cpu_power = 1176)
[    0.984993]    domain 2: span 0-5,12-17 level CPU
[    0.989822]     groups: 0-5,12-17 (cpu_power = 7055)
[    0.995049]     domain 3: span 0-23 level NUMA
[    0.999620]      groups: 0-5,12-17 (cpu_power = 7055) 6-11,18-23 (cpu_power = 7056)

Note how domain 2 has only a single group and spans the same CPUs as
domain 1. We should not keep such domains and do in fact have code to
prune these.

It turns out that the 'new' SD_PREFER_SIBLING flag causes this, it
makes sd_parent_degenerate() fail on the CPU domain. We can easily
fix this by 'ignoring' the SD_PREFER_SIBLING bit and transfering it
to whatever domain ends up covering the span.

With this patch the domains now look like this:

[    0.950419] CPU0 attaching sched-domain:
[    0.954454]  domain 0: span 0,12 level SIBLING
[    0.959039]   groups: 0 (cpu_power = 587) 12 (cpu_power = 588)
[    0.965271]   domain 1: span 0-5,12-17 level MC
[    0.969936]    groups: 0,12 (cpu_power = 1175) 1,13 (cpu_power = 1176) 2,14 (cpu_power = 1176) 3,15 (cpu_power = 1176) 4,16 (cpu_power = 1176) 5,17 (cpu_power = 1176)
[    0.985737]    domain 2: span 0-23 level NUMA
[    0.990231]     groups: 0-5,12-17 (cpu_power = 7055) 6-11,18-23 (cpu_power = 7056)

Reviewed-by: Paul Turner <pjt@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-ys201g4jwukj0h8xcamakxq1@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched/fair: Rework and comment the group_imb code
Peter Zijlstra [Thu, 15 Aug 2013 18:29:29 +0000 (20:29 +0200)]
sched/fair: Rework and comment the group_imb code

Rik reported some weirdness due to the group_imb code. As a start to
looking at it, clean it up a little and add a few explanatory
comments.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-caeeqttnla4wrrmhp5uf89gp@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched/fair: Optimize find_busiest_queue()
Peter Zijlstra [Mon, 19 Aug 2013 13:20:21 +0000 (15:20 +0200)]
sched/fair: Optimize find_busiest_queue()

Use for_each_cpu_and() and thereby avoid computing the capacity for
CPUs we know we're not interested in.

Reviewed-by: Paul Turner <pjt@google.com>
Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-lppceyv6kb3a19g8spmrn20b@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched/fair: Make group power more consistent
Peter Zijlstra [Thu, 15 Aug 2013 18:37:48 +0000 (20:37 +0200)]
sched/fair: Make group power more consistent

For easier access, less dereferences and more consistent value, store
the group power in update_sg_lb_stats() and use it thereafter. The
actual value in sched_group::sched_group_power::power can change
throughout the load-balance pass if we're unlucky.

Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-739xxqkyvftrhnh9ncudutc7@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched/fair: Remove duplicate load_per_task computations
Peter Zijlstra [Thu, 15 Aug 2013 17:47:56 +0000 (19:47 +0200)]
sched/fair: Remove duplicate load_per_task computations

Since we already compute (but don't store) the sgs load_per_task value
in update_sg_lb_stats() we might as well store it and not re-compute
it later on.

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-ym1vmljiwbzgdnnrwp9azftq@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched/fair: Shrink sg_lb_stats and play memset games
Peter Zijlstra [Mon, 19 Aug 2013 13:22:57 +0000 (15:22 +0200)]
sched/fair: Shrink sg_lb_stats and play memset games

We can shrink sg_lb_stats because rq::nr_running is an unsigned int
and cpu numbers are 'int'

Before:
  sgs:        /* size: 72, cachelines: 2, members: 10 */
  sds:        /* size: 184, cachelines: 3, members: 7 */

After:
  sgs:        /* size: 56, cachelines: 1, members: 10 */
  sds:        /* size: 152, cachelines: 3, members: 7 */

Further we can avoid clearing all of sds since we do a total
clear/assignment of sg_stats in update_sg_lb_stats() with exception of
busiest_stat.avg_load which is referenced in update_sd_pick_busiest().

Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-0klzmz9okll8wc0nsudguc9p@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched: Clean-up struct sd_lb_stat
Joonsoo Kim [Tue, 6 Aug 2013 08:36:43 +0000 (17:36 +0900)]
sched: Clean-up struct sd_lb_stat

There is no reason to maintain separate variables for this_group
and busiest_group in sd_lb_stat, except saving some space.
But this structure is always allocated in stack, so this saving
isn't really benificial [peterz: reducing stack space is good; in this
case readability increases enough that I think its still beneficial]

This patch unify these variables, so IMO, readability may be improved.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
[ Rename this to local -- avoids confusion between this_cpu and the C++ this pointer. ]
Reviewed-by: Paul Turner <pjt@google.com>
[ Lots of style edits, a few fixes and a rename. ]
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1375778203-31343-4-git-send-email-iamjoonsoo.kim@lge.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched: Factor out code to should_we_balance()
Joonsoo Kim [Tue, 6 Aug 2013 08:36:42 +0000 (17:36 +0900)]
sched: Factor out code to should_we_balance()

Now checking whether this cpu is appropriate to balance or not
is embedded into update_sg_lb_stats() and this checking has no direct
relationship to this function. There is not enough reason to place
this checking at update_sg_lb_stats(), except saving one iteration
for sched_group_cpus.

In this patch, I factor out this checking to should_we_balance() function.
And before doing actual work for load_balancing, check whether this cpu is
appropriate to balance via should_we_balance(). If this cpu is not
a candidate for balancing, it quit the work immediately.

With this change, we can save two memset cost and can expect better
compiler optimization.

Below is result of this patch.

 * Vanilla *
   text    data     bss     dec     hex filename
  34499    1136     116   35751    8ba7 kernel/sched/fair.o

 * Patched *
   text    data     bss     dec     hex filename
  34243    1136     116   35495    8aa7 kernel/sched/fair.o

In addition, rename @balance to @continue_balancing in order to represent
its purpose more clearly.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
[ s/should_balance/continue_balancing/g ]
Reviewed-by: Paul Turner <pjt@google.com>
[ Made style changes and a fix in should_we_balance(). ]
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1375778203-31343-3-git-send-email-iamjoonsoo.kim@lge.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agosched: Remove one division operation in find_busiest_queue()
Joonsoo Kim [Tue, 6 Aug 2013 08:36:41 +0000 (17:36 +0900)]
sched: Remove one division operation in find_busiest_queue()

Remove one division operation in find_busiest_queue() by using
crosswise multiplication:

wl_i / power_i > wl_j / power_j :=
wl_i * power_j > wl_j * power_i

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
[ Expanded the changelog. ]
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1375778203-31343-2-git-send-email-iamjoonsoo.kim@lge.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoperf: Prevent race in unthrottling code
Jiri Olsa [Sat, 24 Aug 2013 14:45:54 +0000 (16:45 +0200)]
perf: Prevent race in unthrottling code

The current throttling code triggers WARN below via following
workload (only hit on AMD machine with 48 CPUs):

  # while [ 1 ]; do perf record perf bench sched messaging; done

  WARNING: at arch/x86/kernel/cpu/perf_event.c:1054 x86_pmu_start+0xc6/0x100()
  SNIP
  Call Trace:
   <IRQ>  [<ffffffff815f62d6>] dump_stack+0x19/0x1b
   [<ffffffff8105f531>] warn_slowpath_common+0x61/0x80
   [<ffffffff8105f60a>] warn_slowpath_null+0x1a/0x20
   [<ffffffff810213a6>] x86_pmu_start+0xc6/0x100
   [<ffffffff81129dd2>] perf_adjust_freq_unthr_context.part.75+0x182/0x1a0
   [<ffffffff8112a058>] perf_event_task_tick+0xc8/0xf0
   [<ffffffff81093221>] scheduler_tick+0xd1/0x140
   [<ffffffff81070176>] update_process_times+0x66/0x80
   [<ffffffff810b9565>] tick_sched_handle.isra.15+0x25/0x60
   [<ffffffff810b95e1>] tick_sched_timer+0x41/0x60
   [<ffffffff81087c24>] __run_hrtimer+0x74/0x1d0
   [<ffffffff810b95a0>] ? tick_sched_handle.isra.15+0x60/0x60
   [<ffffffff81088407>] hrtimer_interrupt+0xf7/0x240
   [<ffffffff81606829>] smp_apic_timer_interrupt+0x69/0x9c
   [<ffffffff8160569d>] apic_timer_interrupt+0x6d/0x80
   <EOI>  [<ffffffff81129f74>] ? __perf_event_task_sched_in+0x184/0x1a0
   [<ffffffff814dd937>] ? kfree_skbmem+0x37/0x90
   [<ffffffff815f2c47>] ? __slab_free+0x1ac/0x30f
   [<ffffffff8118143d>] ? kfree+0xfd/0x130
   [<ffffffff81181622>] kmem_cache_free+0x1b2/0x1d0
   [<ffffffff814dd937>] kfree_skbmem+0x37/0x90
   [<ffffffff814e03c4>] consume_skb+0x34/0x80
   [<ffffffff8158b057>] unix_stream_recvmsg+0x4e7/0x820
   [<ffffffff814d5546>] sock_aio_read.part.7+0x116/0x130
   [<ffffffff8112c10c>] ? __perf_sw_event+0x19c/0x1e0
   [<ffffffff814d5581>] sock_aio_read+0x21/0x30
   [<ffffffff8119a5d0>] do_sync_read+0x80/0xb0
   [<ffffffff8119ac85>] vfs_read+0x145/0x170
   [<ffffffff8119b699>] SyS_read+0x49/0xa0
   [<ffffffff810df516>] ? __audit_syscall_exit+0x1f6/0x2a0
   [<ffffffff81604a19>] system_call_fastpath+0x16/0x1b
  ---[ end trace 622b7e226c4a766a ]---

The reason is a race in perf_event_task_tick() throttling code.
The race flow (simplified code):

  - perf_throttled_count is per cpu variable and is
    CPU throttling flag, here starting with 0

  - perf_throttled_seq is sequence/domain for allowed
    count of interrupts within the tick, gets increased
    each tick

    on single CPU (CPU bounded event):

      ... workload

    perf_event_task_tick:
    |
    | T0    inc(perf_throttled_seq)
    | T1    needs_unthr = xchg(perf_throttled_count, 0) == 0
     tick gets interrupted:

            ... event gets throttled under new seq ...

      T2    last NMI comes, event is throttled - inc(perf_throttled_count)

     back to tick:
    | perf_adjust_freq_unthr_context:
    |
    | T3    unthrottling is skiped for event (needs_unthr == 0)
    | T4    event is stop and started via freq adjustment
    |
    tick ends

      ... workload
      ... no sample is hit for event ...

    perf_event_task_tick:
    |
    | T5    needs_unthr = xchg(perf_throttled_count, 0) != 0 (from T2)
    | T6    unthrottling is done on event (interrupts == MAX_INTERRUPTS)
    |       event is already started (from T4) -> WARN

Fixing this by not checking needs_unthr again and thus
check all events for unthrottling.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Reported-by: Jan Stancek <jstancek@redhat.com>
Suggested-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1377355554-8934-1-git-send-email-jolsa@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
10 years agoMerge remote-tracking branch 'regulator/topic/tps65912' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:23 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:22 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/ti-abb' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/sec' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:21 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/sec' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/ramp' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:20 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/ramp' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/pfuze100' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:18 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/pfuze100' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/palmas' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/optional' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:17 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/optional' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:16 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/lp8755' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:14 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/lp8755' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/lp872x' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:13 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/lp872x' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/linear-range' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:12 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/linear-range' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/kconfig' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:11 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/kconfig' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/helpers' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:09 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/helpers' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/fan53555' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:08 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/fan53555' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/da9063' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:07 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/da9063' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/core' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:06 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/core' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/as3711' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:05 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/as3711' into regulator-next

10 years agoMerge remote-tracking branch 'regulator/topic/88pm800' into regulator-next
Mark Brown [Sun, 1 Sep 2013 12:50:04 +0000 (13:50 +0100)]
Merge remote-tracking branch 'regulator/topic/88pm800' into regulator-next

10 years agoMerge remote-tracking branch 'spi/topic/txx9' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:18 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/txx9' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/topcliff' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:17 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/topcliff' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/tle62x0' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:15 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/tle62x0' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/tel62x0' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:14 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/tel62x0' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/tegra' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:13 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/tegra' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/sirf' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:12 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/sirf' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/sh-msiof' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:11 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/sh-hspi' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:10 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/sh-hspi' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/s3c64xx' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:09 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/s3c64xx' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/rspi' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:08 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/rspi' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/quad' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:07 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/quad' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/qspi' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:06 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/qspi' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/pxa' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:05 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/pxa' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/pl022' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:04 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/pl022' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/pdata' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:03 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/pdata' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/orion' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:02 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/orion' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/omap-100k' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:01 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/omap-100k' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/octeon' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:49:00 +0000 (13:49 +0100)]
Merge remote-tracking branch 'spi/topic/octeon' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/nuc900' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:59 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/nuc900' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/mxs' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:59 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/mxs' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/msglen' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:58 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/msglen' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/mpc512x' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:57 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/mpc512x' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/ioremap' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:56 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/ioremap' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/imx' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:55 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/imx' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/ep93xx' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:54 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/ep93xx' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/efm32' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:53 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/efm32' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/dspi' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:52 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/dspi' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/doc' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:51 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/doc' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/davinci' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:51 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/davinci' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/core' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:50 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/core' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/clps711x' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:49 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/clps711x' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/checks' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:48 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/checks' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/build' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:47 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/build' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/bpw' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:46 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/bpw' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/blackfin-v3' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:45 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/blackfin-v3' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/bitbang' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:44 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/bitbang' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/bcm2835' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:44 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/bcm2835' into spi-next

10 years agoMerge remote-tracking branch 'spi/topic/atmel' into spi-next
Mark Brown [Sun, 1 Sep 2013 12:48:43 +0000 (13:48 +0100)]
Merge remote-tracking branch 'spi/topic/atmel' into spi-next

10 years agospi/qspi: fix missing unlock on error in ti_qspi_start_transfer_one()
Wei Yongjun [Sun, 1 Sep 2013 01:01:00 +0000 (09:01 +0800)]
spi/qspi: fix missing unlock on error in ti_qspi_start_transfer_one()

Add the missing unlock before return from function ti_qspi_start_transfer_one()
in the error handling case.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Mark Brown <broonie@linaro.org>