]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 16 May 2014 01:31:29 +0000 (11:31 +1000)]
Merge remote-tracking branch 'thermal/next'

10 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Fri, 16 May 2014 01:29:35 +0000 (11:29 +1000)]
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/mips/loongson/lemote-2f/clock.c

10 years agoMerge remote-tracking branch 'libata/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:28:26 +0000 (11:28 +1000)]
Merge remote-tracking branch 'libata/for-next'

10 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:27:05 +0000 (11:27 +1000)]
Merge remote-tracking branch 'kbuild/for-next'

10 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Fri, 16 May 2014 01:25:20 +0000 (11:25 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'

10 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 16 May 2014 01:24:27 +0000 (11:24 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

10 years agoMerge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:23:29 +0000 (11:23 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'

10 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:21:34 +0000 (11:21 +1000)]
Merge remote-tracking branch 'hid/for-next'

10 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Fri, 16 May 2014 01:17:35 +0000 (11:17 +1000)]
Merge remote-tracking branch 'pci/next'

10 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 16 May 2014 01:07:19 +0000 (11:07 +1000)]
Merge remote-tracking branch 'vfs/for-next'

Conflicts:
fs/cifs/cifsfs.c
fs/f2fs/file.c

10 years agoMerge remote-tracking branch 'file-private-locks/linux-next'
Stephen Rothwell [Fri, 16 May 2014 01:05:58 +0000 (11:05 +1000)]
Merge remote-tracking branch 'file-private-locks/linux-next'

10 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:56:02 +0000 (10:56 +1000)]
Merge remote-tracking branch 'xfs/for-next'

10 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 16 May 2014 00:55:09 +0000 (10:55 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'

10 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Fri, 16 May 2014 00:53:57 +0000 (10:53 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

10 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 16 May 2014 00:52:53 +0000 (10:52 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

10 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 16 May 2014 00:51:12 +0000 (10:51 +1000)]
Merge remote-tracking branch 'logfs/master'

10 years agoMerge remote-tracking branch 'jfs/jfs-next'
Stephen Rothwell [Fri, 16 May 2014 00:50:19 +0000 (10:50 +1000)]
Merge remote-tracking branch 'jfs/jfs-next'

10 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 16 May 2014 00:49:22 +0000 (10:49 +1000)]
Merge remote-tracking branch 'gfs2/master'

10 years agoMerge remote-tracking branch 'fscache/fscache'
Stephen Rothwell [Fri, 16 May 2014 00:49:16 +0000 (10:49 +1000)]
Merge remote-tracking branch 'fscache/fscache'

10 years agoMerge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Fri, 16 May 2014 00:48:23 +0000 (10:48 +1000)]
Merge remote-tracking branch 'f2fs/dev'

10 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Fri, 16 May 2014 00:37:21 +0000 (10:37 +1000)]
Merge remote-tracking branch 'ext4/dev'

10 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Fri, 16 May 2014 00:36:23 +0000 (10:36 +1000)]
Merge remote-tracking branch 'ecryptfs/next'

10 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:35:25 +0000 (10:35 +1000)]
Merge remote-tracking branch 'cifs/for-next'

10 years agoMerge remote-tracking branch 'uml/next'
Stephen Rothwell [Fri, 16 May 2014 00:34:24 +0000 (10:34 +1000)]
Merge remote-tracking branch 'uml/next'

Conflicts:
arch/um/include/asm/Kbuild

10 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Fri, 16 May 2014 00:33:29 +0000 (10:33 +1000)]
Merge remote-tracking branch 'tile/master'

10 years agoMerge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Fri, 16 May 2014 00:32:37 +0000 (10:32 +1000)]
Merge remote-tracking branch 'sparc-next/master'

10 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 16 May 2014 00:31:16 +0000 (10:31 +1000)]
Merge remote-tracking branch 's390/features'

10 years agoMerge remote-tracking branch 'fsl/next'
Stephen Rothwell [Fri, 16 May 2014 00:30:22 +0000 (10:30 +1000)]
Merge remote-tracking branch 'fsl/next'

10 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Fri, 16 May 2014 00:27:36 +0000 (10:27 +1000)]
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/kernel/exceptions-64s.S

