lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc: Replace sbus_map_single and sbus_unmap_single with sbus_map_page and sbus_unmap_page

Browse Source 
This is a preparation for using asm-generic/pci-dma-compat.h;
SPARC32 has two dma_map_ops structures for pci and sbus
(removing arch/sparc/kernel/dma.c, PCI and SBUS DMA accessor).

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: Robert Reif <reif@earthlink.net>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: tony.luck@intel.com
Cc: fenghua.yu@intel.com
LKML-Reference: <1249872797-1314-7-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
FUJITA Tomonori
2009-08-10 11:53:15 +09:00
committed by Ingo Molnar
parent 595cc85607
commit c2c07dbd87
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc/kernel/dma.c
View File

@@ -68,8 +68,7 @@ static dma_addr_t dma32_map_page(struct device *dev, struct page *page,
return pci_map_page(to_pci_dev(dev), page, offset, return pci_map_page(to_pci_dev(dev), page, offset,
size, (int)direction); size, (int)direction);
#endif #endif
return sbus_map_single(dev, page_address(page) + offset, return sbus_map_page(dev, page, offset, size, (int)direction);
size, (int)direction);
} }
static void dma32_unmap_page(struct device *dev, dma_addr_t dma_address, static void dma32_unmap_page(struct device *dev, dma_addr_t dma_address,
@@ -83,7 +82,7 @@ static void dma32_unmap_page(struct device *dev, dma_addr_t dma_address,
return; return;
} }
#endif #endif
sbus_unmap_single(dev, dma_address, size, (int)direction); sbus_unmap_page(dev, dma_address, size, (int)direction);
} }
static int dma32_map_sg(struct device *dev, struct scatterlist *sg, static int dma32_map_sg(struct device *dev, struct scatterlist *sg,

6
arch/sparc/kernel/dma.h
View File

@@ -1,8 +1,8 @@
void *sbus_alloc_consistent(struct device *dev, long len, u32 *dma_addrp); void *sbus_alloc_consistent(struct device *dev, long len, u32 *dma_addrp);
void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba); void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba);
dma_addr_t sbus_map_single(struct device *dev, void *va, dma_addr_t sbus_map_page(struct device *dev, struct page *page,
size_t len, int direction); unsigned long offset, size_t len, int direction);
void sbus_unmap_single(struct device *dev, dma_addr_t ba, void sbus_unmap_page(struct device *dev, dma_addr_t ba,
size_t n, int direction); size_t n, int direction);
int sbus_map_sg(struct device *dev, struct scatterlist *sg, int sbus_map_sg(struct device *dev, struct scatterlist *sg,
int n, int direction); int n, int direction);

7
arch/sparc/kernel/ioport.c
View File

@@ -337,8 +337,11 @@ void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba)
* CPU view of this memory may be inconsistent with * CPU view of this memory may be inconsistent with
* a device view and explicit flushing is necessary. * a device view and explicit flushing is necessary.
*/ */
dma_addr_t sbus_map_single(struct device *dev, void *va, size_t len, int direction) dma_addr_t sbus_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t len, int direction)
{ {
void *va = page_address(page) + offset;
/* XXX why are some lengths signed, others unsigned? */ /* XXX why are some lengths signed, others unsigned? */
if (len <= 0) { if (len <= 0) {
return 0; return 0;
@@ -350,7 +353,7 @@ dma_addr_t sbus_map_single(struct device *dev, void *va, size_t len, int directi
return mmu_get_scsi_one(dev, va, len); return mmu_get_scsi_one(dev, va, len);
} }
void sbus_unmap_single(struct device *dev, dma_addr_t ba, size_t n, int direction) void sbus_unmap_page(struct device *dev, dma_addr_t ba, size_t n, int direction)
{ {
mmu_release_scsi_one(dev, ba, n); mmu_release_scsi_one(dev, ba, n);
} }