Commit graph

573,810 commits

Author SHA1 Message Date
Mark Brown
b27aafedfd Merge remote-tracking branch 'asoc/topic/doc' into asoc-next 2015-10-26 11:15:57 +09:00
Mark Brown
12e7b4a4f3 Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next 2015-10-26 11:15:56 +09:00
Mark Brown
6439e5c2a7 Merge remote-tracking branch 'asoc/topic/core' into asoc-next 2015-10-26 11:15:55 +09:00
Mark Brown
7c9c29eefa ASoC: Updates for v4.4
A first batch of updates targetted at v4.4.  There are no substantial
 core fixes here, the biggest block of changes is updates to the rcar
 drivers and the addition of a CODEC driver for the AK4613.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJWBF7yAAoJECTWi3JdVIfQ1MEH/jnzSyEVIuG+l8UkMaz6gf4w
 zGsM1KCn//mfPl7yAoOdsnElOLR+Fmf+0jx4pCPQKrjvBGwjwH/IwBR1rwuEeUPY
 7d66efpWOKlTf3qpsF1S7ZIlAZOs0NFvo0jwA1ZY/pc3YEBekyWxbABk/uWAVrM5
 HJJKafI7WeiYrF0l0z2sG7BpsFtr8JKqrOVM+SGaPTNn2k+/lQ1bwTk1liOEUbsv
 oq8NFNrUWPBCwbUNJQxBOvmoXC6Oa6+JBVO3+SsoS0q2FweNpqtZopjmoqHM8CiN
 SkBeFT+wYlSGSnnFgAXXA2+kq74TeP2CvToo6tw+gf4LZXydKIaAdeuT6M9weZA=
 =8h3u
 -----END PGP SIGNATURE-----

Merge tag 'asoc-v4.3-rc2' into asoc-next

ASoC: Updates for v4.4

A first batch of updates targetted at v4.4.  There are no substantial
core fixes here, the biggest block of changes is updates to the rcar
drivers and the addition of a CODEC driver for the AK4613.

# gpg: Signature made Fri 25 Sep 2015 05:37:06 KST using RSA key ID 5D5487D0
# gpg: key CD7BEEBC: no public key for trusted key - skipped
# gpg: key CD7BEEBC marked as ultimately trusted
# gpg: key AF88CD16: no public key for trusted key - skipped
# gpg: key AF88CD16 marked as ultimately trusted
# gpg: key 16005C11: no public key for trusted key - skipped
# gpg: key 16005C11 marked as ultimately trusted
# gpg: key 5621E907: no public key for trusted key - skipped
# gpg: key 5621E907 marked as ultimately trusted
# gpg: key 5C6153AD: no public key for trusted key - skipped
# gpg: key 5C6153AD marked as ultimately trusted
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
2015-10-26 11:15:54 +09:00
Nicolin Chen
739146b614 ASoC: fsl: Use #ifdef instead of #if for CONFIG_PM_SLEEP
Change them to #ifdef as CONFIG_PM_SLEEP might not be defined at all.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2015-10-26 11:08:00 +09:00
Mark Brown
ce247b45a3 Merge branch 'topic/fsl-mega-fast' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl 2015-10-26 11:07:40 +09:00
Olof Johansson
2bf8bda933 Merge tag 'arm/soc/for-4.4/rpi-drivers' of https://github.com/Broadcom/stblinux into next/drivers
This pull request contains the Raspberry Pi firmware driver, for communicating
with the VPU which has exclusive control of some of the peripherals.

Eric adds the actual firmware driver and Alexander fixes the header file which
was missing include guards.

* tag 'arm/soc/for-4.4/rpi-drivers' of https://github.com/Broadcom/stblinux:
  ARM: bcm2835: add mutual inclusion protection
  ARM: bcm2835: Add the Raspberry Pi firmware driver

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:39:22 +09:00
Masahiro Yamada
5f76048695 ARM: dts: uniphier: add I2C aliases for ProXstream2 boards
Add aliases to fix the I2C indexes like the other UniPhier boards.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:34:40 +09:00
Steven Rostedt (Red Hat)
8ca532ad2b tracing: Check all tasks on each CPU when filtering pids
My tests found that if a task is running but not filtered when set_event_pid
is modified, then it can still be traced.

Call on_each_cpu() to check if the current running task should be filtered
and update the per cpu flags of tr->data appropriately.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2015-10-25 21:33:56 -04:00
Steven Rostedt (Red Hat)
3fdaf80f4a tracing: Implement event pid filtering
Add the necessary hooks to use the pids loaded in set_event_pid to filter
all the events enabled in the tracing instance that match the pids listed.

Two probes are added to both sched_switch and sched_wakeup tracepoints to be
called before other probes are called and after the other probes are called.
The first is used to set the necessary flags to let the probes know to test
if they should be traced or not.

The sched_switch pre probe will set the "ignore_pid" flag if neither the
previous or next task has a matching pid.

The sched_switch probe will set the "ignore_pid" flag if the next task
does not match the matching pid.

The pre probe allows for probes tracing sched_switch to be traced if
necessary.

The sched_wakeup pre probe will set the "ignore_pid" flag if neither the
current task nor the wakee task has a matching pid.

The sched_wakeup post probe will set the "ignore_pid" flag if the current
task does not have a matching pid.

Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2015-10-25 21:33:56 -04:00
Steven Rostedt (Red Hat)
4909010788 tracing: Add set_event_pid directory for future use
Create a tracing directory called set_event_pid, which currently has no
function, but will be used to filter all events for the tracing instance or
the pids that are added to the file.

The reason no functionality is added with this commit is that this commit
focuses on the creation and removal of the pids in a safe manner. And tests
can be made against this change to make sure things are correct before
hooking features to the list of pids.

Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2015-10-25 21:33:55 -04:00
Steven Rostedt (Red Hat)
7904b5c498 tracepoint: Give priority to probes of tracepoints
In order to guarantee that a probe will be called before other probes that
are attached to a tracepoint, there needs to be a mechanism to provide
priority of one probe over the others.

Adding a prio field to the struct tracepoint_func, which lets the probes be
sorted by the priority set in the structure. If no priority is specified,
then a priority of 10 is given (this is a macro, and perhaps may be changed
in the future).

Now probes may be added to affect other probes that are attached to a
tracepoint with a guaranteed order.

One use case would be to allow tracing of tracepoints be able to filter by
pid. A special (higher priority probe) may be added to the sched_switch
tracepoint and set the necessary flags of the other tracepoints to notify
them if they should be traced or not. In case a tracepoint is enabled at the
sched_switch tracepoint too, the order of the two are not random.

Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
2015-10-25 21:33:54 -04:00
David S. Miller
f7e1b37ec8 Merge branch 'gianfar-fixes'
Claudiu Manoil says:

