Commit graph

14 commits

Author SHA1 Message Date
Greg Kroah-Hartman ba4b60e85d Merge 3.14-rc3 into char-misc-next
We need the fixes here for future mei and other patches.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-18 08:09:40 -08:00
Martyn Welch a2a720e15f VME: Stop using memcpy_[to|from]io() due to unwanted behaviour
The ca91cx42 and tsi148 VME bridges use the width of reads and writes on the
PCI bus in part to control the width of the cycles on the VME bus. It is
important that we can control the width of cycles on the VME bus as some VME
hardware requires cycles of a specific width. The memcpy_toio() and
memcpy_fromio() functions do not provide sufficient control, so instead loop
using ioread functions.

Reported-by: Michael Kenney <mfkenney@gmail.com>
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-15 11:53:39 -08:00
Martyn Welch f0342e66b3 VME: Correct read/write alignment algorithm
In order to ensure the correct width cycles on the VME bus, the VME bridge
drivers implement an algorithm to utilise the largest possible width reads and
writes whilst maintaining natural alignment constraints. The algorithm
currently looks at the start address rather than the current read/write address
when determining whether a 16-bit width cycle is required to get to 32-bit
alignment.  This results in incorrect alignment,

Reported-by: Jim Strouth <james.strouth@ge.com>
Tested-by: Jim Strouth <james.strouth@ge.com>
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-02-07 08:16:14 -08:00
Jingoo Han c3a09c18ed vme: remove DEFINE_PCI_DEVICE_TABLE macro
Don't use DEFINE_PCI_DEVICE_TABLE macro, because this macro
is not preferred.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-03 11:15:58 -08:00
Jingoo Han 4e8764d95d vme: vme_tsi148.c: add missing __iomem annotation
Added missing __iomem annotation in order to fix the following
sparse warnings:

drivers/vme/bridges/vme_tsi148.c:1270:39: warning: incorrect type in initializer (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1270:39:    expected void *addr
drivers/vme/bridges/vme_tsi148.c:1270:39:    got void [noderef] <asn:2>*
drivers/vme/bridges/vme_tsi148.c:1287:30: warning: incorrect type in argument 1 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1287:30:    expected void const volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1287:30:    got void *addr
drivers/vme/bridges/vme_tsi148.c:1294:47: warning: incorrect type in argument 1 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1294:47:    expected void const volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1294:47:    got void *
drivers/vme/bridges/vme_tsi148.c:1298:48: warning: incorrect type in argument 1 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1298:48:    expected void const volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1298:48:    got void *
drivers/vme/bridges/vme_tsi148.c:1305:17: warning: incorrect type in argument 2 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1305:17:    expected void const volatile [noderef] <asn:2>*<noident>
drivers/vme/bridges/vme_tsi148.c:1305:17:    got void *
drivers/vme/bridges/vme_tsi148.c:1310:40: warning: incorrect type in argument 1 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1310:40:    expected void const volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1310:40:    got void *
drivers/vme/bridges/vme_tsi148.c:1314:39: warning: incorrect type in argument 1 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1314:39:    expected void const volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1314:39:    got void *
drivers/vme/bridges/vme_tsi148.c:1351:39: warning: incorrect type in initializer (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1351:39:    expected void *addr
drivers/vme/bridges/vme_tsi148.c:1351:39:    got void [noderef] <asn:2>*
drivers/vme/bridges/vme_tsi148.c:1369:17: warning: incorrect type in argument 2 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1369:17:    expected void volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1369:17:    got void *addr
drivers/vme/bridges/vme_tsi148.c:1376:25: warning: incorrect type in argument 2 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1376:25:    expected void volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1376:25:    got void *
drivers/vme/bridges/vme_tsi148.c:1380:25: warning: incorrect type in argument 2 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1380:25:    expected void volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1380:25:    got void *
drivers/vme/bridges/vme_tsi148.c:1387:17: warning: incorrect type in argument 1 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1387:17:    expected void volatile [noderef] <asn:2>*<noident>
drivers/vme/bridges/vme_tsi148.c:1387:17:    got void *
drivers/vme/bridges/vme_tsi148.c:1392:17: warning: incorrect type in argument 2 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1392:17:    expected void volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1392:17:    got void *
drivers/vme/bridges/vme_tsi148.c:1396:17: warning: incorrect type in argument 2 (different address spaces)
drivers/vme/bridges/vme_tsi148.c:1396:17:    expected void volatile [noderef] <asn:2>*addr
drivers/vme/bridges/vme_tsi148.c:1396:17:    got void *

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-19 17:07:01 -07:00
Wei Yongjun 0686ab7a7d vme: vme_tsi148.c: fix error return code in tsi148_probe()
Fix to return a negative error code in the tsi148_crcsr_init() error
handling case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-24 16:23:25 -07:00
Martyn Welch c36c5736be vme: tsi148: Window reserved for accessing CR/CSR does not need attributes set
The tsi148 driver can be configured to reserve a window for internal
use (as part of the error checking routine). The intialisation of this
window currently configures a set of attributes that are never used
as these are only ever used by the VME core and this window is not
advertised to the core.

Remove configuration of these attributes.

Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17 16:43:08 -07:00
Martyn Welch 2981795cc0 vme: tsi148: CR/CSR logic arround the wrong way
The logic in the init routine for the TSI148 is inverted. It isn't switching
on the CR/CSR space when it should be and is reporting it's on when its not.

Correct the logic to do the right thing.

Reported-by: De Roo, Steven <steven.deroo@arcelormittal.com>
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17 16:41:50 -07:00
Martyn Welch e31c51e4a1 vme: tsi148: Only store VME bus errors if they will be checked
The TSI148 driver provides an optional mechanism for ensuring that errors
resulting from posted transfers are caught whilst still relevant. To do this
errors are stored in a link list. If bus errors are not checked, this list
would grow until available memory had been exhausted.

Only store the errors in a link list if error detection is switched on.

Reported-by: De Roo, Steven <steven.deroo@arcelormittal.com>
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-06-17 16:41:50 -07:00
Wei Yongjun 01c0714397 vme: vme_tsi148.c: use module_pci_driver to simplify the code
Use the module_pci_driver() macro to make the code simpler
by eliminating module_init and module_exit calls.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-10-25 12:02:11 -07:00
Wei Yongjun b49c32ba2c vme: vme_tsi148.c: fix to use list_for_each_safe() when delete list items
Since we will be removing items off the list using list_del() we need
to use a safer version of the list_for_each() macro aptly named
list_for_each_safe().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-09-06 13:29:11 -07:00
Martyn Welch 363e2e6f9e VME: Prevent D16 cycles being split into 8-bit blocks
The memcpy_fromio() and memcpy_toio() functions use the __memcpy() function,
at least on x86. This function carries out transfers smaller than 32 bits as
multiple 8 bit transfers, causing a single (aligned) 16 bit transfer to be
split into 2 8 bit transfers which may not be supported by the target VME
device.

The commit 53059aa059 fixed this for the
ca91cx42, however this was not fixed for the tsi148 at the time. This patch
uses the same algorithm to fix the tsi148.

Reported-by: Daniel Lambert <daniel.lambert@clermont.in2p3.fr>
Signed-off-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-07-19 15:39:39 -07:00
H Hartley Sweeten lin 8a508ff407 vme: vme_tsi148.c: local functions should not be exposed globally
Functions not referenced outside of a source file should be marked
static to prevent them from being exposed globally.

Quiets the sparse warnings:

warning: symbol 'tsi148_alloc_consistent' was not declared. Should it be static?
warning: symbol 'tsi148_free_consistent' was not declared. Should it be static?

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Martyn Welch <martyn.welch@ge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-08 16:01:33 -07:00
Greg Kroah-Hartman db3b9e990e Staging: VME: move VME drivers out of staging
This moves the VME core, VME board drivers, and VME bridge drivers out
of the drivers/staging/vme/ area to drivers/vme/.

The VME device drivers have not moved out yet due to some API questions
they are still working through, that should happen soon, hopefully.

Cc: Martyn Welch <martyn.welch@ge.com>
Cc: Manohar Vanga <manohar.vanga@cern.ch>
Cc: Vincent Bossier <vincent.bossier@gmail.com>
Cc: "Emilio G. Cota" <cota@braap.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-26 12:34:58 -07:00
Renamed from drivers/staging/vme/bridges/vme_tsi148.c (Browse further)