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

spi: sunxi: fix transfer timeout

2016-08-22T21:38:14+00:00

commit 719bd6542044efd9b338a53dba1bef45f40ca169 upstream.

The trasfer timeout is fixed at 1000 ms. Reading a 4Mbyte flash over
1MHz SPI bus takes way longer than that. Calculate the timeout from the
actual time the transfer is supposed to take and multiply by 2 for good
measure.

Signed-off-by: Michal Suchanek 
Acked-by: Maxime Ripard 
Signed-off-by: Mark Brown 
Signed-off-by: Ben Hutchings

spi: sun4i: fix FIFO limit

2016-08-22T21:38:14+00:00

commit 6d9fe44bd73d567d04d3a68a2d2fa521ab9532f2 upstream.

When testing SPI without DMA I noticed that filling the FIFO on the
spi controller causes timeout.

Always leave room for one byte in the FIFO.

Signed-off-by: Michal Suchanek 
Acked-by: Maxime Ripard 
Signed-off-by: Mark Brown 
Signed-off-by: Ben Hutchings

spi: spi-ti-qspi: Handle truncated frames properly

2016-06-15T20:29:23+00:00

commit 1ff7760ff66b98ef244bf0e5e2bd5310651205ad upstream.

We clamp frame_len_words to a maximum of 4096, but do not actually
limit the number of words written or read through the DATA registers
or the length added to spi_message::actual_length.  This results in
silent data corruption for commands longer than this maximum.

Recalculate the length of each transfer, taking frame_len_words into
account.  Use this length in qspi_{read,write}_msg(), and to increment
spi_message::actual_length.

Signed-off-by: Ben Hutchings 
Signed-off-by: Mark Brown 
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings

spi: spi-ti-qspi: Fix FLEN and WLEN settings if bits_per_word is overridden

2016-06-15T20:29:22+00:00

commit ea1b60fb085839a9544cb3a0069992991beabb7f upstream.

Each transfer can specify 8, 16 or 32 bits per word independently of
the default for the device being addressed.  However, currently we
calculate the number of words in the frame assuming that the word size
is the device default.

If multiple transfers in the same message have differing
bits_per_word, we bitwise-or the different values in the WLEN register
field.

Fix both of these.  Also rename 'frame_length' to 'frame_len_words' to
make clear that it's not a byte count like spi_message::frame_length.

Signed-off-by: Ben Hutchings 
Signed-off-by: Mark Brown 
[bwh: Backported to 3.16:
 - QSPI_WLEN_MAX_BITS is not defined so use the literal value 128
 - Adjust context]
Signed-off-by: Ben Hutchings

spi: fix parent-device reference leak

2016-01-25T10:43:39+00:00

commit 157f38f993919b648187ba341bfb05d0e91ad2f6 upstream.

Fix parent-device reference leak due to SPI-core taking an unnecessary
reference to the parent when allocating the master structure, a
reference that was never released.

Note that driver core takes its own reference to the parent when the
master device is registered.

Fixes: 49dce689ad4e ("spi doesn't need class_device")
Signed-off-by: Johan Hovold 
Signed-off-by: Mark Brown 
Signed-off-by: Luis Henriques

spi: atmel: Fix DMA-setup for transfers with more than 8 bits per word

2015-12-13T17:48:53+00:00

commit 06515f83908d038d9e12ffa3dcca27a1b67f2de0 upstream.

The DMA-slave configuration depends on the whether <= 8 or > 8 bits
are transferred per word, so we need to call
atmel_spi_dma_slave_config() with the correct value.

Signed-off-by: David Mosberger 
Signed-off-by: Nicolas Ferre 
Signed-off-by: Mark Brown 
Signed-off-by: Luis Henriques

spi: dw: explicitly free IRQ handler in dw_spi_remove_host()

2015-12-13T17:48:49+00:00

commit 02f20387e1bca550639c37b1945f20cd32ddfcce upstream.

The following warning occurs when DW SPI is compiled as a module and it's a PCI
device. On the removal stage pcibios_free_irq() is called earlier than
free_irq() due to the latter is called at managed resources free strage.

------------[ cut here ]------------
WARNING: CPU: 1 PID: 1003 at /home/andy/prj/linux/fs/proc/generic.c:575 remove_proc_entry+0x118/0x150()
remove_proc_entry: removing non-empty directory 'irq/38', leaking at least 'dw_spi1'
Modules linked in: spi_dw_midpci(-) spi_dw [last unloaded: dw_dmac_core]
CPU: 1 PID: 1003 Comm: modprobe Not tainted 4.3.0-rc5-next-20151013+ #32
 00000000 00000000 f5535d70 c12dc220 f5535db0 f5535da0 c104e912 c198a6bc
 f5535dcc 000003eb c198a638 0000023f c11b4098 c11b4098 f54f1ec8 f54f1ea0
 f642ba20 f5535db8 c104e96e 00000009 f5535db0 c198a6bc f5535dcc f5535df0