====================
gianfar: Misc. fixes and updates

Various fixes for some older issues, including having a
MAINTAINERS entry for this driver.
I'd recommend applying them on top of net, thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:28:23 -07:00
Claudiu Manoil
abb1ed7b79 MAINTAINERS: Add entry for gianfar ethernet driver
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:28:16 -07:00
Claudiu Manoil
1de65a5ea3 gianfar: Fix Rx BSY error handling
The Rx BSY error interrupt indicates that a frame was
received and discarded due to lack of buffers, so it's
a rx ring overflow condition and has nothing to do with
with bad rx packets.  Use the right counter.

BSY conditions happen when the SoC is under performance
stress.  Doing *more* work in stress situations by trying
to schedule NAPI is not a good idea as the stressed system
becomes still more stressed.  The Rx interrupt is already
at work making sure the NAPI is scheduled.
So calling gfar_receive() here does not help.  This issue
was present since day 1.

Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:28:15 -07:00
Claudiu Manoil
15bf176db1 gianfar: Don't enable the Filer w/o the Parser
Under one unusual circumstance it's possible to wrongly set
FILREN without enabling PRSDEP as well in the RCTRL register,
against the hardware specifications.  With the default config
this does not happen because the default Rx offloads (Rx csum
and Rx VLAN) properly enable PRSDEP.  But if anyone disables
all these offloads (via ethtool), we get a wrong configuration
were the Rx flow classification and hashing, and other Filer
based features (e.g. wake-on-filer interrupt) won't work.
This patch fixes the issue.
Also, account for Rx FCB insertion which happens every time
PRSDEP is set.

Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:28:08 -07:00
Claudiu Manoil
5188f7e5a7 gianfar: Remove duplicated argument to bitwise OR
RQFCR_AND is duplicated.
Add missing space as well.

Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:28:06 -07:00
Axel Lin
bc86e53a0a ASoC: rt5645: Sort the order for register bit defines
So we have consistent order for register bit defines.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
2015-10-26 10:27:48 +09:00
Jon Ringle
3ed770f603 net: encx24j600: Fix mask to update LED configuration
This fixes the mask used to update the LED configuration so that it clears
the necessary bits as well as setting the bits according to the mask.
Also reverse the LED configuration to show the Link state + collisions in
LEDA and the Link state + TX/RX events in LEDB.

Signed-off-by: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:23:45 -07:00
David S. Miller
da92bf99dd Merge branch 'mvneta-ethtool-stats'
Russell King says:

====================
mvneta ethtool statistics

Sorry for v3 - I forgot to update the commit message on patch 1 as
requested by Marcin.

This short series adds ethtool statistics reporting to mvneta.  Having
discussed with Andrew on IRC, we decided I'd pick up his patch into my
series.

My change for patch 1 compared to the previous RFC splits out the
reading of the statistics from the hardware into a separate function,
in order to facilitate work going on elsewhere to arrange for the
statistics to be preserved across a suspend/resume cycle.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:20:41 -07:00
Andrew Lunn
e483911f9f net: mvneta: Fix clearing of MIB statistics
The existing function to clear the MIB statatistics was using the
wrong address for the registers. Also, the counters would of been
cleared when the interface was brought up, not during the
probe. Fix both of these.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:20:35 -07:00
Russell King
9b0cdefa4c net: mvneta: add ethtool statistics
Add support for the ethtool statistic interface, returning the full set
of statistics which both Armada 370, 38x and Armada XP can support.

Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:20:33 -07:00
Olof Johansson
3af37f0228 Samsung defconfig udpates for v4.4
- exynos_defconfig
   : enable USB Video Class for Peach boards.
   : enable DWC2 USB and USB ethernet gadget
   : enable LEDs (LEGS_GPIO and LEDS_PWM)for Odroid-XU3/XU4
   : enable RTL8152 for Odroid-XU4
   : enable WiFi-Ex as a module instead of build-in
   : disable temporal simplefb support (FB_SIMPLE) because
     exynos DRM driver can support it now
 
 - multi_v7_defconfig
   : enable DWC2 USB and USB ethernet gadget
   : enable RTL8152 for Odroid-XU4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWKqIKAAoJEA0Cl+kVi2xqBtAQAKVk3M9Un8H6kLJvSSjKmlgi
 1GCg2i642DLDKUBt4KKgXoOH6u7EUDciD/budO8QTottuCRJHgDwxgG4I7+1fCb7
 nmvZOCUQExJJct2xmBDl9ZpPihPsnhc4vr0fumh/Zbz+zZcqI1o5jdTHGI4i8z6C
 OIEtK36DYWieflrcRg4Wa1FkguV4J+HfJqUYm8uLFmXcg+zGZo/V3d4MVOSNpHGo
 QV38KoPHRQHmIYggKLKT//jPX7L9QxCYAYlczCxXppmTt3WXhvLzT+Z5ccZIgHb1
 zcodYpU6xuVHUT/W68J9wYxjob32FO970603lW6952JX13ndtzj5dKLKnGwWR8cA
 CEFPvSq9JhkQJ7fDPH/PePTWbaTMO4s8WkxhuKm/peDN9tLg+xUOZLHby95DgI5E
 oO7TTfiZr09x39jiQekQn9/hqW1sYPwaB/qkBkP1uDMynpwqRWRD6hOTfocjFxW+
 iw82lldJc1kqnAIK3PKyfcL/lJ3mBdP4vYbUI9NIt6TsJw7snwj2VD5Vijfwcnt5
 swQejvQcx7IVBVgdSBaLGufahbLWjcI4z+VCpuBqtO9Z6CydoQA/nWgYy0Bf6bqm
 HQ0zZBUocyAvrjYi/XDikvq+mc7o34vPdeE7vq+4MoNc+g4RqFpdBYFe3ZyQIuV+
 DqPvvNfCsQW4d92bKwR8
 =YhpK
 -----END PGP SIGNATURE-----

Merge tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/defconfig

Samsung defconfig udpates for v4.4

- exynos_defconfig
  : enable USB Video Class for Peach boards.
  : enable DWC2 USB and USB ethernet gadget
  : enable LEDs (LEGS_GPIO and LEDS_PWM)for Odroid-XU3/XU4
  : enable RTL8152 for Odroid-XU4
  : enable WiFi-Ex as a module instead of build-in
  : disable temporal simplefb support (FB_SIMPLE) because
    exynos DRM driver can support it now

- multi_v7_defconfig
  : enable DWC2 USB and USB ethernet gadget
  : enable RTL8152 for Odroid-XU4

