linux-stable.git/drivers/spi, branch v3.16.6

spi: sirf: enable RX_IO_DMA_INT interrupt

2014-10-05T20:41:09+00:00

commit f2a08b404691ef3e7be6ce81c185335cfc68b6db upstream.

in spi interrupt handler, we need check RX_IO_DMA status to ensure
rx fifo have received the specify count data.

if not set, the while statement in spi isr function will keep loop,
at last, make the kernel hang.

[The code is actually there in the interrupt handler but apparently it
needs the interrupt unmasking so the handler sees the status -- broonie]

Signed-off-by: Qipan Li 
Signed-off-by: Barry Song 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi: dw: Don't use devm_kzalloc in master->setup callback

2014-10-05T20:41:09+00:00

commit a97c883a16da7e0691a3be5465926c92a8da4da6 upstream.

device_add() expects that any memory allocated via devm_* API is only
done in the device's probe function.

Fix below boot warning:
WARNING: CPU: 1 PID: 1 at drivers/base/dd.c:286 driver_probe_device+0x2b4/0x2f4()
Modules linked in:
CPU: 1 PID: 1 Comm: swapper/0 Not tainted 3.16.0-10474-g835c90b-dirty #160
[] (unwind_backtrace) from [] (show_stack+0x20/0x24)
[] (show_stack) from [] (dump_stack+0x7c/0x98)
[] (dump_stack) from [] (warn_slowpath_common+0x78/0x9c)
[] (warn_slowpath_common) from [] (warn_slowpath_null+0x2c/0x34)
[] (warn_slowpath_null) from [] (driver_probe_device+0x2b4/0x2f4)
[] (driver_probe_device) from [] (__device_attach+0x50/0x54)
[] (__device_attach) from [] (bus_for_each_drv+0x54/0x9c)
[] (bus_for_each_drv) from [] (device_attach+0x84/0x90)
[] (device_attach) from [] (bus_probe_device+0x94/0xb8)
[] (bus_probe_device) from [] (device_add+0x434/0x4fc)
[] (device_add) from [] (spi_add_device+0x98/0x164)
[] (spi_add_device) from [] (spi_register_master+0x598/0x768)
[] (spi_register_master) from [] (devm_spi_register_master+0x40/0x80)
[] (devm_spi_register_master) from [] (dw_spi_add_host+0x1a8/0x258)
[] (dw_spi_add_host) from [] (dw_spi_mmio_probe+0x1d4/0x294)
[] (dw_spi_mmio_probe) from [] (platform_drv_probe+0x3c/0x6c)
[] (platform_drv_probe) from [] (driver_probe_device+0xec/0x2f4)
[] (driver_probe_device) from [] (__driver_attach+0x9c/0xa0)
[] (__driver_attach) from [] (bus_for_each_dev+0x64/0x98)
[] (bus_for_each_dev) from [] (driver_attach+0x2c/0x30)
[] (driver_attach) from [] (bus_add_driver+0xdc/0x1f4)
[] (bus_add_driver) from [] (driver_register+0x88/0x104)
[] (driver_register) from [] (__platform_driver_register+0x58/0x6c)
[] (__platform_driver_register) from [] (dw_spi_mmio_driver_init+0x18/0x20)
[] (dw_spi_mmio_driver_init) from [] (do_one_initcall+0x90/0x1d4)
[] (do_one_initcall) from [] (kernel_init_freeable+0x178/0x248)
[] (kernel_init_freeable) from [] (kernel_init+0x18/0xfc)
[] (kernel_init) from [] (ret_from_fork+0x14/0x20)

Reported-by: Thor Thayer 
Signed-off-by: Axel Lin 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi: fsl: Don't use devm_kzalloc in master->setup callback

2014-10-05T20:41:09+00:00

commit d9f26748128c73ec6bed2846ca52fb1c2edc3ced upstream.

device_add() expects that any memory allocated via devm_* API is only
done in the device's probe function.

