redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[POWERPC] Create and use set_pci_dma_ops 

This will allow us to build without PCI easier.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
hifive-unleashed-5.1
Stephen Rothwell 2007-03-04 16:58:39 +11:00 committed by Paul Mackerras
parent 618d3adc35
commit 9874777016
8 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/pci_64.c
View File

@ -70,6 +70,11 @@ int global_phb_number; /* Global phb counter */
struct pci_dev *ppc64_isabridge_dev = NULL;
EXPORT_SYMBOL_GPL(ppc64_isabridge_dev);
void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)
{
pci_dma_ops = dma_ops;
}
static void fixup_broken_pcnet32(struct pci_dev* dev)
{
if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {

4
arch/powerpc/platforms/cell/iommu.c
View File

@ -646,7 +646,7 @@ static int __init cell_iommu_init_disabled(void)
unsigned long base = 0, size;
/* When no iommu is present, we use direct DMA ops */
pci_dma_ops = &dma_direct_ops;
set_pci_dma_ops(&dma_direct_ops);
/* First make sure all IOC translation is turned off */
cell_disable_iommus();
@ -734,7 +734,7 @@ static int __init cell_iommu_init(void)
}
/* Setup default PCI iommu ops */
pci_dma_ops = &dma_iommu_ops;
set_pci_dma_ops(&dma_iommu_ops);
bail:
/* Register callbacks on OF platform device addition/removal

2
arch/powerpc/platforms/celleb/iommu.c
View File

@ -95,7 +95,7 @@ static int __init celleb_init_iommu(void)
return -ENODEV;
celleb_init_direct_mapping();
pci_dma_ops = &dma_direct_ops;
set_pci_dma_ops(&dma_direct_ops);
bus_register_notifier(&of_platform_bus_type, &celleb_of_bus_notifier);
return 0;

2
arch/powerpc/platforms/iseries/iommu.c
View File

@ -194,5 +194,5 @@ void iommu_init_early_iSeries(void)
ppc_md.tce_build = tce_build_iSeries;
ppc_md.tce_free = tce_free_iSeries;
pci_dma_ops = &dma_iommu_ops;
set_pci_dma_ops(&dma_iommu_ops);
}

4
arch/powerpc/platforms/pasemi/iommu.c
View File

@ -255,7 +255,7 @@ void iommu_init_early_pasemi(void)
/* Direct I/O, IOMMU off */
ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_null;
ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_null;
pci_dma_ops = &dma_direct_ops;
set_pci_dma_ops(&dma_direct_ops);
return;
}
@ -266,7 +266,7 @@ void iommu_init_early_pasemi(void)
ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_pasemi;
ppc_md.tce_build = iobmap_build;
ppc_md.tce_free = iobmap_free;
pci_dma_ops = &dma_iommu_ops;
set_pci_dma_ops(&dma_iommu_ops);
}
void __init alloc_iobmap_l2(void)

4
arch/powerpc/platforms/pseries/iommu.c
View File

@ -562,7 +562,7 @@ void iommu_init_early_pSeries(void)
/* Direct I/O, IOMMU off */
ppc_md.pci_dma_dev_setup = NULL;
ppc_md.pci_dma_bus_setup = NULL;
pci_dma_ops = &dma_direct_ops;
set_pci_dma_ops(&dma_direct_ops);
return;
}
@ -588,6 +588,6 @@ void iommu_init_early_pSeries(void)
pSeries_reconfig_notifier_register(&iommu_reconfig_nb);
pci_dma_ops = &dma_iommu_ops;
set_pci_dma_ops(&dma_iommu_ops);
}

4
arch/powerpc/sysdev/dart_iommu.c
View File

@ -333,7 +333,7 @@ void iommu_init_early_dart(void)
ppc_md.pci_dma_bus_setup = pci_dma_bus_setup_dart;
/* Setup pci_dma ops */
pci_dma_ops = &dma_iommu_ops;
set_pci_dma_ops(&dma_iommu_ops);
return;
}
@ -343,7 +343,7 @@ void iommu_init_early_dart(void)
ppc_md.pci_dma_bus_setup = NULL;
/* Setup pci_dma ops */
pci_dma_ops = &dma_direct_ops;
set_pci_dma_ops(&dma_direct_ops);
}

6
include/asm-powerpc/pci.h
View File

@ -70,8 +70,11 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
*/
#define PCI_DISABLE_MWI
#ifdef CONFIG_PCI
extern struct dma_mapping_ops *pci_dma_ops;
extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops);
/* For DAC DMA, we currently don't support it by default, but
* we let 64-bit platforms override this.
*/
@ -82,7 +85,6 @@ static inline int pci_dac_dma_supported(struct pci_dev *hwdev,u64 mask)
return 0;
}
#ifdef CONFIG_PCI
static inline void pci_dma_burst_advice(struct pci_dev *pdev,
enum pci_dma_burst_strategy *strat,
unsigned long *strategy_parameter)
@ -99,6 +101,8 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
*strat = PCI_DMA_BURST_MULTIPLE;
*strategy_parameter = cacheline_size;
}
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#endif
extern int pci_domain_nr(struct pci_bus *bus);