* tag 'samsung-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: multi_v7_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable rtl8152 ethernet driver for Odroid-XU4
  ARM: exynos_defconfig: Enable WiFi-Ex as a module instead built-in
  ARM: exynos_defconfig: Disable simplefb support
  ARM: exynos_defconfig: Enable LEDS for Odroid-XU3/XU4
  ARM: multi_v7_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable DWC2 USB driver and USB ethernet gadget
  ARM: exynos_defconfig: Enable USB Video Class support

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:19:41 +09:00
Olof Johansson
156746b173 Samsung SoC updates for v4.4
- use PWM lookup table with pwm_add_table() for the following boards
   : s3c24xx h1940 and rx1950
   : s3c64xx smdk6410, crag6410, hmt and smartq
 - document: update bootloader interface on exynos542x
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWKqBPAAoJEA0Cl+kVi2xqNdYP/2+gSZzDvO7u3nsKrnjfzZHC
 aATQ02guR1vCc8gPaEcTZQOENz1RKL1hjvoplzWCqEcjxcv0JWUoEbmSSe8mQMYL
 1j8bBo0acv4qbzyTC1OTIlEreN6eG5jo6eGJ2IX6VW813uB6wZcYeduB/53/BB1V
 /frScMvbmqS8bFvasq3tKo/u01z5BONoKbSeMkqNBZpAlBscRCTo7R231ElkUFRs
 jU2BUBusaPechxtN+Wq0TSvnHZw9ctOk04pIn9Uorkx4Y9NEiBppu75tBR5ub+8s
 IHtWR0ZeW/ceXMeHoMF4KREByv7EnXPOcdrIP60/uizMIGfkmZrX3Anfk2ir0j7u
 pKChXHYR/bw1timnaA9GrCKmQimlp8SX4m3NpRW2tTq13IT9W7drZhvzucNsPjrI
 XabZBbqXIFJ3+BrQXvYj+YiGTTKPlrxqOY4otI4Iu2w23qn5CPvjK5vU4i77pCUs
 tVQAFlrMO5woT7P1cj+cWe3pudbdYsSDm3LYZ+n4G5DpuPPmYVSGFmFXIAGQNeea
 qCLbb71uKU5J6hgwOLMMZEegrmSudQc2Up6zfuMd2KYdBelGVgOVDeDP24lsEcJ1
 zTg0JCVOuAmOaLB3H8HxsjO6cTecUaXdA/bxFhFBFoEKuDHEQ7U7VZFbilfifXLq
 JbakpmwHGZPKI2LuCKCj
 =jIwh
 -----END PGP SIGNATURE-----

Merge tag 'samsung-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc

Samsung SoC updates for v4.4

- use PWM lookup table with pwm_add_table() for the following boards
  : s3c24xx h1940 and rx1950
  : s3c64xx smdk6410, crag6410, hmt and smartq
- document: update bootloader interface on exynos542x

* tag 'samsung-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  Documentation: EXYNOS: Update bootloader interface on exynos542x
  ARM: S3C64XX: Use PWM lookup table for mach-smartq
  ARM: S3C64XX: Use PWM lookup table for mach-hmt
  ARM: S3C64XX: Use PWM lookup table for mach-crag6410
  ARM: S3C64XX: Use PWM lookup table for smdk6410
  ARM: S3C24XX: Use PWM lookup table for mach-rx1950
  ARM: S3C24XX: Use PWM lookup table for mach-h1940

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:18:41 +09:00
Olof Johansson
17e2aa01e4 Samsung arm64 DT update for v4.4
- add BUS1 instance pinctrl support on exynos7 SoC
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWKp+HAAoJEA0Cl+kVi2xqHeEP/2fw46aLdl1lF5g3FLbDSue4
 jVFPHLX3VFr8Jjtfd/gZ5OvFKmjeY1WYSnEJoiH9bfHiewhPzZ84KlpZx79A37Iu
 rtDUwgiWlSaI7e2IhnKE/wS1983GCE8eUKMEwOQZCdIgBpxqK+kSBkOEBLQHuUO3
 IN6Pb3IJjKbckc/Wgk45Hz7YhIHGWpMVqQthZrN/3q2t0mGK/OdWiiwX65WR4tkl
 SLHtgHLcgScnFdKP1/R/T7z3c+Suza1J92/jHg1iZE720U6Cm07Oi4APtu2jDURK
 BWa2tBOh0GpefpMyqTSi12O2rt37uxPs2NlwADjm5CDfO3h9EFXJQZbImED0Fn3K
 783hvXrjxbq/1Z4Mr0KKj1ioKEGI5GDtSKbFpX8y77Zx+s3uT/jZYleCsXLxWL9a
 8LAhMali+85EMwFEpANjjBUPyxsHkGSmCaLs5ztVRWvb1AAvNfOW3NQHK08Ovwtr
 1ltLULjxjXflJFRMGyV5w5mKF4+H6IDAPZCJUQjRcg0W7aprqWaCk2e7beyLxIcv
 vICsQxBotQAlYUoYoOogGRO3dfgqej1rCfbXIu9p3+2yoNEvZan9NU91Gz0OdWlU
 3CQqQd7RFdwkXRka88OvIEBI6Q86p2DpaYAMtZcPj+AIpRQp+w547Nd9Vk+PSBQ+
 LIYXClwU2/VIqvZS6wrr
 =kH8/
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/arm64

Samsung arm64 DT update for v4.4

- add BUS1 instance pinctrl support on exynos7 SoC