Fix below boot warning:
[    3.092348] WARNING: at drivers/base/dd.c:286
[    3.096637] Modules linked in:
[    3.099697] CPU: 0 PID: 25 Comm: kworker/u2:1 Tainted: G W 3.16.1-s3k-drv-999-svn5771_knld-999 #158
[ 3.109610] Workqueue: deferwq deferred_probe_work_func
[    3.114736] task: c787f020 ti: c790c000 task.ti: c790c000
[    3.120062] NIP: c01df158 LR: c01df144 CTR: 00000000
[    3.124983] REGS: c790db30 TRAP: 0700   Tainted: G        W (3.16.1-s3k-drv-999-svn5771_knld-999)
[    3.134162] MSR: 00029032   CR: 22002082 XER: 20000000
[    3.140703]
[    3.140703] GPR00: 00000001 c790dbe0 c787f020 00000044 00000054 00000308 c056da0e 20737069
[    3.140703] GPR08: 33323736 000ebfe0 00000308 000ebfdf 22002082 00000000 c046c5a0 c046c608
[    3.140703] GPR16: c046c614 c046c620 c046c62c c046c638 c046c648 c046c654 c046c68c c046c6c4
[    3.140703] GPR24: 00000000 00000000 00000003 c0401aa0 c0596638 c059662c c054e7a8 c7996800
[    3.170102] NIP [c01df158] driver_probe_device+0xf8/0x334
[    3.175431] LR [c01df144] driver_probe_device+0xe4/0x334
[    3.180633] Call Trace:
[    3.183093] [c790dbe0] [c01df144] driver_probe_device+0xe4/0x334 (unreliable)
[    3.190147] [c790dc10] [c01dd15c] bus_for_each_drv+0x7c/0xc0
[    3.195741] [c790dc40] [c01df5fc] device_attach+0xcc/0xf8
[    3.201076] [c790dc60] [c01dd6d4] bus_probe_device+0xb4/0xc4
[    3.206666] [c790dc80] [c01db9f8] device_add+0x270/0x564
[    3.211923] [c790dcc0] [c0219e84] spi_add_device+0xc0/0x190
[    3.217427] [c790dce0] [c021a79c] spi_register_master+0x720/0x834
[    3.223455] [c790dd40] [c021cb48] of_fsl_spi_probe+0x55c/0x614
[    3.229234] [c790dda0] [c01e0d2c] platform_drv_probe+0x30/0x74
[    3.234987] [c790ddb0] [c01df18c] driver_probe_device+0x12c/0x334
[    3.241008] [c790dde0] [c01dd15c] bus_for_each_drv+0x7c/0xc0
[    3.246602] [c790de10] [c01df5fc] device_attach+0xcc/0xf8
[    3.251937] [c790de30] [c01dd6d4] bus_probe_device+0xb4/0xc4
[    3.257536] [c790de50] [c01de9d8] deferred_probe_work_func+0x98/0xe0
[    3.263816] [c790de70] [c00305b8] process_one_work+0x18c/0x440
[    3.269577] [c790dea0] [c0030a00] worker_thread+0x194/0x67c
[    3.275105] [c790def0] [c0039198] kthread+0xd0/0xe4
[    3.279911] [c790df40] [c000c6d0] ret_from_kernel_thread+0x5c/0x64
[    3.285970] Instruction dump:
[    3.288900] 80de0000 419e01d0 3b7b0038 3c60c046 7f65db78 38635264 48211b99 813f00a0
[    3.296559] 381f00a0 7d290278 3169ffff 7c0b4910 <0f000000> 93df0044 7fe3fb78 4bfffd4d

Reported-by: leroy christophe 
Signed-off-by: Axel Lin 
Tested-by: Christophe Leroy 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi: dw-pci: fix bug when regs left uninitialized

2014-10-05T20:41:01+00:00

commit c9d5d6fe168fd45a4dfdd0116affe708789b4702 upstream.

