diff options
author | Christoph Hellwig <hch@infradead.org> | 2011-04-02 12:15:04 (GMT) |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 11:00:37 (GMT) |
commit | bc5c96748a5f2067193faa8131b2aa5f9775d309 (patch) | |
tree | 509dc1a4e1cd2859f9c521af6c41b0a955226bc2 /drivers/scsi/isci/host.h | |
parent | 524b5f723be8a1d966c1285d69810bc461f181c2 (diff) | |
download | linux-fsl-qoriq-bc5c96748a5f2067193faa8131b2aa5f9775d309.tar.xz |
isci: simplify dma coherent allocation
Remove the insane infrastructure for preallocating coheren DMA regions,
and just allocate the memory where needed. This also gets rid of the
aligment adjustments given that Documentation/DMA-API-HOWTO.txt sais:
"The cpu return address and the DMA bus master address are both
guaranteed to be aligned to the smallest PAGE_SIZE order which
is greater than or equal to the requested size. This invariant
exists (for example) to guarantee that if you allocate a chunk
which is smaller than or equal to 64 kilobytes, the extent of the
buffer you receive will not cross a 64K boundary."
Signed-off-by: Christoph Hellwig <hch@lst.de>
[djbw: moved allocation from start to init, re-add memset]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/host.h')
-rw-r--r-- | drivers/scsi/isci/host.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index 8372094..6e66074 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h @@ -75,14 +75,6 @@ #define ISCI_CAN_QUEUE_VAL 250 /* < SCI_MAX_IO_REQUESTS ? */ #define SCIC_CONTROLLER_STOP_TIMEOUT 5000 -struct coherent_memory_info { - struct list_head node; - dma_addr_t dma_handle; - void *vaddr; - size_t size; - struct sci_physical_memory_descriptor *mde; -}; - struct isci_host { struct scic_sds_controller *core_controller; union scic_oem_parameters oem_parameters; @@ -114,7 +106,6 @@ struct isci_host { wait_queue_head_t eventq; struct Scsi_Host *shost; struct tasklet_struct completion_tasklet; - struct list_head mdl_struct_list; struct list_head requests_to_complete; struct list_head requests_to_errorback; spinlock_t scic_lock; |