* tag 'samsung-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  arm64: dts: Add BUS1 instance pinctrl support for exynos7

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:17:36 +09:00
Olof Johansson
99b6eb55ce Samsung 2nd DT updates for v4.4
- use exynos5420-dw-mshc instead of exynos5250 for exynos3250
 - add DISP1 clocks and the DISP1 power domain of two closk
   on exynos5250 (clock commit got Stephen's ack)
 - add vbus regulators on exynos3250, exynos4210 and exynos4412 boards
 - fix typo in regulator enable GPIO property on s5pv20-aquila and goni
 - document: correct the example of exynos power domain clocks
 - document: consolidate exynos SoC dt-bindings and non-Samsung
   boards related compatibles (FriendlyARM, Google, Hardkernel
   and Insignal)
 - update MAINTAINER entries accordingly (documentation)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJWKp8kAAoJEA0Cl+kVi2xq5fUP/Rf+zO2xnnM+nW31k/6GCQQu
 4BgjBfiK6/coAfQ+mq1PNs3aOFDUmO1g3vwoly64vJbhylCd6jFEzPlbgb109ZnI
 A7JrqoiZ0LE+i/RXjfgxJm/0v1gn7TOOBKkwWlIEJpgV7i8wWjdCnMxlNw+amSGF
 H0pJ14TCN7OfsPZtX1S7dgz/dLSeQzCzMn8cJk4ccPcsN+1LqI4whFQ31ykOYCaT
 5b3/EvORjqkn0gdEiQ/i2WtaM1yKgfNUYXaJP69j605ipzKaUCMt9WnBY9EB6RaJ
 im36eKNQXW73dYGEuuf1I5L58Hb+poAmlz4TtI4re/ykQ1mrvOj1xYwgfD9Sjw+z
 ZS4Io5WMZgdJrmMXFPxnd7BQHu4IbnEfU+408cgOVP/fPrAHxYtO8tVr7/n2lgJ3
 3Hio2MBzAWAXMz45IfhCz2n/ITKBCkfjHFOkno7Rmmm/83cORM6ZleldMqtrj5sQ
 oqGDcBwI0ijKptZIfaLFQfndMmzUd4t5i+UQTjyIDE1nBmvPyqHgPyetHQttQQM+
 bWTCJU+SlKze7CIwogmrrFEfw2RhNU+FS/T9D7t5JCWLb4B5CgLnHt7NWth2cQUQ
 NuiTIgoU+znke+t2A1PxE85CmBr5yuezqxq8bJv8qnGHrF/ougPaNCOdXPef0ci4
 bfK3nV/axFga/7ag900e
 =UPmG
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Samsung 2nd DT updates for v4.4

- use exynos5420-dw-mshc instead of exynos5250 for exynos3250
- add DISP1 clocks and the DISP1 power domain of two closk
  on exynos5250 (clock commit got Stephen's ack)
- add vbus regulators on exynos3250, exynos4210 and exynos4412 boards
- fix typo in regulator enable GPIO property on s5pv20-aquila and goni
- document: correct the example of exynos power domain clocks
- document: consolidate exynos SoC dt-bindings and non-Samsung
  boards related compatibles (FriendlyARM, Google, Hardkernel
  and Insignal)
- update MAINTAINER entries accordingly (documentation)

* tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  MAINTAINERS: Add documentation and dt-bindings for exynos stuff
  dt-bindings: EXYNOS: Document compatibles from other vendors
  dt-bindings: Consolidate Exynos SoC bindings
  ARM: dts: Add clocks to DISP1 domain in exynos5250
  dt-bindings: Correct the example for Exynos power domain clocks
  ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-goni
  ARM: dts: Fix typo in regulator enable GPIO property in s5pv210-aquila
  ARM: dts: Add vbus regulator to USB2 phy nodes on exynos3250, exynos4210 and exynos4412 boards
  clk: samsung: exynos5250: Add DISP1 clocks
  ARM: dts: use exynos5420-dw-mshc compatible for exynos3250

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:13:50 +09:00
David S. Miller
30aa7b18e8 Merge branch 'thunderx-fixes'
David Daney says:

====================
net: thunderx: Support pass-2 revision hardware.

With the availability of a new revision of the ThunderX NIC hardware a
few changes to the driver are required.  With these, the driver works
on all currently available hardware revisions.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:13:37 -07:00
Thanneeru Srinivasulu
34411b68b1 net: thunderx: Incorporate pass2 silicon CPI index configuration changes
Add support for ThunderX pass2 CPI and MPI configuration changes.
MPI_ALG is not enabled i.e MCAM parsing is disabled.

Signed-off-by: Thanneeru Srinivasulu <tsrinivasulu@caviumnetworks.com>
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:13:02 -07:00
David Daney
88ed237720 net: thunderx: Rewrite silicon revision tests.
The test for pass-1 silicon was incorrect, it should be for all
revisions less than 8.  Also the revision is already present in the
pci_dev, so there is no need to read and keep a private copy.

Remove rev_id and code to read it from struct nicpf.  Create new
static inline function pass1_silicon() to be used to testing the
silicon version.  Use pass1_silicon() for revision checks, this will
be more widely used in follow on patches.

Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:13:00 -07:00
Sunil Goutham
4e85777ff0 net: thunderx: Fix incorrect subsystem devid of VF on pass2 silicon
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:12:59 -07:00
Sunil Goutham
f9bf45e08e net: thunderx: Remove PF soft reset.
In some silicon revisions, the soft reset clobbers PCI config space,
so quit doing the reset.

Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-25 18:12:56 -07:00
Chen-Yu Tsai
d787dcdb9c bus: sunxi-rsb: Add driver for Allwinner Reduced Serial Bus
Reduced Serial Bus (RSB) is an Allwinner proprietery interface
used to communicate with PMICs and other peripheral ICs.

RSB is a two-wire push-pull serial bus that supports 1 master
device and up to 15 active slave devices.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:11:58 +09:00
Chen-Yu Tsai
4a5705a9c2 bus: sunxi-rsb: Add Allwinner Reduced Serial Bus (RSB) controller bindings
Reduced Serial Bus is a proprietary 2-line push-pull serial bus supporting
multiple slave devices. It was developed by Allwinner, Inc. and used by
Allwinner and X-Powers, Inc. for their line of PMICs and other peripheral
ICs.

Recent Allwinner SoCs, starting with the A23, have an RSB controller. This
is used to talk to the PMIC, and later with the A80 and A83 platform, the
audio codec IC.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 10:11:55 +09:00
Jason A. Donenfeld
03f136a207 timeconst: Update path in comment
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Cc: hofrat@osadl.org
Link: http://lkml.kernel.org/r/1436894685-5868-1-git-send-email-Jason@zx2c4.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-10-26 10:06:06 +09:00
Olof Johansson
a5ac4a66c6 mvebu soc for 4.4 (part 2)
- Use mac_pton() helper in the oropn5x board instead of duplicating it
 - Add the broken-idle option allowing to boot boards with a mistake in
   the hardware design
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYqU/AACgkQCwYYjhRyO9VP1gCfcJsUQ9UlgCypLYuK7FqQShf6
 vnEAn3QT7pXLmwYNlRFI6EF8y6l5bgH9
 =HKUh
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-4.4-2' of git://git.infradead.org/linux-mvebu into next/soc

mvebu soc for 4.4 (part 2)

- Use mac_pton() helper in the oropn5x board instead of duplicating it
- Add the broken-idle option allowing to boot boards with a mistake in
  the hardware design

* tag 'mvebu-soc-4.4-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add broken-idle option
  ARM: orion5x: use mac_pton() helper

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:58:26 +09:00
Olof Johansson
3eb52a06d5 ARM: tegra: Devicetree changes for v4.4-rc1
Mostly a bunch of updates to the Toradex Apalis and Colibri platforms
 along with a couple of cleanup patches.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWJjUyAAoJEN0jrNd/PrOhSTUP/30KgnjyQI5SvMoj5brg5nHW
 NPAHVYoi8PtjFhf5vMUllgfTbU/nh+Q+AdXT2Hg6Fo9xRcNNquGGj+Ek2pLUg4Gn
 4L14EMDzJX9IR6uxEKSsRdG6W7Gw4hGWtyGVJATXxzA9OF0Ovte09cBZ9wYqhLU5
 y+cio34Jd3C/l91b+ywvrUhaCutAvtlAS+z0zZXEazA/Znjo1iKC0fIOARYOOBpi
 YuGaJ/Zo9AlFnkriD/Bkx6rHPjO8qL56mCVpGcOfalGMq4BIBF1y68R8oJ+zGPHz
 Cn5Gw1kAy5SAUM33yFbyl/pZbrKtWvn+omYQCJmYjRocW8brOr+k+LVXdB/PFCLG
 DI6Lgq/QuIkIwyrISmVD1lRDtDK2vObcsAD3J1No3GvmYtMIqMG2hIjsU7ZzMw0b
 5OtMrpcbgBtk91d+KsFdZv0ARAeg3dpHSvd1655kexBTZoMLgODOHP/pOHdltHTz
 zYK+Hc7XulaRxRiXCJGKYwGcCPL9iLMQdiN4dTCnMVSCysSgzX7KtXSlrTH4MPXr
 ZWZfqw/P4OiUFuwyPPaMq+l/Nr1AK18UJb4E1ZkmnLZ9ruObKHtV3/Y6Kf0ApgLW
 XQLQG/nY3QpIZVP9qKG6Tc+RV/aH3cTXD2Vb2ZG4EC6OVONr4USLERRVkDVXTd5h
 VaDZKW1rpb+WCxL5o3Uh
 =1DQA
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

ARM: tegra: Devicetree changes for v4.4-rc1

Mostly a bunch of updates to the Toradex Apalis and Colibri platforms
along with a couple of cleanup patches.

* tag 'tegra-for-4.4-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (25 commits)
  ARM: tegra: Use consistent indentation for SATA node
  ARM: tegra: colibri-eval: Fix power/wakeup key
  ARM: tegra: colibri-eval: Add comment concerning SD/MMC
  ARM: tegra: colibri-eval: Fix vendor string of M41T0M6 RTC
  ARM: tegra: colibri: Properly align pin names
  ARM: tegra: colibri: Replace eMMC label by comment
  ARM: tegra: colibri: Activate STMPE811 touch controller
  ARM: tegra: colibri: Add touch pen interrupt pin muxing
  ARM: tegra: colibri: Fix comment about 3v3 fixed supply
  ARM: tegra: colibri: Add pin muxing for on-module power I2C
  ARM: tegra: colibri: Improve comment about thermal alert pin
  ARM: tegra: colibri: Fix HDMI supplies
  ARM: tegra: colibri: Update hardware revisions compatibility
  ARM: tegra: apalis-eval: Fix power/wakeup key
  ARM: tegra: apalis-eval: Fix backlight PWM comment
  ARM: tegra: apalis-eval: Set OTG dr_mode
  ARM: tegra: apalis-eval: Enable HDA controller
  ARM: tegra: apalis: Properly align pin names
  ARM: tegra: apalis: Add digital audio pin muxing
  ARM: tegra: apalis: Add comment concerning eMMC
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:53:14 +09:00
Olof Johansson
a83e682ee2 ARM: tegra: Default configuration updates for v4.4-rc1
Enable touchscreen and audio support on Toradex Colibri platforms.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWJj4RAAoJEN0jrNd/PrOhO9YP/Rr5wwioLC1/jjipyUueeU05
 jw70ngx5UpHexK7zeqdbPn+E80iVggqyTRhxav6fwTbcXNHkrVa1tpxy5aLTZyNJ
 GGjWOiHicEhapZZyh10A3/r9SL5vKaIjXGlKxFwEiraT1eEeO/H4yTSSBPGeMVEz
 ZfKNypWBpJmkzWaPMjcWeaCQyxuhQDwpwVbURnVVWN3ONik6OgTnr6clOQww2sVp
 rwNw+Cz57gSJU9+udtH5b34ugg24tgblLYoh6JYPZomkc8nhGgaLFCBXsC1cdwwJ
 fV/NvW/qlw2JU4tv7O7L2amO/n0CmcS6iZFqhRykj5wA0oOyHYJp1fsiV9tdmk2p
 ywn4wVwRhnHXnYwmydtylmW2AZSrncHK1KcuI5ZAOq6/C7KK/mJJJ6ROMNJr8jz2
 72YFOuRBw2zSNKKfNGa/97vJvk8kWdOzkz7P0SXj6F9CrgVGtTSUHMBhTJbQFyX0
 LqHEyFmnVmCzGRyEQbZwGsxQs23kekG+qKeWRCS+0c3PJn5G01XcK/n0ZWgwraiz
 cM1U5TmebRuZSKHybZfy1/WqAO7MOUJ+4knTPZcdERaxc3SClFnBRHXNOzaTe2VL
 vFYU6gvvGT8Yc5ZkjIaTdDZXdZM0YfKLIDKQjU992LXg/dgYNt//UU+DKFG/5daR
 6DBlbNBCQNRAxlAsYX0o
 =sAW5
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/defconfig

ARM: tegra: Default configuration updates for v4.4-rc1

Enable touchscreen and audio support on Toradex Colibri platforms.

* tag 'tegra-for-4.4-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Update multi_v7_defconfig
  ARM: tegra: Update default configuration
  ARM: tegra: Rebuild default configuration on v4.3-rc1

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:47:19 +09:00
Olof Johansson
c2c2b3d357 ARM: tegra: Core SoC changes for v4.4-rc1
A single patch to restore rfkill support on AC100.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJWJjTwAAoJEN0jrNd/PrOhZoAP/RProYcLUmaeegpue3lnEUVe
 Zl1RnuuDX0y/LKshB+eRm2TYJo5ihPqkRXigcWqbN6Z03dgXhMql3gU/bllt6eDq
 7PjT8znRbmqfapKlMHgQAoaM0ZhbkczNHDK9exITx98twxqy2+hhgUocIbQnZE4A
 VtS8bPzfBt623lqbynhHPYtZcZSInMxoL3gefzneQ/Hb80Ys6dkhP8pmn3JZsElB
 rRgNKmFddNmLVRxNCZ0HUPPK6+WyBC/tzVy2yMGzQufzmELxwjgnzk5/f0gjf9oJ
 oB0yedgOfrENEN75rUxfgwcNXyg6et3GoNdzQ69pBPZoi7ODD6lu8lDb6hEXbfdV
 imt0Wcplf6J4KdQcxnEuY9pluM7nJGVEiA75RC+fJt8jUS5LIgguc6Aj/lkeOEGw
 U7oWbHGzi6K1gIZKXQuGw/2alTJ3XFTZmBROndsaGzvdD2GKKSsUHOGng6tAYaV2
 S1VapoPZY62V51hW02ujF/5F3s4Iuu/Ysi9lF6aplX1RZmk0Oo4GR40JgYSSkH8u
 kk3YISVNA15EusbSOU9zSBNvwWeNDYzadiKoS5llTPB27IhL7avvAZWTEhOjGrr5
 AMndFT0ihTOwIoBNx+P2t+Hk5cwcNBlw57MSiQUlLvBIPDzS2Xc6kb8medaMfTcR
 j++5q15wBgxfiAAQ1MRM
 =5xhD
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc

ARM: tegra: Core SoC changes for v4.4-rc1

A single patch to restore rfkill support on AC100.

* tag 'tegra-for-4.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: paz00: use con_id's to refer GPIO's in gpiod_lookup table

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:45:56 +09:00
Olof Johansson
44024ce036 More SoC changes for 4.4:
- a great fix for PM/suspend/resume
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJWJV2aAAoJEKbNnwlvZCyzXLQQAIKTqxfAmatF5jkWUbqgxZiz
 1F9PDJ3Vt6Wnw5vVMMs0MVOBMIahEz+2wx7F35IMS22VCNn4VBcfZdrzBg+/iofT
 faLP23emmEKeprLKp56ct6utDQJoiu5f5X2KT+YL+iXfW27MBRhr7iqA6c2oJ0Vh
 9u8ilVUOesg8ZMCom6ftIqPMxIfYssZQbb6D6Dx4N9UhT7IEBEm19GuYRAPqoBo3
 TnAHn/8PIO3/4SaMvlZIOmgqihxDYeBVVIsXGOS+NN/7/mcsmGHxsdWuI1JQNhHt
 RwmLX8FdI5dqO/I06h+e7Bt0cQRudJiXM9iH0yLNttFjPQP5XDOzp0b42alQ0cyG
 Qfc5r98rg7NSWsz1+xIrA0kuVE2G8lNxNbdIiC9RiCCNVc7gMetkQdZVeoxrTs20
 ekwLkRFaz2uj53x7Q4RK+TyCB39PruTgy0wWJZER7Dezqww3Nw99enjMi7MecsM+
 N+MMUAVlSxHlZAZze7jyRab97bORF7GGqR2msFvJI+pNyuhZZhZ9KeaE05XM+Pzj
 lvortvGYW2IwByy7tK3j1foOwm4pNuc1ubw5NKBoKKg53algwn5t25AwfHpMmIiO
 zJrSqbTqphqvznOJzSO4Hg+/zSESNLdjglCo49ITwNBeTc/Vg0urq3zAnCvNwB0P
 scarMY6dHcz0c7mNoGCm
 =Zjpj
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc

More SoC changes for 4.4:
 - a great fix for PM/suspend/resume

* tag 'at91-ab-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:44:48 +09:00
Olof Johansson
98376f6af8 defconfig update for 4.4:
- Add sama5d2 and its peripherals to sama5_defconfig and multi_v7_defconfig
 - Trivial savedefconfig updates to at91_dt_defconfig and sama5_defconfig
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJWJUqOAAoJEKbNnwlvZCyzn8MQAMRloaLeoQVRkfBhixdRI3Pr
 FMUl/fbQJQib/tWytsSIXktEy67MesHeOxI0kSeN1zeuqzEUswvsuShV7ibuoBl9
 r+mE9lJqp7B3qJu4mD+yfH39v79zmGyCkop9wWkdiSSmxZinBc6JipfeH5k4U97/
 3965uRnI5+mKz4UKyEAxnOz6OKVjkOc5ZwR9X1VGpaVJBjl7hYHQOVTVzR3s4phg
 +b51+hzVdBMaIBgPaE56Nqzn0ZecR9aLV2hCTpL4Avkqx7A/TiQdmtrjpOivMFYK
 OracOxjTk2yAmDGaibMYDy7l67uTY/jBW5z40LVfSNa/W4y+/t2JfocAbW04Eete
 MVvGfaBFG1lvrlBDy0+q4HzqnkKFGvyG3OaFinL+CgSXOOQ2o3nD89WWZIY9rUXa
 EZhTkz0f+cPs5pPJjY4hFwtMvuSYSt/qRBpTeBtRM5A8GIHYroCNv9Ng1pJPCIlh
 YM1mqMSGWE20Navf17QfVKoJW7zLZ5THWeGAo/bWXYp4y/PRtQNQ1/mr43nBuYe9
 o4B5QELGgLkoFp1NTyfR+I4TwRFux7Oy1Cg17F2J2Lr1FxY4foVtW91+0UP/pg4g
 I7zUzIa8khqWcK92uLRX3ayicuRPP8cTJd4Bwe2A2PEV8h8ap7AK6K2ZcQHqTKs6
 3Ee/qG3jNzVdLROLerlK
 =urST
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/defconfig

defconfig update for 4.4:
- Add sama5d2 and its peripherals to sama5_defconfig and multi_v7_defconfig
- Trivial savedefconfig updates to at91_dt_defconfig and sama5_defconfig

* tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: multi_v7_defconfig: Add Atmel SDHCI device
  ARM: multi_v7_defconfig: Add Atmel Flexcom device
  ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
  ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
  ARM: at91/defconfig: update at91_dt defconfig
  ARM: at91/defconfig: update sama5 defconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
2015-10-26 09:44:07 +09:00
Lucas Stach
209da39154 irqchip/tegra: Propagate IRQ type setting to parent
The LIC doesn't deal with the different types of interrupts itself
but needs to forward calls to set the appropriate type to its parent
IRQ controller.

Without this fix all IRQs routed through the LIC will stay at the
initial EDGE type, while most of them should actually be level triggered.

Fixes: 1eec582158 "irqchip: tegra: Add Tegra210 support"
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Alexandre Courbot <gnurou@gmail.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: <stable@vger.kernel.org> # 4.1
Link: http://lkml.kernel.org/r/1445787552-13062-1-git-send-email-dev@lynxeye.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-10-26 09:20:59 +09:00
Thomas Petazzoni
353d6d6c82 irqchip/armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN
Commit d17cab4451 ("irqchip: Kill off set_irq_flags usage") changed
the code of armada_370_xp_mpic_irq_map() from using set_irq_flags() to
irq_set_probe().

While the commit log seems to imply that there are no functional
changes, there are indeed functional changes introduced by this
commit: the IRQ_NOAUTOEN flag is no longer cleared. This functional
change causes a regression on Armada XP, which no longer works
properly after suspend/resume because per-CPU interrupts remain
disabled.

Due to how the hardware registers work, the irq-armada-370-xp cannot
simply save/restore a bunch of registers at suspend/resume to make
sure that the interrupts remain in the same state after
resuming. Therefore, it relies on the kernel to say whether the
interrupt is disabled or not, using the irqd_irq_disabled()
function. This was all working fine while the IRQ_NOAUTOEN flag was
cleared.

With the change introduced by Rob Herring in d17cab4451, the
IRQ_NOAUTOEN flag is now set for all interrupts. irqd_irq_disabled()
returns false for per-CPU interrupts, and therefore our per-CPU
interrupts are no longer re-enabled after resume.

This commit works around this problem by clearing again the
IRQ_NOAUTOEN flags, so that we are back to the situation we had before
commit d17cab4451. This work around is proposed as a minimal fix
for the problem, while a better long-term solution is being worked on.

Fixes: d17cab4451 "irqchip: Kill off set_irq_flags usage"
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1445435295-19956-1-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2015-10-26 09:19:06 +09:00
Rich Felker
4ac3131110 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU
On NOMMU archs, the FDPIC ELF loader sets up the usable brk range to
overlap with all but the last PAGE_SIZE bytes of the stack. This leads
to catastrophic memory reuse/corruption if brk is used. Fix by setting
the brk area to zero size to disable its use.

Signed-off-by: Rich Felker <dalias@libc.org>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
2015-10-26 09:02:32 +10:00
Rafael J. Wysocki
ba210f5de4 Merge branch 'acpi-pci'
* acpi-pci:
  ia64/PCI/ACPI: Use common interface to support PCI host bridge
  x86/PCI/ACPI: Use common interface to support PCI host bridge
  ACPI/PCI: Reset acpi_root_dev->domain to 0 when pci_ignore_seg is set
  PCI/ACPI: Add interface acpi_pci_root_create()
  ia64/PCI: Use common struct resource_entry to replace struct iospace_resource
  ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge
  ACPI/PCI: Enhance ACPI core to support sparse IO space
2015-10-25 22:55:31 +01:00
Rafael J. Wysocki
e3ed766b49 Merge branch 'acpi-init'
* acpi-init:
  clocksource: cosmetic: Drop OF 'dependency' from symbols
  clocksource / arm_arch_timer: Convert to ACPI probing
  clocksource: Add new CLKSRC_{PROBE,ACPI} config symbols
  clocksource / ACPI: Add probing infrastructure for ACPI-based clocksources
  irqchip / GIC: Convert the GIC driver to ACPI probing
  irqchip / ACPI: Add probing infrastructure for ACPI-based irqchips
  ACPI: Add early device probing infrastructure
2015-10-25 22:55:14 +01:00
Rafael J. Wysocki
343ccb040e Merge branches 'acpi-scan', 'acpi-tables', 'acpi-ec' and 'acpi-assorted'
* acpi-scan:
  ACPI / scan: use kstrdup_const() in acpi_add_id()
  ACPI / scan: constify struct acpi_hardware_id::id
  ACPI / scan: constify first argument of struct acpi_scan_handler::match

* acpi-tables:
  ACPI / tables: test the correct variable
  x86, ACPI: Handle apic/x2apic entries in MADT in correct order
  ACPI / tables: Add acpi_subtable_proc to ACPI table parsers

* acpi-ec:
  ACPI / EC: Fix a race issue in acpi_ec_guard_event()
  ACPI / EC: Fix query handler related issues

* acpi-assorted:
  ACPI: change acpi_sleep_proc_init() to return void
  ACPI: change init_acpi_device_notify() to return void
2015-10-25 22:54:46 +01:00
Rafael J. Wysocki
ab736d7dc1 Merge branch 'device-properties'
* device-properties:
  ACPI / property: Fix subnode lookup scope for data-only subnodes
  acpi-dma: Add support for "dma-names" device property
  device property: Add fwnode_property_match_string()
  ACPI / property: Extend device_get_next_child_node() to data-only nodes
  ACPI / gpio: Split acpi_get_gpiod_by_index()
  ACPI / property: Extend fwnode_property_* to data-only subnodes
  ACPI / property: Expose data-only subnodes via sysfs
  ACPI / property: Add support for data-only subnodes
  ACPI / property: Add routine for extraction of _DSD properties
2015-10-25 22:51:48 +01:00
Greg Kroah-Hartman
0bbc367e21 Merge 4.3-rc7 into usb-next
We want the USB and other fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2015-10-26 06:39:46 +09:00
Kuba Pawlak
1da5537ecc Bluetooth: Fix locking issue during fast SCO reconnection.
When SCO connection is requested and disconnected fast, there is a change
that sco_sock_shutdown is going to preempt thread started in sco_connect_cfm.
When this happens struct sock sk may be removed but a pointer to it is still
held in sco_conn_ready, where embedded spinlock is used. If it is used, but
struct sock has been removed, it will crash.

Block connection object, which will prevent struct sock from being removed
and give connection process chance to finish.

BUG: spinlock bad magic on CPU#0, kworker/u:2H/319
 lock: 0xe3e99434, .magic: f3000000, .owner: (���/0, .owner_cpu: -203804160
Pid: 319, comm: kworker/u:2H Tainted: G           O 3.8.0-115.1-plk-adaptation-byt-ivi-brd #1
Call Trace:
 [<c1155659>] ? do_raw_spin_lock+0x19/0xe9
 [<fb75354f>] ? sco_connect_cfm+0x92/0x236 [bluetooth]
 [<fb731dbc>] ? hci_sync_conn_complete_evt.clone.101+0x18b/0x1cb [bluetooth]
 [<fb734ee7>] ? hci_event_packet+0x1acd/0x21a6 [bluetooth]
 [<c1041095>] ? finish_task_switch+0x50/0x89
 [<c1349a2e>] ? __schedule+0x638/0x6b8
 [<fb727918>] ? hci_rx_work+0xb9/0x2b8 [bluetooth]
 [<c103760a>] ? queue_delayed_work_on+0x21/0x2a
 [<c1035df9>] ? process_one_work+0x157/0x21b
 [<fb72785f>] ? hci_cmd_work+0xef/0xef [bluetooth]
 [<c1036217>] ? worker_thread+0x16e/0x20a
 [<c10360a9>] ? manage_workers+0x1cf/0x1cf
 [<c103a0ef>] ? kthread+0x8d/0x92
 [<c134adf7>] ? ret_from_kernel_thread+0x1b/0x28
 [<c103a062>] ? __init_kthread_worker+0x24/0x24
BUG: unable to handle kernel NULL pointer dereference at   (null)
IP: [<  (null)>]   (null)
*pdpt = 00000000244e1001 *pde = 0000000000000000
Oops: 0010 [#1] PREEMPT SMP
Modules linked in: evdev ecb rfcomm(O) libcomposite usb2380 udc_core bnep(O) btusb(O) btbcm(O) cdc_acm btintel(O) bluetooth(O) arc4 uinput hid_multitouch usbhid hid iwlmvm(O)e
Pid: 319, comm: kworker/u:2H Tainted: G           O 3.8.0-115.1-plk-adaptation-byt-ivi-brd #1
EIP: 0060:[<00000000>] EFLAGS: 00010246 CPU: 0
EIP is at 0x0
EAX: e3e99400 EBX: e3e99400 ECX: 00000100 EDX: 00000000
ESI: e3e99434 EDI: fb763ce0 EBP: e49b9e44 ESP: e49b9e14
 DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
CR0: 8005003b CR2: 00000000 CR3: 24444000 CR4: 001007f0
DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
DR6: ffff0ff0 DR7: 00000400
Process kworker/u:2H (pid: 319, ti=e49b8000 task=e4ab9030 task.ti=e49b8000)
Stack:
 fb75355b 00000246 fb763900 22222222 22222222 22222222 e3f94460 e3ca7c0a
 e49b9e4c e3f34c00 e3ca7c0a fb763ce0 e49b9e6c fb731dbc 02000246 e4cec85c
 e4cec008 00000000 e3f34c00 e4cec000 e3c2ce00 0000002c e49b9ed0 fb734ee7
Call Trace:
 [<fb75355b>] ? sco_connect_cfm+0x9e/0x236 [bluetooth]
 [<fb731dbc>] ? hci_sync_conn_complete_evt.clone.101+0x18b/0x1cb [bluetooth]
 [<fb734ee7>] ? hci_event_packet+0x1acd/0x21a6 [bluetooth]
 [<c1041095>] ? finish_task_switch+0x50/0x89
 [<c1349a2e>] ? __schedule+0x638/0x6b8
 [<fb727918>] ? hci_rx_work+0xb9/0x2b8 [bluetooth]
 [<c103760a>] ? queue_delayed_work_on+0x21/0x2a
 [<c1035df9>] ? process_one_work+0x157/0x21b
 [<fb72785f>] ? hci_cmd_work+0xef/0xef [bluetooth]
 [<c1036217>] ? worker_thread+0x16e/0x20a
 [<c10360a9>] ? manage_workers+0x1cf/0x1cf
 [<c103a0ef>] ? kthread+0x8d/0x92
 [<c134adf7>] ? ret_from_kernel_thread+0x1b/0x28
 [<c103a062>] ? __init_kthread_worker+0x24/0x24
Code:  Bad EIP value.
EIP: [<00000000>] 0x0 SS:ESP 0068:e49b9e14
CR2: 0000000000000000
---[ end trace 942a6577c0abd725 ]---

Signed-off-by: Kuba Pawlak <kubax.t.pawlak@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2015-10-25 21:06:39 +01:00
Kuba Pawlak
435c513369 Bluetooth: Fix locking issue on SCO disconnection
Thread handling SCO disconnection may get preempted in '__sco_sock_close'
after dropping a reference to hci_conn but before marking this as NULL
in associated struct sco_conn. When execution returs to this thread,
this connection will possibly be released, resulting in kernel crash

Lock connection before this point.

BUG: unable to handle kernel NULL pointer dereference at   (null)
IP: [<fb770ab9>] __sco_sock_close+0x194/0x1ff [bluetooth]
*pdpt = 0000000023da6001 *pde = 0000000000000000
Oops: 0002 [#1] PREEMPT SMP
Modules linked in: evdev ecb rfcomm(O) libcomposite usb2380 udc_core bnep(O) btusb(O) btbcm(O) cdc_acm btintel(O) bluetooth(O) arc4 uinput hid_multitouch usbhid iwlmvm(O) hide
Pid: 984, comm: bluetooth Tainted: G           O 3.8.0-115.1-plk-adaptation-byt-ivi-brd #1
EIP: 0060:[<fb770ab9>] EFLAGS: 00010282 CPU: 2
EIP is at __sco_sock_close+0x194/0x1ff [bluetooth]
EAX: 00000000 EBX: e49d7600 ECX: ef1ec3c2 EDX: 000000c3
ESI: e4c12000 EDI: 00000000 EBP: ef1edf5c ESP: ef1edf4c
 DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
CR0: 80050033 CR2: 00000000 CR3: 23da7000 CR4: 001007f0
DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000
DR6: ffff0ff0 DR7: 00000400
Process bluetooth (pid: 984, ti=ef1ec000 task=e47f2550 task.ti=ef1ec000)
Stack:
 e4c120d0 e49d7600 00000000 08421a40 ef1edf70 fb770b7a 00000002 e8a4cc80
 08421a40 ef1ec000 c12966b1 00000001 00000000 0000000b 084954c8 c1296b6c
 0000001b 00000002 0000001b 00000002 00000000 00000002 b2524880 00000046
Call Trace:
 [<fb770b7a>] ? sco_sock_shutdown+0x56/0x95 [bluetooth]
 [<c12966b1>] ? sys_shutdown+0x37/0x53
 [<c1296b6c>] ? sys_socketcall+0x12e/0x1be
 [<c134ae7e>] ? sysenter_do_call+0x12/0x26
 [<c1340000>] ? ip_vs_control_net_cleanup+0x46/0xb1
Code: e8 90 6b 8c c5 f6 05 72 5d 78 fb 04 74 17 8b 46 08 50 56 68 0a fd 77 fb 68 60 5d 78 fb e8 68 95 9e c5 83 c4 10 8b 83 fc 01 00 00 <c7> 00 00 00 00 00 eb 32 ba 68 00 00 0b
EIP: [<fb770ab9>] __sco_sock_close+0x194/0x1ff [bluetooth] SS:ESP 0068:ef1edf4c
CR2: 0000000000000000
---[ end trace 47fa2f55a9544e69 ]---

Signed-off-by: Kuba Pawlak <kubax.t.pawlak@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
2015-10-25 21:06:39 +01:00