diff options
-rw-r--r-- | drivers/pci/pci.c | 8 | ||||
-rw-r--r-- | drivers/pci/probe.c | 1 | ||||
-rw-r--r-- | include/linux/pci.h | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index be97090ddf32..ae3df46eaabf 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -1459,6 +1459,14 @@ int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size) | |||
1459 | EXPORT_SYMBOL(pci_set_dma_max_seg_size); | 1459 | EXPORT_SYMBOL(pci_set_dma_max_seg_size); |
1460 | #endif | 1460 | #endif |
1461 | 1461 | ||
1462 | #ifndef HAVE_ARCH_PCI_SET_DMA_SEGMENT_BOUNDARY | ||
1463 | int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask) | ||
1464 | { | ||
1465 | return dma_set_seg_boundary(&dev->dev, mask); | ||
1466 | } | ||
1467 | EXPORT_SYMBOL(pci_set_dma_seg_boundary); | ||
1468 | #endif | ||
1469 | |||
1462 | /** | 1470 | /** |
1463 | * pcix_get_max_mmrbc - get PCI-X maximum designed memory read byte count | 1471 | * pcix_get_max_mmrbc - get PCI-X maximum designed memory read byte count |
1464 | * @dev: PCI device to query | 1472 | * @dev: PCI device to query |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index f47d596d5ebc..4d23b9fb551b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -937,6 +937,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) | |||
937 | dev->dev.coherent_dma_mask = 0xffffffffull; | 937 | dev->dev.coherent_dma_mask = 0xffffffffull; |
938 | 938 | ||
939 | pci_set_dma_max_seg_size(dev, 65536); | 939 | pci_set_dma_max_seg_size(dev, 65536); |
940 | pci_set_dma_seg_boundary(dev, 0xffffffff); | ||
940 | 941 | ||
941 | /* Fix up broken headers */ | 942 | /* Fix up broken headers */ |
942 | pci_fixup_device(pci_fixup_header, dev); | 943 | pci_fixup_device(pci_fixup_header, dev); |
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; |