diff options
| author | Martyn Welch | 2010-02-18 16:12:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-03-04 01:43:00 +0100 |
| commit | 4f723df45d3952c485ee0125fb6797ad615901c3 (patch) | |
| tree | 3db9d8a00c01c0ffa4d3d66630abf4e72e4771ed /drivers/staging/vme/bridges | |
| parent | Staging: vme: Renaming following split of GE Fanuc joint venture (diff) | |
| download | kernel-qcow2-linux-4f723df45d3952c485ee0125fb6797ad615901c3.tar.gz kernel-qcow2-linux-4f723df45d3952c485ee0125fb6797ad615901c3.tar.xz kernel-qcow2-linux-4f723df45d3952c485ee0125fb6797ad615901c3.zip | |
Staging: vme: Attribute Testing For Dma Request
Check the directions in which the DMA controller is expected to operate
before giving control of a resource.
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vme/bridges')
| -rw-r--r-- | drivers/staging/vme/bridges/vme_ca91cx42.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vme/bridges/vme_tsi148.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c index 272cc26ba5ac..7eaba3511ea8 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c @@ -1109,6 +1109,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) mutex_init(&(dma_ctrlr->mtx)); dma_ctrlr->locked = 0; dma_ctrlr->number = i; + dma_ctrlr->route_attr = VME_DMA_VME_TO_MEM | + VME_DMA_MEM_TO_VME; INIT_LIST_HEAD(&(dma_ctrlr->pending)); INIT_LIST_HEAD(&(dma_ctrlr->running)); list_add_tail(&(dma_ctrlr->list), diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index 2ca5126627cd..e74c4a953b2d 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c @@ -2421,6 +2421,10 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) mutex_init(&(dma_ctrlr->mtx)); dma_ctrlr->locked = 0; dma_ctrlr->number = i; + dma_ctrlr->route_attr = VME_DMA_VME_TO_MEM | + VME_DMA_MEM_TO_VME | VME_DMA_VME_TO_VME | + VME_DMA_MEM_TO_MEM | VME_DMA_PATTERN_TO_VME | + VME_DMA_PATTERN_TO_MEM; INIT_LIST_HEAD(&(dma_ctrlr->pending)); INIT_LIST_HEAD(&(dma_ctrlr->running)); list_add_tail(&(dma_ctrlr->list), |