diff options
Diffstat (limited to 'drivers/rapidio/devices/tsi721.h')
-rw-r--r-- | drivers/rapidio/devices/tsi721.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/rapidio/devices/tsi721.h b/drivers/rapidio/devices/tsi721.h index 0305675270ee..a7b42680a06a 100644 --- a/drivers/rapidio/devices/tsi721.h +++ b/drivers/rapidio/devices/tsi721.h | |||
@@ -644,27 +644,26 @@ enum tsi721_smsg_int_flag { | |||
644 | 644 | ||
645 | #ifdef CONFIG_RAPIDIO_DMA_ENGINE | 645 | #ifdef CONFIG_RAPIDIO_DMA_ENGINE |
646 | 646 | ||
647 | #define TSI721_BDMA_BD_RING_SZ 128 | ||
648 | #define TSI721_BDMA_MAX_BCOUNT (TSI721_DMAD_BCOUNT1 + 1) | 647 | #define TSI721_BDMA_MAX_BCOUNT (TSI721_DMAD_BCOUNT1 + 1) |
649 | 648 | ||
650 | struct tsi721_tx_desc { | 649 | struct tsi721_tx_desc { |
651 | struct dma_async_tx_descriptor txd; | 650 | struct dma_async_tx_descriptor txd; |
652 | struct tsi721_dma_desc *hw_desc; | ||
653 | u16 destid; | 651 | u16 destid; |
654 | /* low 64-bits of 66-bit RIO address */ | 652 | /* low 64-bits of 66-bit RIO address */ |
655 | u64 rio_addr; | 653 | u64 rio_addr; |
656 | /* upper 2-bits of 66-bit RIO address */ | 654 | /* upper 2-bits of 66-bit RIO address */ |
657 | u8 rio_addr_u; | 655 | u8 rio_addr_u; |
658 | u32 bcount; | 656 | enum dma_rtype rtype; |
659 | bool interrupt; | ||
660 | struct list_head desc_node; | 657 | struct list_head desc_node; |
661 | struct list_head tx_list; | 658 | struct scatterlist *sg; |
659 | unsigned int sg_len; | ||
660 | enum dma_status status; | ||
662 | }; | 661 | }; |
663 | 662 | ||
664 | struct tsi721_bdma_chan { | 663 | struct tsi721_bdma_chan { |
665 | int id; | 664 | int id; |
666 | void __iomem *regs; | 665 | void __iomem *regs; |
667 | int bd_num; /* number of buffer descriptors */ | 666 | int bd_num; /* number of HW buffer descriptors */ |
668 | void *bd_base; /* start of DMA descriptors */ | 667 | void *bd_base; /* start of DMA descriptors */ |
669 | dma_addr_t bd_phys; | 668 | dma_addr_t bd_phys; |
670 | void *sts_base; /* start of DMA BD status FIFO */ | 669 | void *sts_base; /* start of DMA BD status FIFO */ |
@@ -680,7 +679,6 @@ struct tsi721_bdma_chan { | |||
680 | struct list_head active_list; | 679 | struct list_head active_list; |
681 | struct list_head queue; | 680 | struct list_head queue; |
682 | struct list_head free_list; | 681 | struct list_head free_list; |
683 | dma_cookie_t completed_cookie; | ||
684 | struct tasklet_struct tasklet; | 682 | struct tasklet_struct tasklet; |
685 | bool active; | 683 | bool active; |
686 | }; | 684 | }; |