diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-11-11 06:25:02 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 09:38:40 (GMT) |
| commit | 12d04eef927bf61328af2c7cbe756c96f98ac3bf (patch) | |
| tree | 18865369100e9059c7e883dec93ea67f7b52a287 /include/asm-powerpc/pci.h | |
| parent | 7c719871ff4d5f15b71f0138d08b758281b58631 (diff) | |
| download | linux-12d04eef927bf61328af2c7cbe756c96f98ac3bf.tar.xz | |
[POWERPC] Refactor 64 bits DMA operations
This patch completely refactors DMA operations for 64 bits powerpc. 32 bits
is untouched for now.
We use the new dev_archdata structure to add the dma operations pointer
and associated data to struct device. While at it, we also add the OF node
pointer and numa node. In the future, we might want to look into merging
that with pci_dn as well.
The old vio, pci-iommu and pci-direct DMA ops are gone. They are now replaced
by a set of generic iommu and direct DMA ops (non PCI specific) that can be
used by bus types. The toplevel implementation is now inline.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/pci.h')
| -rw-r--r-- | include/asm-powerpc/pci.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h index c772860..16f1331 100644 --- a/include/asm-powerpc/pci.h +++ b/include/asm-powerpc/pci.h @@ -70,15 +70,15 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) */ #define PCI_DISABLE_MWI -extern struct dma_mapping_ops pci_dma_ops; +extern struct dma_mapping_ops *pci_dma_ops; /* For DAC DMA, we currently don't support it by default, but * we let 64-bit platforms override this. */ static inline int pci_dac_dma_supported(struct pci_dev *hwdev,u64 mask) { - if (pci_dma_ops.dac_dma_supported) - return pci_dma_ops.dac_dma_supported(&hwdev->dev, mask); + if (pci_dma_ops && pci_dma_ops->dac_dma_supported) + return pci_dma_ops->dac_dma_supported(&hwdev->dev, mask); return 0; } @@ -210,6 +210,8 @@ extern int remap_bus_range(struct pci_bus *bus); extern void pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus); +extern void pcibios_setup_new_device(struct pci_dev *dev); + extern void pcibios_claim_one_bus(struct pci_bus *b); extern struct pci_controller *init_phb_dynamic(struct device_node *dn); |