10 years agoMerge remote-tracking branch 'parisc-hd/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:26:42 +0000 (10:26 +1000)]
Merge remote-tracking branch 'parisc-hd/for-next'

10 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 16 May 2014 00:24:59 +0000 (10:24 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

10 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:24:04 +0000 (10:24 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

10 years agoMerge remote-tracking branch 'arm64/for-next/core'
Stephen Rothwell [Fri, 16 May 2014 00:23:00 +0000 (10:23 +1000)]
Merge remote-tracking branch 'arm64/for-next/core'

10 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:22:03 +0000 (10:22 +1000)]
Merge remote-tracking branch 'tegra/for-next'

10 years agoMerge remote-tracking branch 'samsung/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:21:10 +0000 (10:21 +1000)]
Merge remote-tracking branch 'samsung/for-next'

10 years agoMerge remote-tracking branch 'renesas/next'
Stephen Rothwell [Fri, 16 May 2014 00:19:55 +0000 (10:19 +1000)]
Merge remote-tracking branch 'renesas/next'

10 years agoMerge remote-tracking branch 'mvebu/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:18:49 +0000 (10:18 +1000)]
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-mvebu/Kconfig

10 years agoMerge remote-tracking branch 'keystone/next'
Stephen Rothwell [Fri, 16 May 2014 00:08:26 +0000 (10:08 +1000)]
Merge remote-tracking branch 'keystone/next'

10 years agoMerge remote-tracking branch 'imx-mxs/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:07:24 +0000 (10:07 +1000)]
Merge remote-tracking branch 'imx-mxs/for-next'

10 years agoMerge remote-tracking branch 'ep93xx/ep93xx-for-next'
Stephen Rothwell [Fri, 16 May 2014 00:07:13 +0000 (10:07 +1000)]
Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

10 years agoMerge remote-tracking branch 'berlin/berlin/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:06:16 +0000 (10:06 +1000)]
Merge remote-tracking branch 'berlin/berlin/for-next'

10 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:05:21 +0000 (10:05 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

10 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Fri, 16 May 2014 00:04:30 +0000 (10:04 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

10 years agoMerge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'
Stephen Rothwell [Fri, 16 May 2014 00:03:35 +0000 (10:03 +1000)]
Merge remote-tracking branch 'arm-kvm-cpuresume/arm-kvm-cpuresume'

10 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:01:30 +0000 (10:01 +1000)]
Merge remote-tracking branch 'arm/for-next'

10 years agoMerge remote-tracking branch 'arc/for-next'
Stephen Rothwell [Fri, 16 May 2014 00:00:39 +0000 (10:00 +1000)]
Merge remote-tracking branch 'arc/for-next'

10 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 15 May 2014 23:49:32 +0000 (09:49 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

10 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:28 +0000 (09:49 +1000)]
Merge remote-tracking branch 'ide/master'

10 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:27 +0000 (09:49 +1000)]
Merge remote-tracking branch 'crypto-current/master'

10 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 15 May 2014 23:49:23 +0000 (09:49 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

10 years agoMerge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Thu, 15 May 2014 23:49:22 +0000 (09:49 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'

10 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Thu, 15 May 2014 23:49:21 +0000 (09:49 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

10 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:20 +0000 (09:49 +1000)]
Merge remote-tracking branch 'wireless/master'

10 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Thu, 15 May 2014 23:49:19 +0000 (09:49 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'

10 years agoMerge remote-tracking branch 'ipsec/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:18 +0000 (09:49 +1000)]
Merge remote-tracking branch 'ipsec/master'

Conflicts:
net/ipv4/ip_vti.c

10 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:15 +0000 (09:49 +1000)]
Merge remote-tracking branch 'net/master'

10 years agoMerge remote-tracking branch 'sparc/master'
Stephen Rothwell [Thu, 15 May 2014 23:49:14 +0000 (09:49 +1000)]
Merge remote-tracking branch 'sparc/master'

10 years agoMerge remote-tracking branch 'powerpc-merge/merge'
Stephen Rothwell [Thu, 15 May 2014 23:49:14 +0000 (09:49 +1000)]
Merge remote-tracking branch 'powerpc-merge/merge'

10 years agoMerge remote-tracking branch 'metag-fixes/fixes'
Stephen Rothwell [Thu, 15 May 2014 23:49:13 +0000 (09:49 +1000)]
Merge remote-tracking branch 'metag-fixes/fixes'

10 years agoMerge remote-tracking branch 'fixes/master'
Stephen Rothwell [Thu, 15 May 2014 23:38:25 +0000 (09:38 +1000)]
Merge remote-tracking branch 'fixes/master'

10 years agoMerge branch 'v3.16-next/dt-samsung' into for-next
Kukjin Kim [Thu, 15 May 2014 22:06:36 +0000 (07:06 +0900)]
Merge branch 'v3.16-next/dt-samsung' into for-next

10 years agoARM: dts: Update DWC3 usb controller to use new phy driver for exynos5250
Vivek Gautam [Thu, 15 May 2014 21:38:15 +0000 (06:38 +0900)]
ARM: dts: Update DWC3 usb controller to use new phy driver for exynos5250

Removing the dt node for older usb3 phy driver from Exynos5250
device tree and updating the dt node for DWC3 controller to
use new phy driver based on generic phy framework.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Enable support for generic USB DRD phy for exynos5250
Vivek Gautam [Thu, 15 May 2014 21:38:10 +0000 (06:38 +0900)]
ARM: dts: Enable support for generic USB DRD phy for exynos5250

Add device tree node for new usbdrd-phy driver, which
is based on generic phy framework.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Enable support for DWC3 controller for exynos5420
Vivek Gautam [Thu, 15 May 2014 21:38:01 +0000 (06:38 +0900)]
ARM: dts: Enable support for DWC3 controller for exynos5420

Add device tree nodes for DWC3 controller present on
Exynos 5420 SoC, to enable support for USB 3.0.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: Enable support for USB 3.0 PHY controller for exynos5420
Vivek Gautam [Thu, 15 May 2014 21:37:03 +0000 (06:37 +0900)]
ARM: dts: Enable support for USB 3.0 PHY controller for exynos5420

Add device tree nodes for USB 3.0 PHY present alongwith
USB 3.0 controller Exynos 5420 SoC. This phy driver is
based on generic phy framework.

Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoMerge branch 'altera_tse'
David S. Miller [Thu, 15 May 2014 20:46:54 +0000 (16:46 -0400)]
Merge branch 'altera_tse'

Vince Bridgers says:

====================
Altera TSE: Fix Sparse errors and misc issues

This is version 2 of a patch series to correct sparse errors, cppcheck
warnings, and workaound a multicast filtering issue in the Altera TSE
Ethernet driver. Multicast filtering is not working as expected, so if
present in the hardware will not be used and promiscuous mode enabled
instead. This workaround will be replaced with a working solution when
completely debugged, integrated and tested.

Version 2 is different from the first submission by breaking out the
workaround as a seperate patch and addressing a few structure instance
declarations by making them const per review comments.

If you find this patch acceptable, please consider this for inclusion into
the Altera TSE driver source code.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
10 years agoAltera TSE: Disable Multicast filtering to workaround problem
Vince Bridgers [Wed, 14 May 2014 19:38:37 +0000 (14:38 -0500)]
Altera TSE: Disable Multicast filtering to workaround problem

This patch disables multicast hash filtering if present in the hardware
and uses promiscuous mode instead until the problem with multicast
filtering has been debugged, integrated and tested.

Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
10 years agoAltera TSE: Fix sparse errors and warnings
Vince Bridgers [Wed, 14 May 2014 19:38:36 +0000 (14:38 -0500)]
Altera TSE: Fix sparse errors and warnings

This patch fixes the many sparse errors and warnings contained in the
initial submission of the Altera Triple Speed Ethernet driver, and a
few minor cppcheck warnings. Changes are tested on ARM and NIOS2
example designs, and compile tested against multiple architectures.
Typical issues addressed were as follows:

altera_tse_ethtool.c:136:19: warning: incorrect type in argument
    1 (different address spaces)
altera_tse_ethtool.c:136:19:    expected void const volatile
    [noderef] <asn:2>*addr
altera_tse_ethtool.c:136:19:    got unsigned int *<noident>
...
altera_sgdma.c:129:31: warning: cast removes address space of
    expression

Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
10 years agoMerge branch 'v3.16-next/soc-exynos' into for-next
Kukjin Kim [Thu, 15 May 2014 20:33:24 +0000 (05:33 +0900)]
Merge branch 'v3.16-next/soc-exynos' into for-next

10 years agoMerge branch 'v3.16-next/dt-samsung' into for-next
Kukjin Kim [Thu, 15 May 2014 20:33:18 +0000 (05:33 +0900)]
Merge branch 'v3.16-next/dt-samsung' into for-next

10 years agoARM: dts: enable hdmi for exynos5800-peach-pi board
Rahul Sharma [Thu, 15 May 2014 20:06:34 +0000 (05:06 +0900)]
ARM: dts: enable hdmi for exynos5800-peach-pi board

Enable hdmi for peach-pi board.

Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
Acked-by: Tomasz Figa<t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable hdmi for exynos5420-peach-pit board
Rahul Sharma [Thu, 15 May 2014 20:23:21 +0000 (05:23 +0900)]
ARM: dts: enable hdmi for exynos5420-peach-pit board

Enable hdmi for exynos5420 based peach-pit board.

Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
Acked-by: Tomasz Figa<t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: change to correct compatible string for exynos5420 hdmi
Rahul Sharma [Thu, 15 May 2014 20:23:16 +0000 (05:23 +0900)]
ARM: dts: change to correct compatible string for exynos5420 hdmi

Replace compatible string for HDMI node in Exynos5420. Since
latest restructring in Drm hdmi driver, it is agreed to use
a seperate compatible string for Exynos5420 HDMI IP siince it
uses APB mapped Phy.

Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: enable hdmi for exynos5250 based snow board
Rahul Sharma [Thu, 15 May 2014 20:22:41 +0000 (05:22 +0900)]
ARM: dts: enable hdmi for exynos5250 based snow board

Enable support for HDMI for exynos5250 based Snow board.

Signed-off-by: Rahul Sharma <Rahul.Sharma@samsung.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: add tps65090 power regulator for exynos5250-snow
Doug Anderson [Thu, 15 May 2014 20:16:14 +0000 (05:16 +0900)]
ARM: dts: add tps65090 power regulator for exynos5250-snow

Added TPS65090 regulator related nodes to Snow board.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: add pinctrl for EC irq of exynos5250-snow
Doug Anderson [Thu, 15 May 2014 20:16:11 +0000 (05:16 +0900)]
ARM: dts: add pinctrl for EC irq of exynos5250-snow

Added pinctrl node for embedded controller (EC) IRQ
on Snow board.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agoARM: dts: add pinctrl for i2c-arbitrator of exynos5250-snow
Doug Anderson [Thu, 15 May 2014 20:16:07 +0000 (05:16 +0900)]
ARM: dts: add pinctrl for i2c-arbitrator of exynos5250-snow

Added i2c-arbitrator pinctrl node to Snow board.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
10 years agortnetlink: wait for unregistering devices in rtnl_link_unregister()
Cong Wang [Mon, 12 May 2014 22:11:20 +0000 (15:11 -0700)]
rtnetlink: wait for unregistering devices in rtnl_link_unregister()

From: Cong Wang <cwang@twopensource.com>

commit 50624c934db18ab90 (net: Delay default_device_exit_batch until no
devices are unregistering) introduced rtnl_lock_unregistering() for
default_device_exit_batch(). Same race could happen we when rmmod a driver
which calls rtnl_link_unregister() as we call dev->destructor without rtnl
lock.

For long term, I think we should clean up the mess of netdev_run_todo()
and net namespce exit code.

Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
10 years agoparisc: Improve LWS-CAS performance
John David Anglin [Sun, 11 May 2014 22:40:50 +0000 (18:40 -0400)]
parisc: Improve LWS-CAS performance

The attached change significantly improves the performance of the LWS-CAS code
in syscall.S.
This allows a number of packages to build (e.g., zeromq3, gtest and libxs)
that previously failed because slow LWS-CAS performance under contention. In
particular, interrupts taken while the lock was taken degraded performance
significantly.

The change does the following:

1) Disables interrupts around the CAS operation, and
2) Changes the loads and stores to use the ordered completer, "o", on
PA 2.0. "o" and "ma" with a zero offset are equivalent. The latter is
accepted on both PA 1.X and 2.0.

The use of ordered loads and stores probably makes no difference on all
existing hardware, but it seemed pedantically correct. In particular, the CAS
operation must complete before LDCW lock is released. As written before, a
processor could reorder the operations.

I don't believe the period interrupts are disabled is long enough to
significantly increase interrupt latency. For example, the TLB insert code is
longer. Worst case is a memory fault in the CAS operation.

Signed-off-by: John David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org # 3.13+
Signed-off-by: Helge Deller <deller@gmx.de>
10 years agoparisc: ratelimit userspace segfault printing
Helge Deller [Mon, 5 May 2014 16:07:12 +0000 (18:07 +0200)]
parisc: ratelimit userspace segfault printing

Ratelimit printing of userspace segfaults and make it runtime
configurable via the /proc/sys/debug/exception-trace variable. This
should resolve syslog from growing way too fast and thus prevents
possible system service attacks.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # 3.13+
10 years agoMerge branch for-3.16/defconfig into for-next
Stephen Warren [Thu, 15 May 2014 18:30:54 +0000 (12:30 -0600)]
Merge branch for-3.16/defconfig into for-next

10 years agoMerge branch for-3.16/dt into for-next
Stephen Warren [Thu, 15 May 2014 18:30:53 +0000 (12:30 -0600)]
Merge branch for-3.16/dt into for-next

10 years agoMerge branch for-3.16/soc into for-next
Stephen Warren [Thu, 15 May 2014 18:30:52 +0000 (12:30 -0600)]
Merge branch for-3.16/soc into for-next

10 years agoARM: tegra: initial add of Colibri T30
Stefan Agner [Wed, 14 May 2014 21:45:58 +0000 (23:45 +0200)]
ARM: tegra: initial add of Colibri T30

This patch adds the device tree to support Toradex Colibri T30, a
computer on module which can be used on different carrier boards.

The module consists of a Tegra 30 SoC, two PMIC, DDR3L RAM, eMMC,
a LM95245 temperature sensor and an AX88772B USB Ethernet
Controller. Furthermore, there is a STMPE811 and SGTL5000 audio
codec which are not yet supported. Anything that is not self
contained on the module is disabled by default.

The device tree for the Evaluation Board includes the modules
device tree and enables the supported pheripherials of the carrier
board (the Evaluation Board supports almost all of them).

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
10 years agomips: dts: Fix missing device_type="memory" property in memory nodes
Leif Lindholm [Thu, 17 Apr 2014 17:42:00 +0000 (18:42 +0100)]
mips: dts: Fix missing device_type="memory" property in memory nodes

A few platforms lack a 'device_type = "memory"' for their memory
nodes, relying on an old ppc quirk in order to discover its memory.
Add the missing data so that all parsing code can find memory nodes
correctly.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Acked-by: John Crispin <blogic@openwrt.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
10 years agoarm: dts: Fix missing device_type="memory" for ste-ccu8540
Leif Lindholm [Thu, 17 Apr 2014 17:41:59 +0000 (18:41 +0100)]
arm: dts: Fix missing device_type="memory" for ste-ccu8540

The current .dts for ste-ccu8540 lacks a 'device_type = "memory"' for
its memory node, relying on an old ppc quirk in order to discover its
memory. Fix the data so that all parsing code can handle it correctly.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
10 years agoof: fix CONFIG_OF=n prototype of of_node_full_name()
Stephen Rothwell [Thu, 15 May 2014 04:44:30 +0000 (14:44 +1000)]
of: fix CONFIG_OF=n prototype of of_node_full_name()

Make the CONFIG_OF=n prototpe of of_node_full_name() mateh the CONFIG_OF=y
version.

Fixes compile warnings like this:

sound/soc/soc-core.c: In function 'soc_check_aux_dev':
sound/soc/soc-core.c:1667:3: warning: passing argument 1 of 'of_node_full_name' discards 'const' qualifier from pointer target type [enabled by default]
   codecname = of_node_full_name(aux_dev->codec_of_node);

when CONFIG_OF is not defined.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
10 years agom68knommu: qspi declutter.
Steven King [Wed, 14 May 2014 17:07:55 +0000 (10:07 -0700)]
m68knommu: qspi declutter.

Move the check for the QSPI config option inside the function body.  If the
option is not enabled, the compiler will optimize away the empty function
body so we can remove the other check for the config option.

Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
10 years agom68knommu: Fix the 5249/525x qspi base address.
Steven King [Wed, 14 May 2014 17:06:46 +0000 (10:06 -0700)]
m68knommu: Fix the 5249/525x qspi base address.

Use the correct base address for the QSPI module on the 5249/525x.

Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
10 years agom68knommu: Add qspi clk for Coldfire SoCs without real clks.
Steven King [Wed, 14 May 2014 17:06:29 +0000 (10:06 -0700)]
m68knommu: Add qspi clk for Coldfire SoCs without real clks.

Since we now have fake clks on devices without real clocks, we need clks
defined for qspi for the qspi driver to work on those devices.

Signed-off-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
10 years agoMerge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel...
Zhang Rui [Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)]
Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next

