Commit 08e03c26 authored by Martyn Welch's avatar Martyn Welch Committed by Greg Kroah-Hartman
Browse files

vme: tsi148: Master windows support USERx and CR/CSR accesses, not slaves 



The tsi148 driver is registering the slave images as supporting the "USER"
access modes and CR/CSR access mode rather than the master images as it
should.

Remove the incorrect case entries for these modes from the
tsi148_slave_set() function, stop registering slave_images as supporting
these modes and instead register master windows as supporting these modes.

Signed-off-by: default avatarMartyn Welch <martyn.welch@ge.com>
Acked-by: default avatarDmitry Kalinkin <dmitry.kalinkin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c74a804f

drivers/vme/bridges/vme_tsi148.c

+3 −8
Original line number Diff line number Diff line
@@ -587,11 +587,6 @@ static int tsi148_slave_set(struct vme_slave_resource *image, int enabled, 
		granularity = 0x10000;

		addr |= TSI148_LCSR_ITAT_AS_A64;

		break;

	case VME_CRCSR:

	case VME_USER1:

	case VME_USER2:

	case VME_USER3:

	case VME_USER4:

	default:

		dev_err(tsi148_bridge->parent, "Invalid address space\n");

		return -EINVAL;
@@ -2471,7 +2466,8 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		master_image->locked = 0;

		master_image->number = i;

		master_image->address_attr = VME_A16 | VME_A24 | VME_A32 |

			VME_A64;

			VME_A64 | VME_CRCSR | VME_USER1 | VME_USER2 |

			VME_USER3 | VME_USER4;

		master_image->cycle_attr = VME_SCT | VME_BLT | VME_MBLT |

			VME_2eVME | VME_2eSST | VME_2eSSTB | VME_2eSST160 |

			VME_2eSST267 | VME_2eSST320 | VME_SUPER | VME_USER |
@@ -2500,8 +2496,7 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		slave_image->locked = 0;

		slave_image->number = i;

		slave_image->address_attr = VME_A16 | VME_A24 | VME_A32 |

			VME_A64 | VME_CRCSR | VME_USER1 | VME_USER2 |

			VME_USER3 | VME_USER4;

			VME_A64;

		slave_image->cycle_attr = VME_SCT | VME_BLT | VME_MBLT |

			VME_2eVME | VME_2eSST | VME_2eSSTB | VME_2eSST160 |

			VME_2eSST267 | VME_2eSST320 | VME_SUPER | VME_USER |