diff options
author | FUJITA Tomonori <tomof@acm.org> | 2008-02-05 01:28:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:12 -0500 |
commit | 59fc67dedb46c29442989e52af39da67aea52512 (patch) | |
tree | d75eb8ce840e1f9d2a2e2dd939e28396750186fb /include/linux | |
parent | d22a6966b8029913fac37d078ab2403898d94c63 (diff) |
iommu sg merging: PCI: add dma segment boundary support
This adds PCI's accessor for segment_boundary_mask in device_dma_parameters.
The default segment_boundary is set to 0xffffffff, same to the block layer's
default value (and the scsi mid layer uses the same value).
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Greg KH <greg@kroah.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/pci.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index ba3a7f459da4..7215d3b1f4af 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -583,6 +583,7 @@ void pci_msi_off(struct pci_dev *dev); | |||
583 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask); | 583 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask); |
584 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); | 584 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask); |
585 | int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size); | 585 | int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size); |
586 | int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask); | ||
586 | int pcix_get_max_mmrbc(struct pci_dev *dev); | 587 | int pcix_get_max_mmrbc(struct pci_dev *dev); |
587 | int pcix_get_mmrbc(struct pci_dev *dev); | 588 | int pcix_get_mmrbc(struct pci_dev *dev); |
588 | int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc); | 589 | int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc); |
@@ -831,6 +832,12 @@ static inline int pci_set_dma_max_seg_size(struct pci_dev *dev, | |||
831 | return -EIO; | 832 | return -EIO; |
832 | } | 833 | } |
833 | 834 | ||
835 | static inline int pci_set_dma_seg_boundary(struct pci_dev *dev, | ||
836 | unsigned long mask) | ||
837 | { | ||
838 | return -EIO; | ||
839 | } | ||
840 | |||
834 | static inline int pci_assign_resource(struct pci_dev *dev, int i) | 841 | static inline int pci_assign_resource(struct pci_dev *dev, int i) |
835 | { | 842 | { |
836 | return -EBUSY; | 843 | return -EBUSY; |