10 years agothermal: spear: remove unnecessary OOM messages
Jingoo Han [Wed, 7 May 2014 06:05:32 +0000 (15:05 +0900)]
thermal: spear: remove unnecessary OOM messages

The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: exynos: remove unnecessary OOM messages
Jingoo Han [Wed, 7 May 2014 06:04:48 +0000 (15:04 +0900)]
thermal: exynos: remove unnecessary OOM messages

The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: rcar: remove unnecessary OOM messages
Jingoo Han [Wed, 7 May 2014 06:03:25 +0000 (15:03 +0900)]
thermal: rcar: remove unnecessary OOM messages

The site-specific OOM messages are unnecessary, because they
duplicate the MM subsystem generic OOM message.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: armada: Support Armada 380 SoC
Ezequiel Garcia [Tue, 6 May 2014 16:59:51 +0000 (13:59 -0300)]
thermal: armada: Support Armada 380 SoC

Now that a generic infrastructure is in place, it's possible to support
the Armada 380 SoC thermal sensor. This sensor is similar to the one
available in the already supported SoCs, with its specific temperature formula
and specific sensor initialization.

Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: armada: Support Armada 375 SoC
Ezequiel Garcia [Tue, 6 May 2014 16:59:50 +0000 (13:59 -0300)]
thermal: armada: Support Armada 375 SoC