Call Trace:
 [] dump_stack+0x41/0x61
 [] warn_slowpath_common+0x82/0xb0
 [] ? remove_proc_entry+0x118/0x150
 [] ? remove_proc_entry+0x118/0x150
 [] warn_slowpath_fmt+0x2e/0x30
 [] remove_proc_entry+0x118/0x150
 [] unregister_irq_proc+0xaa/0xc0
 [] free_desc+0x1e/0x60
 [] irq_free_descs+0x32/0x70
 [] irq_domain_free_irqs+0x120/0x150
 [] mp_unmap_irq+0x5c/0x60
 [] intel_mid_pci_irq_disable+0x20/0x40
 [] pcibios_free_irq+0xf/0x20
 [] pci_device_remove+0x52/0xb0
 [] __device_release_driver+0x77/0x100
 [] driver_detach+0x87/0x90
 [] bus_remove_driver+0x4a/0xc0
 [] ? selinux_capable+0xd/0x10
 [] driver_unregister+0x23/0x60
 [] ? find_module_all+0x5a/0x80
 [] pci_unregister_driver+0x13/0x60
 [] dw_spi_driver_exit+0xd/0xf [spi_dw_midpci]
 [] SyS_delete_module+0x17a/0x210

Explicitly call free_irq() at removal stage of the DW SPI driver.

Fixes: 04f421e7b0b1 (spi: dw: use managed resources)
Signed-off-by: Andy Shevchenko 
Signed-off-by: Mark Brown 
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques

spi: ti-qspi: Fix data corruption seen on r/w stress test

2015-12-13T17:48:43+00:00

commit bc27a53928981662079aa243915b443370294a03 upstream.

Writing invalid command to QSPI_SPI_CMD_REG will terminate current
transfer and de-assert the chip select. This has to be done before
calling spi_finalize_current_message(). Because
spi_finalize_current_message() will mark the end of current message
transfer and schedule the next transfer. If the chipselect is not
de-asserted before calling spi_finalize_current_message() then the next
transfer will overlap with the previous transfer leading to data
corruption.
__spi_pump_message() can be called either from kthread worker context or
directly from the calling process's context. It is possible that these
two calls can race against each other. But race is serialized by
checking whether master->cur_msg == NULL (pointer to msg being handled
by transfer_one() at present). The master->cur_msg is set to NULL when
spi_finalize_current_message() is called on that message, which means
calling spi_finalize_current_message() allows __spi_sync() to pump next
message in calling process context.
Now if spi-ti-qspi calls spi_finalize_current_message() before we
terminate transfer at hardware side, if __spi_pump_message() is called
from process context then the successive transactions can overlap.

Fix this by moving writing invalid command to QSPI_SPI_CMD_REG to
before calling spi_finalize_current_message() call.

Signed-off-by: Vignesh R 
Signed-off-by: Mark Brown 
Signed-off-by: Luis Henriques

spi: xtensa-xtfpga: fix register endianness

2015-10-19T09:54:29+00:00

commit b0b4855099e301c8603ea37da9a0103a96c2e0b1 upstream.

XTFPGA SPI controller has native endian registers.
Fix register acessors so that they work in big-endian configurations.

Signed-off-by: Max Filippov 
Signed-off-by: Mark Brown 
Signed-off-by: Luis Henriques

spi: Fix documentation of spi_alloc_master()

2015-10-09T13:41:03+00:00

commit a394d635193b641f2c86ead5ada5b115d57c51f8 upstream.

Actually, spi_master_put() after spi_alloc_master() must _not_ be followed
by kfree(). The memory is already freed with the call to spi_master_put()
through spi_master_class, which registers a release function. Calling both
spi_master_put() and kfree() results in often nasty (and delayed) crashes
elsewhere in the kernel, often in the networking stack.

This reverts commit eb4af0f5349235df2e4a5057a72fc8962d00308a.

Link to patch and concerns: https://lkml.org/lkml/2012/9/3/269
or
http://lkml.iu.edu/hypermail/linux/kernel/1209.0/00790.html

Alexey Klimov: This revert becomes valid after
94c69f765f1b4a658d96905ec59928e3e3e07e6a when spi-imx.c
has been fixed and there is no need to call kfree() so comment
for spi_alloc_master() should be fixed.

Signed-off-by: Guenter Roeck 
Signed-off-by: Alexey Klimov 
Signed-off-by: Mark Brown 
Signed-off-by: Luis Henriques