The commit 04f421e7 "spi: dw: use managed resources" changes drivers to use
managed functions, but seems wasn't properly tested in PCI case. The regs field
of struct dw_spi left uninitialized. Thus, kernel crashes when tries to access
to the SPI controller registers. This patch fixes the issue.

Fixes: 04f421e7 (spi: dw: use managed resources)
Signed-off-by: Andy Shevchenko 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi: dw: fix kernel crash due to NULL pointer dereference

2014-10-05T20:41:01+00:00

commit 08a707b87874eaaa0f336ab604ecd6e5e9f286dd upstream.

The obvious fix after the commit d9c73bb8a3a5 "spi: dw: add support for gpio
controlled chip select". This patch fixes the issue by using locally defined
temporary variable.

Fixes: d9c73bb8a3a5 (spi: dw: add support for gpio controlled chip select)
Signed-off-by: Andy Shevchenko 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi/omap-mcspi: Fix the spi task hangs waiting dma_rx

2014-10-05T20:41:01+00:00

commit 3d0763c006f8da1b44a9f5f9a21187f5b8f674f4 upstream.

The spi hangs waiting the completion of omap2_mcspi_rx_callback.

Signed-off-by: Jorge A. Ventura 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi/pxa2xx: Add ACPI ID for Intel Braswell

2014-09-17T16:22:09+00:00

commit aca26364689e00e3b2052072424682231bdae6ae upstream.

The SPI host controller is the same as used in Baytrail, only the ACPI ID
is different so add this new ID to the list.

Signed-off-by: Alan Cox 
Signed-off-by: Mika Westerberg 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi: omap2-mcspi: Configure hardware when slave driver changes mode

2014-09-17T16:21:51+00:00

commit 97ca0d6cc118716840ea443e010cb3d5f2d25eaf upstream.

Commit id 2bd16e3e23d9df41592c6b257c59b6860a9cc3ea
(spi: omap2-mcspi: Do not configure the controller
on each transfer unless needed) does its job too
well so omap2_mcspi_setup_transfer() isn't called
even when an SPI slave driver changes 'spi->mode'.
The result is that the mode requested by the SPI
slave driver never takes effect.

Fix this by adding the 'mode' member to the
omap2_mcspi_cs structure which holds the mode
value that the hardware is configured for.
When the SPI slave driver changes 'spi->mode'
it will be different than the value of this new
member and the SPI master driver will know that
the hardware must be reconfigured (by calling
omap2_mcspi_setup_transfer()).

Fixes: 2bd16e3e23 (spi: omap2-mcspi: Do not configure the controller on each transfer unless needed)
Signed-off-by: Mark A. Greer 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

spi: orion: fix incorrect handling of cell-index DT property

2014-09-17T16:21:51+00:00

commit e06871cd2c92e5c65d7ca1d32866b4ca5dd4ac30 upstream.

In commit f814f9ac5a81 ("spi/orion: add device tree binding"), Device
Tree support was added to the spi-orion driver. However, this commit
reads the "cell-index" property, without taking into account the fact
that DT properties are big-endian encoded.

Since most of the platforms using spi-orion with DT have apparently
not used anything but cell-index = <0>, the problem was not
visible. But as soon as one starts using cell-index = <1>, the problem
becomes clearly visible, as the master->bus_num gets a wrong value
(actually it gets the value 0, which conflicts with the first bus that
has cell-index = <0>).

This commit fixes that by using of_property_read_u32() to read the
property value, which does the appropriate endianness conversion when
needed.

Fixes: f814f9ac5a81 ("spi/orion: add device tree binding")
Signed-off-by: Thomas Petazzoni 
Acked-by: Sebastian Hesselbarth 
Signed-off-by: Mark Brown 
Signed-off-by: Greg Kroah-Hartman

Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/qup' and 'spi/fix/sh-sci' into spi-linus

2014-06-28T13:01:23+00:00