Now that a generic infrastructure is in place, it's possible to support
the new Armada 375 SoC thermal sensor. This sensor is similar to the one
available in the already supported SoCs, with its specific temperature formula
and specific sensor initialization.

In addition, we also add support for the Z1 SoC stepping, which needs
an initialization-quirk to work properly.

Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: armada: Allow to specify an 'inverted readout' sensor
Ezequiel Garcia [Tue, 6 May 2014 16:59:49 +0000 (13:59 -0300)]
thermal: armada: Allow to specify an 'inverted readout' sensor

In order to support inverted-formula thermal sensor readout, this commit
introduces an 'inverted' field in the SoC-specific structure which
allows to specify an inversion of the temperature formula.

Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: armada: Pass the platform_device to init_sensor()
Ezequiel Garcia [Tue, 6 May 2014 16:59:48 +0000 (13:59 -0300)]
thermal: armada: Pass the platform_device to init_sensor()

In order to perform SoC-specific quirks on platforms that need them,
this commit adds a new parameter to the init_sensor() function.
This will be used to support early silicons of the Armada 375 SoC,
to workaround some hardware issues.

Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: armada: Add generic infrastructure to handle the sensor
Ezequiel Garcia [Tue, 6 May 2014 16:59:47 +0000 (13:59 -0300)]
thermal: armada: Add generic infrastructure to handle the sensor

In order to support similar SoC where the sensor value and valid
bit can have different shifts and/or mask, we add such fields to the
per-variant structure, instead of having the values hardcoded.

Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
10 years agothermal: armada: Add infrastructure to support generic formulas
Ezequiel Garcia [Tue, 6 May 2014 16:59:46 +0000 (13:59 -0300)]
thermal: armada: Add infrastructure to support generic formulas

In order to support other similar SoC, with different sensor
coefficients, this commit adds the coeficients to the per-variant
structure, instead of having the formula hardcoded.

Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>