From: Stephen Rothwell Make dma API handle PCI and VIO --- 25-akpm/arch/ppc64/kernel/Makefile | 2 25-akpm/arch/ppc64/kernel/dma.c | 184 ++++++++++++++++++++++++++++++++ 25-akpm/include/asm-ppc64/dma-mapping.h | 76 +++++++++++++ 3 files changed, 260 insertions(+), 2 deletions(-) diff -puN arch/ppc64/kernel/Makefile~ppc64-dma-functions arch/ppc64/kernel/Makefile --- 25/arch/ppc64/kernel/Makefile~ppc64-dma-functions 2004-03-14 15:32:37.206646472 -0800 +++ 25-akpm/arch/ppc64/kernel/Makefile 2004-03-14 15:32:37.210645864 -0800 @@ -5,7 +5,7 @@ EXTRA_CFLAGS += -mno-minimal-toc extra-y := head.o vmlinux.lds.s -obj-y := setup.o entry.o traps.o irq.o idle.o \ +obj-y := setup.o entry.o traps.o irq.o idle.o dma.o \ time.o process.o signal.o syscalls.o misc.o ptrace.o \ align.o semaphore.o bitops.o stab.o pacaData.o \ udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \ diff -puN /dev/null arch/ppc64/kernel/dma.c --- /dev/null 2003-09-15 06:40:47.000000000 -0700 +++ 25-akpm/arch/ppc64/kernel/dma.c 2004-03-14 15:32:37.211645712 -0800 @@ -0,0 +1,184 @@ +/* + * Copyright (C) 2004 IBM Corporation + * + * Implements the generic device dma API for ppc64. Handles + * the pci and vio busses + */ + +#include +#include +#include +/* Include the busses we support */ +#include +#ifdef CONFIG_PPC_PSERIES +#include +#endif +#include +#include + +int dma_supported(struct device *dev, u64 mask) +{ + if (dev->bus == &pci_bus_type) + return pci_dma_supported(to_pci_dev(dev), mask); +#ifdef CONFIG_PPC_PSERIES + if (dev->bus == &vio_bus_type) + return vio_dma_supported(to_vio_dev(dev), mask); +#endif + BUG(); + return 0; +} +EXPORT_SYMBOL(dma_supported); + +int dma_set_mask(struct device *dev, u64 dma_mask) +{ + if (dev->bus == &pci_bus_type) + return pci_set_dma_mask(to_pci_dev(dev), dma_mask); +#ifdef CONFIG_PPC_PSERIES + if (dev->bus == &vio_bus_type) + return vio_set_dma_mask(to_vio_dev(dev), dma_mask); +#endif + BUG(); + return 0; +} +EXPORT_SYMBOL(dma_set_mask); + +void *dma_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *dma_handle, int flag) +{ + if (dev->bus == &pci_bus_type) + return pci_alloc_consistent(to_pci_dev(dev), size, dma_handle); +#ifdef CONFIG_PPC_PSERIES + if (dev->bus == &vio_bus_type) + return vio_alloc_consistent(to_vio_dev(dev), size, dma_handle); +#endif + BUG(); + return 0; +} +EXPORT_SYMBOL(dma_alloc_coherent); + +void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, + dma_addr_t dma_handle) +{ + if (dev->bus == &pci_bus_type) + pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle); +#ifdef CONFIG_PPC_PSERIES + else if (dev->bus == &vio_bus_type) + vio_free_consistent(to_vio_dev(dev), size, cpu_addr, dma_handle); +#endif + else + BUG(); +} +EXPORT_SYMBOL(dma_free_coherent); + +dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, size_t size, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction); +#ifdef CONFIG_PPC_PSERIES + if (dev->bus == &vio_bus_type) + return vio_map_single(to_vio_dev(dev), cpu_addr, size, (int)direction); +#endif + BUG(); + return (dma_addr_t)0; +} +EXPORT_SYMBOL(dma_map_single); + +void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction); +#ifdef CONFIG_PPC_PSERIES + else if (dev->bus == &vio_bus_type) + vio_unmap_single(to_vio_dev(dev), dma_addr, size, (int)direction); +#endif + else + BUG(); +} +EXPORT_SYMBOL(dma_unmap_single); + +dma_addr_t dma_map_page(struct device *dev, struct page *page, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction); +#ifdef CONFIG_PPC_PSERIES + if (dev->bus == &vio_bus_type) + return vio_map_page(to_vio_dev(dev), page, offset, size, (int)direction); +#endif + BUG(); + return (dma_addr_t)0; +} +EXPORT_SYMBOL(dma_map_page); + +void dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction); +#ifdef CONFIG_PPC_PSERIES + else if (dev->bus == &vio_bus_type) + vio_unmap_page(to_vio_dev(dev), dma_address, size, (int)direction); +#endif + else + BUG(); +} +EXPORT_SYMBOL(dma_unmap_page); + +int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction); +#ifdef CONFIG_PPC_PSERIES + if (dev->bus == &vio_bus_type) + return vio_map_sg(to_vio_dev(dev), sg, nents, (int)direction); +#endif + BUG(); + return 0; +} +EXPORT_SYMBOL(dma_map_sg); + +void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction); +#ifdef CONFIG_PPC_PSERIES + else if (dev->bus == &vio_bus_type) + vio_unmap_sg(to_vio_dev(dev), sg, nhwentries, (int)direction); +#endif + else + BUG(); +} +EXPORT_SYMBOL(dma_unmap_sg); + +void dma_sync_single(struct device *dev, dma_addr_t dma_handle, size_t size, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + pci_dma_sync_single(to_pci_dev(dev), dma_handle, size, (int)direction); +#ifdef CONFIG_PPC_PSERIES + else if (dev->bus == &vio_bus_type) + vio_dma_sync_single(to_vio_dev(dev), dma_handle, size, (int)direction); +#endif + else + BUG(); +} +EXPORT_SYMBOL(dma_sync_single); + +void dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems, + enum dma_data_direction direction) +{ + if (dev->bus == &pci_bus_type) + pci_dma_sync_sg(to_pci_dev(dev), sg, nelems, (int)direction); +#ifdef CONFIG_PPC_PSERIES + else if (dev->bus == &vio_bus_type) + vio_dma_sync_sg(to_vio_dev(dev), sg, nelems, (int)direction); +#endif + else + BUG(); +} +EXPORT_SYMBOL(dma_sync_sg); diff -puN include/asm-ppc64/dma-mapping.h~ppc64-dma-functions include/asm-ppc64/dma-mapping.h --- 25/include/asm-ppc64/dma-mapping.h~ppc64-dma-functions 2004-03-14 15:32:37.208646168 -0800 +++ 25-akpm/include/asm-ppc64/dma-mapping.h 2004-03-14 15:32:37.212645560 -0800 @@ -1 +1,75 @@ -#include +/* Copyright (C) 2004 IBM + * + * Implements the generic device dma API for ppc64. Handles + * the pci and vio busses + */ + +#ifndef _ASM_DMA_MAPPING_H +#define _ASM_DMA_MAPPING_H + +#include +#include +#include +/* need struct page definitions */ +#include +#include +#include + +extern int dma_supported(struct device *dev, u64 mask); +extern int dma_set_mask(struct device *dev, u64 dma_mask); +extern void *dma_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *dma_handle, int flag); +extern void dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, + dma_addr_t dma_handle); +extern dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, + size_t size, enum dma_data_direction direction); +extern void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, + size_t size, enum dma_data_direction direction); +extern dma_addr_t dma_map_page(struct device *dev, struct page *page, + unsigned long offset, size_t size, + enum dma_data_direction direction); +extern void dma_unmap_page(struct device *dev, dma_addr_t dma_address, + size_t size, enum dma_data_direction direction); +extern int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, + enum dma_data_direction direction); +extern void dma_unmap_sg(struct device *dev, struct scatterlist *sg, + int nhwentries, enum dma_data_direction direction); +extern void dma_sync_single(struct device *dev, dma_addr_t dma_handle, + size_t size, enum dma_data_direction direction); +extern void dma_sync_sg(struct device *dev, struct scatterlist *sg, int nelems, + enum dma_data_direction direction); + +/* Now for the API extensions over the pci_ one */ + +#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) +#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) +#define dma_is_consistent(d) (1) + +static inline int +dma_get_cache_alignment(void) +{ + /* no easy way to get cache size on all processors, so return + * the maximum possible, to be safe */ + return (1 << L1_CACHE_SHIFT_MAX); +} + +static inline void +dma_sync_single_range(struct device *dev, dma_addr_t dma_handle, + unsigned long offset, size_t size, + enum dma_data_direction direction) +{ + /* just sync everything, that's all the pci API can do */ + dma_sync_single(dev, dma_handle, offset+size, direction); +} + +static inline void +dma_cache_sync(void *vaddr, size_t size, + enum dma_data_direction direction) +{ + /* could define this in terms of the dma_cache ... operations, + * but if you get this on a platform, you should convert the platform + * to using the generic device DMA API */ + BUG(); +} + +#endif /* _ASM_DMA_MAPPING_H */ _