linux-stable.git/drivers/staging/vme, branch linux-3.2.y

vme: Fix wrong pointer utilization in ca91cx42_slave_get

2017-03-16T02:18:42+00:00

commit c8a6a09c1c617402cc9254b2bc8da359a0347d75 upstream.

In ca91cx42_slave_get function, the value pointed by vme_base pointer is
set through:

*vme_base = ioread32(bridge->base + CA91CX42_VSI_BS[i]);

So it must be dereferenced to be used in calculation of pci_base:

*pci_base = (dma_addr_t)*vme_base + pci_offset;

This bug was caught thanks to the following gcc warning:

drivers/vme/bridges/vme_ca91cx42.c: In function ‘ca91cx42_slave_get’:
drivers/vme/bridges/vme_ca91cx42.c:467:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
*pci_base = (dma_addr_t)vme_base + pci_offset;

Signed-off-by: Augusto Mecking Caringi 
Acked-By: Martyn Welch 
Signed-off-by: Greg Kroah-Hartman 
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings

staging: vme_user: rename USER_BUS_MAX to VME_USER_BUS_MAX

2011-10-17T22:43:13+00:00

Signed-off-by: Manohar Vanga 
Cc: Martyn Welch 
Reviewed-by: Emilio G. Cota 
Signed-off-by: Greg Kroah-Hartman

staging: vme: get rid of struct vme_device_id and slots

2011-10-17T22:43:13+00:00

Previously, the device-driver matching mechanism depended on the
vme_device_id structure due to the need for a bind table per driver.
This method of matching is no longer used so this patch merges the
fields of struct vme_device_id into struct vme_dev. Since this also
renders the slot field meaningless, it has also been removed in this
patch.

Signed-off-by: Manohar Vanga 
Cc: Martyn Welch 
Reviewed-by: Emilio G. Cota 
Signed-off-by: Greg Kroah-Hartman

staging: vme: make match() driver specific to improve non-VME64x support

2011-10-17T22:43:13+00:00

For jumper based boards (non VME64x), there is no mechanism
for detecting the card that is plugged into a specific slot. This
leads to issues in non-autodiscovery crates/cards when a card is
plugged into a slot that is "claimed" by a different driver. In
reality, there is no problem, but the driver rejects such a
configuration due to its dependence on the concept of slots.

This patch makes the concept of slots less critical and pushes the
driver match() to individual drivers (similar to what happens in the
ISA bus in driver/base/isa.c). This allows drivers to register the
number of devices that they expect without any restrictions. Devices
in this new model are now formatted as $driver_name-$bus_id.$device_id
(as compared to the earlier vme-$bus_id.$slot_number).

This model also makes the device model more logical as devices
are only registered when they actually exist whereas earlier,
a set of devices were being created automatically regardless of
them actually being there.

Another change introduced in this patch is that devices are now created
within the VME driver structure rather than in the VME bridge structure.
This way, things don't go haywire if the bridge driver is removed while
a driver is using it.

Signed-off-by: Manohar Vanga 
Cc: Martyn Welch 
Reviewed-by: Emilio G. Cota 
Signed-off-by: Greg Kroah-Hartman

staging: vme: add struct vme_dev for VME devices

2011-10-17T22:43:13+00:00

Instead of using a vanilla 'struct device' for VME devices, add new
'struct vme_dev'. Modifications have been made to the VME framework
API as well as all in-tree VME drivers.

The new vme_dev structure has the following advantages from the
current model used by the driver:

    * Driver functions (probe, remove) now receive a VME device
      instead of a pointer to the bridge device (cleaner design)
    * It's easier to differenciate API calls as bridge-based or
      device-based (ie. cleaner interface).

Signed-off-by: Manohar Vanga 
Cc: Martyn Welch 
Reviewed-by: Emilio G. Cota 
Signed-off-by: Greg Kroah-Hartman

staging: vme: change static device array to pointers

2011-09-09T20:26:32+00:00

Change the static array of 'struct device''s in struct vme_bridge
to instead use an array of pointers. This is in accordance with the
requirement that all kobjects be dynamically allocated (see
Documentation/kobject.txt) and never be statically allocated.

Signed-off-by: Manohar Vanga 
Acked-by: Martyn Welch 
Signed-off-by: Greg Kroah-Hartman

staging: vme: keep track of registered buses

2011-08-23T22:10:50+00:00

This patch adds a list which keeps track of all registered VME
buses. This is required for adding refcounting later to bridge
modules, something that is not currently implemented.

This is based on the changes introduced by Emilio G. Cota in the
patch:

    https://lkml.org/lkml/2010/10/25/486

Signed-off-by: Manohar Vanga 
Acked-by: Martyn Welch 
Signed-off-by: Greg Kroah-Hartman

staging: vme: make [alloc|free]_consistent bridge specific

2011-08-23T22:08:09+00:00

Make PCI dependent functions ([alloc|free]_consistent() in
'vme.c') bridge specific. By removing the dependency of the
VME bridge framework on PCI, this patch allows for addition of
non-PCI based VME bridges.

Signed-off-by: Manohar Vanga 
Acked-by: Martyn Welch 
Acked-by: Dan Carpenter 
Signed-off-by: Greg Kroah-Hartman

staging: vme_user: change kmalloc+memset to kzalloc

2011-08-23T22:05:02+00:00

Signed-off-by: Manohar Vanga 
Acked-by: Martyn Welch 
Signed-off-by: Greg Kroah-Hartman

Staging: VME: Introduce IOCTL to generate VME interrupts.

2011-06-28T21:13:05+00:00

The vme_irq_set is oblviously not needed (a remnant from old tests) and the
IOCTL exchange types have been updated following Greg's comments.

Allow the IOCTL call to generate VME interrupts when called on the vme/ctl
device with the right arguments.

Signed-off-by: Vincent Bossier 
Acked-by: Martyn Welch 
Signed-off-by: Greg Kroah-Hartman