Skip to content

L
linux
Commit 7a715f46 authored by David S. Miller's avatar David S. Miller
Browse files
Options

sparc: Make SBUS DMA interfaces take struct device. 

This is the first step in converting all the SBUS drivers
over to generic dma_*().
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57780028
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 156 deletions
arch/sparc/include/asm/sbus_32.h
View file @ 7a715f46
...@@ -109,8 +109,8 @@ extern void sbus_set_sbus64(struct sbus_dev *, int); ...@@ -109,8 +109,8 @@ extern void sbus_set_sbus64(struct sbus_dev *, int);
extern void sbus_fill_device_irq(struct sbus_dev *); extern void sbus_fill_device_irq(struct sbus_dev *);
/* These yield IOMMU mappings in consistent mode. */ /* These yield IOMMU mappings in consistent mode. */
extern void *sbus_alloc_consistent(struct sbus_dev *, long, u32 *dma_addrp); extern void *sbus_alloc_consistent(struct device *, long, u32 *dma_addrp);
extern void sbus_free_consistent(struct sbus_dev *, long, void *, u32); extern void sbus_free_consistent(struct device *, long, void *, u32);
void prom_adjust_ranges(struct linux_prom_ranges *, int, void prom_adjust_ranges(struct linux_prom_ranges *, int,
struct linux_prom_ranges *, int); struct linux_prom_ranges *, int);
...@@ -120,18 +120,14 @@ void prom_adjust_ranges(struct linux_prom_ranges *, int, ...@@ -120,18 +120,14 @@ void prom_adjust_ranges(struct linux_prom_ranges *, int,
#define SBUS_DMA_NONE DMA_NONE #define SBUS_DMA_NONE DMA_NONE
/* All the rest use streaming mode mappings. */ /* All the rest use streaming mode mappings. */
extern dma_addr_t sbus_map_single(struct sbus_dev *, void *, size_t, int); extern dma_addr_t sbus_map_single(struct device *, void *, size_t, int);
extern void sbus_unmap_single(struct sbus_dev *, dma_addr_t, size_t, int); extern void sbus_unmap_single(struct device *, dma_addr_t, size_t, int);
extern int sbus_map_sg(struct sbus_dev *, struct scatterlist *, int, int); extern int sbus_map_sg(struct device *, struct scatterlist *, int, int);
extern void sbus_unmap_sg(struct sbus_dev *, struct scatterlist *, int, int); extern void sbus_unmap_sg(struct device *, struct scatterlist *, int, int);
/* Finally, allow explicit synchronization of streamable mappings. */ /* Finally, allow explicit synchronization of streamable mappings. */
extern void sbus_dma_sync_single_for_cpu(struct sbus_dev *, dma_addr_t, size_t, int); extern void sbus_dma_sync_single_for_cpu(struct device *, dma_addr_t, size_t, int);
#define sbus_dma_sync_single sbus_dma_sync_single_for_cpu extern void sbus_dma_sync_single_for_device(struct device *, dma_addr_t, size_t, int);
extern void sbus_dma_sync_single_for_device(struct sbus_dev *, dma_addr_t, size_t, int);
extern void sbus_dma_sync_sg_for_cpu(struct sbus_dev *, struct scatterlist *, int, int);
#define sbus_dma_sync_sg sbus_dma_sync_sg_for_cpu
extern void sbus_dma_sync_sg_for_device(struct sbus_dev *, struct scatterlist *, int, int);
/* Eric Brower (ebrower@usa.net) /* Eric Brower (ebrower@usa.net)
* Translate SBus interrupt levels to ino values-- * Translate SBus interrupt levels to ino values--
......
arch/sparc/include/asm/sbus_64.h
View file @ 7a715f46
...@@ -100,17 +100,16 @@ extern struct sbus_bus *sbus_root; ...@@ -100,17 +100,16 @@ extern struct sbus_bus *sbus_root;
extern void sbus_set_sbus64(struct sbus_dev *, int); extern void sbus_set_sbus64(struct sbus_dev *, int);
extern void sbus_fill_device_irq(struct sbus_dev *); extern void sbus_fill_device_irq(struct sbus_dev *);
static inline void *sbus_alloc_consistent(struct sbus_dev *sdev , size_t size, static inline void *sbus_alloc_consistent(struct device *dev , size_t size,
dma_addr_t *dma_handle) dma_addr_t *dma_handle)
{ {
return dma_alloc_coherent(&sdev->ofdev.dev, size, return dma_alloc_coherent(dev, size, dma_handle, GFP_ATOMIC);
dma_handle, GFP_ATOMIC);
} }
static inline void sbus_free_consistent(struct sbus_dev *sdev, size_t size, static inline void sbus_free_consistent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle) void *vaddr, dma_addr_t dma_handle)
{ {
return dma_free_coherent(&sdev->ofdev.dev, size, vaddr, dma_handle); return dma_free_coherent(dev, size, vaddr, dma_handle);
} }
#define SBUS_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL #define SBUS_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL
...@@ -119,68 +118,51 @@ static inline void sbus_free_consistent(struct sbus_dev *sdev, size_t size, ...@@ -119,68 +118,51 @@ static inline void sbus_free_consistent(struct sbus_dev *sdev, size_t size,
#define SBUS_DMA_NONE DMA_NONE #define SBUS_DMA_NONE DMA_NONE
/* All the rest use streaming mode mappings. */ /* All the rest use streaming mode mappings. */
static inline dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *ptr, static inline dma_addr_t sbus_map_single(struct device *dev, void *ptr,
size_t size, int direction) size_t size, int direction)
{ {
return dma_map_single(&sdev->ofdev.dev, ptr, size, return dma_map_single(dev, ptr, size,
(enum dma_data_direction) direction); (enum dma_data_direction) direction);
} }
static inline void sbus_unmap_single(struct sbus_dev *sdev, static inline void sbus_unmap_single(struct device *dev,
dma_addr_t dma_addr, size_t size, dma_addr_t dma_addr, size_t size,
int direction) int direction)
{ {
dma_unmap_single(&sdev->ofdev.dev, dma_addr, size, dma_unmap_single(dev, dma_addr, size,
(enum dma_data_direction) direction); (enum dma_data_direction) direction);
} }
static inline int sbus_map_sg(struct sbus_dev *sdev, struct scatterlist *sg, static inline int sbus_map_sg(struct device *dev, struct scatterlist *sg,
int nents, int direction) int nents, int direction)
{ {
return dma_map_sg(&sdev->ofdev.dev, sg, nents, return dma_map_sg(dev, sg, nents,
(enum dma_data_direction) direction); (enum dma_data_direction) direction);
} }
static inline void sbus_unmap_sg(struct sbus_dev *sdev, struct scatterlist *sg, static inline void sbus_unmap_sg(struct device *dev, struct scatterlist *sg,
int nents, int direction) int nents, int direction)
{ {
dma_unmap_sg(&sdev->ofdev.dev, sg, nents, dma_unmap_sg(dev, sg, nents,
(enum dma_data_direction) direction); (enum dma_data_direction) direction);
} }
/* Finally, allow explicit synchronization of streamable mappings. */ /* Finally, allow explicit synchronization of streamable mappings. */
static inline void sbus_dma_sync_single_for_cpu(struct sbus_dev *sdev, static inline void sbus_dma_sync_single_for_cpu(struct device *dev,
dma_addr_t dma_handle, dma_addr_t dma_handle,
size_t size, int direction) size_t size, int direction)
{ {
dma_sync_single_for_cpu(&sdev->ofdev.dev, dma_handle, size, dma_sync_single_for_cpu(dev, dma_handle, size,
(enum dma_data_direction) direction); (enum dma_data_direction) direction);
} }
#define sbus_dma_sync_single sbus_dma_sync_single_for_cpu
static inline void sbus_dma_sync_single_for_device(struct sbus_dev *sdev, static inline void sbus_dma_sync_single_for_device(struct device *dev,
dma_addr_t dma_handle, dma_addr_t dma_handle,
size_t size, int direction) size_t size, int direction)
{ {
/* No flushing needed to sync cpu writes to the device. */ /* No flushing needed to sync cpu writes to the device. */
} }
static inline void sbus_dma_sync_sg_for_cpu(struct sbus_dev *sdev,
struct scatterlist *sg,
int nents, int direction)
{
dma_sync_sg_for_cpu(&sdev->ofdev.dev, sg, nents,
(enum dma_data_direction) direction);
}
#define sbus_dma_sync_sg sbus_dma_sync_sg_for_cpu
static inline void sbus_dma_sync_sg_for_device(struct sbus_dev *sdev,
struct scatterlist *sg,
int nents, int direction)
{
/* No flushing needed to sync cpu writes to the device. */
}
extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *); extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *);
extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *); extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *);
extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *); extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *);
......
arch/sparc/kernel/ioport.c
View file @ 7a715f46
...@@ -300,11 +300,10 @@ void __init sbus_fill_device_irq(struct sbus_dev *sdev) ...@@ -300,11 +300,10 @@ void __init sbus_fill_device_irq(struct sbus_dev *sdev)
* Allocate a chunk of memory suitable for DMA. * Allocate a chunk of memory suitable for DMA.
* Typically devices use them for control blocks. * Typically devices use them for control blocks.
* CPU may access them without any explicit flushing. * CPU may access them without any explicit flushing.
*
* XXX Some clever people know that sdev is not used and supply NULL. Watch.
*/ */
void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp) void *sbus_alloc_consistent(struct device *dev, long len, u32 *dma_addrp)
{ {
struct of_device *op = to_of_device(dev);
unsigned long len_total = (len + PAGE_SIZE-1) & PAGE_MASK; unsigned long len_total = (len + PAGE_SIZE-1) & PAGE_MASK;
unsigned long va; unsigned long va;
struct resource *res; struct resource *res;
...@@ -341,10 +340,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp) ...@@ -341,10 +340,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
if (mmu_map_dma_area(dma_addrp, va, res->start, len_total) != 0) if (mmu_map_dma_area(dma_addrp, va, res->start, len_total) != 0)
goto err_noiommu; goto err_noiommu;
/* Set the resource name, if known. */ res->name = op->node->name;
if (sdev) {
res->name = sdev->prom_name;
}
return (void *)(unsigned long)res->start; return (void *)(unsigned long)res->start;
...@@ -358,7 +354,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp) ...@@ -358,7 +354,7 @@ void *sbus_alloc_consistent(struct sbus_dev *sdev, long len, u32 *dma_addrp)
return NULL; return NULL;
} }
void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba) void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba)
{ {
struct resource *res; struct resource *res;
struct page *pgv; struct page *pgv;
...@@ -396,8 +392,10 @@ void sbus_free_consistent(struct sbus_dev *sdev, long n, void *p, u32 ba) ...@@ -396,8 +392,10 @@ void sbus_free_consistent(struct sbus_dev *sdev, 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 sbus_dev *sdev, void *va, size_t len, int direction) dma_addr_t sbus_map_single(struct device *dev, void *va, size_t len, int direction)
{ {
struct sbus_dev *sdev = to_sbus_device(dev);
/* 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;
...@@ -409,13 +407,16 @@ dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int dire ...@@ -409,13 +407,16 @@ dma_addr_t sbus_map_single(struct sbus_dev *sdev, void *va, size_t len, int dire
return mmu_get_scsi_one(va, len, sdev->bus); return mmu_get_scsi_one(va, len, sdev->bus);
} }
void sbus_unmap_single(struct sbus_dev *sdev, dma_addr_t ba, size_t n, int direction) void sbus_unmap_single(struct device *dev, dma_addr_t ba, size_t n, int direction)
{ {
struct sbus_dev *sdev = to_sbus_device(dev);
mmu_release_scsi_one(ba, n, sdev->bus); mmu_release_scsi_one(ba, n, sdev->bus);
} }
int sbus_map_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction) int sbus_map_sg(struct device *dev, struct scatterlist *sg, int n, int direction)
{ {
struct sbus_dev *sdev = to_sbus_device(dev);
mmu_get_scsi_sgl(sg, n, sdev->bus); mmu_get_scsi_sgl(sg, n, sdev->bus);
/* /*
...@@ -425,16 +426,19 @@ int sbus_map_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direct ...@@ -425,16 +426,19 @@ int sbus_map_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direct
return n; return n;
} }
void sbus_unmap_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction) void sbus_unmap_sg(struct device *dev, struct scatterlist *sg, int n, int direction)
{ {
struct sbus_dev *sdev = to_sbus_device(dev);
mmu_release_scsi_sgl(sg, n, sdev->bus); mmu_release_scsi_sgl(sg, n, sdev->bus);
} }
/* /*
*/ */
void sbus_dma_sync_single_for_cpu(struct sbus_dev *sdev, dma_addr_t ba, size_t size, int direction) void sbus_dma_sync_single_for_cpu(struct device *dev, dma_addr_t ba, size_t size, int direction)
{ {
#if 0 #if 0
struct sbus_dev *sdev = to_sbus_device(dev);
unsigned long va; unsigned long va;
struct resource *res; struct resource *res;
...@@ -452,9 +456,10 @@ void sbus_dma_sync_single_for_cpu(struct sbus_dev *sdev, dma_addr_t ba, size_t s ...@@ -452,9 +456,10 @@ void sbus_dma_sync_single_for_cpu(struct sbus_dev *sdev, dma_addr_t ba, size_t s
#endif #endif
} }
void sbus_dma_sync_single_for_device(struct sbus_dev *sdev, dma_addr_t ba, size_t size, int direction) void sbus_dma_sync_single_for_device(struct device *dev, dma_addr_t ba, size_t size, int direction)
{ {
#if 0 #if 0
struct sbus_dev *sdev = to_sbus_device(dev);
unsigned long va; unsigned long va;
struct resource *res; struct resource *res;
...@@ -472,16 +477,6 @@ void sbus_dma_sync_single_for_device(struct sbus_dev *sdev, dma_addr_t ba, size_ ...@@ -472,16 +477,6 @@ void sbus_dma_sync_single_for_device(struct sbus_dev *sdev, dma_addr_t ba, size_
#endif #endif
} }
void sbus_dma_sync_sg_for_cpu(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction)
{
printk("sbus_dma_sync_sg_for_cpu: not implemented yet\n");
}
void sbus_dma_sync_sg_for_device(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction)
{
printk("sbus_dma_sync_sg_for_device: not implemented yet\n");
}
/* Support code for sbus_init(). */ /* Support code for sbus_init(). */
/* /*
* XXX This functions appears to be a distorted version of * XXX This functions appears to be a distorted version of
......
arch/sparc/kernel/sparc_ksyms.c
View file @ 7a715f46
...@@ -163,8 +163,6 @@ EXPORT_SYMBOL(sbus_map_sg); ...@@ -163,8 +163,6 @@ EXPORT_SYMBOL(sbus_map_sg);
EXPORT_SYMBOL(sbus_unmap_sg); EXPORT_SYMBOL(sbus_unmap_sg);
EXPORT_SYMBOL(sbus_dma_sync_single_for_cpu); EXPORT_SYMBOL(sbus_dma_sync_single_for_cpu);
EXPORT_SYMBOL(sbus_dma_sync_single_for_device); EXPORT_SYMBOL(sbus_dma_sync_single_for_device);
EXPORT_SYMBOL(sbus_dma_sync_sg_for_cpu);
EXPORT_SYMBOL(sbus_dma_sync_sg_for_device);
EXPORT_SYMBOL(sbus_iounmap); EXPORT_SYMBOL(sbus_iounmap);
EXPORT_SYMBOL(sbus_ioremap); EXPORT_SYMBOL(sbus_ioremap);
#endif #endif
......
arch/sparc64/kernel/sparc64_ksyms.c
View file @ 7a715f46
...@@ -170,8 +170,6 @@ EXPORT_SYMBOL(sbus_map_sg); ...@@ -170,8 +170,6 @@ EXPORT_SYMBOL(sbus_map_sg);
EXPORT_SYMBOL(sbus_unmap_sg); EXPORT_SYMBOL(sbus_unmap_sg);
EXPORT_SYMBOL(sbus_dma_sync_single_for_cpu); EXPORT_SYMBOL(sbus_dma_sync_single_for_cpu);
EXPORT_SYMBOL(sbus_dma_sync_single_for_device); EXPORT_SYMBOL(sbus_dma_sync_single_for_device);
EXPORT_SYMBOL(sbus_dma_sync_sg_for_cpu);
EXPORT_SYMBOL(sbus_dma_sync_sg_for_device);
#endif #endif
EXPORT_SYMBOL(outsb); EXPORT_SYMBOL(outsb);
EXPORT_SYMBOL(outsw); EXPORT_SYMBOL(outsw);
......
drivers/atm/fore200e.c
View file @ 7a715f46
...@@ -678,7 +678,9 @@ fore200e_sba_write(u32 val, volatile u32 __iomem *addr) ...@@ -678,7 +678,9 @@ fore200e_sba_write(u32 val, volatile u32 __iomem *addr)
static u32 static u32
fore200e_sba_dma_map(struct fore200e* fore200e, void* virt_addr, int size, int direction) fore200e_sba_dma_map(struct fore200e* fore200e, void* virt_addr, int size, int direction)
{ {
u32 dma_addr = sbus_map_single((struct sbus_dev*)fore200e->bus_dev, virt_addr, size, direction); struct sbus_dev *sdev = fore200e->bus_dev;
struct device *dev = &sdev->ofdev.dev;
u32 dma_addr = sbus_map_single(dev, virt_addr, size, direction);
DPRINTK(3, "SBUS DVMA mapping: virt_addr = 0x%p, size = %d, direction = %d --> dma_addr = 0x%08x\n", DPRINTK(3, "SBUS DVMA mapping: virt_addr = 0x%p, size = %d, direction = %d --> dma_addr = 0x%08x\n",
virt_addr, size, direction, dma_addr); virt_addr, size, direction, dma_addr);
...@@ -690,27 +692,36 @@ fore200e_sba_dma_map(struct fore200e* fore200e, void* virt_addr, int size, int d ...@@ -690,27 +692,36 @@ fore200e_sba_dma_map(struct fore200e* fore200e, void* virt_addr, int size, int d
static void static void
fore200e_sba_dma_unmap(struct fore200e* fore200e, u32 dma_addr, int size, int direction) fore200e_sba_dma_unmap(struct fore200e* fore200e, u32 dma_addr, int size, int direction)
{ {
struct sbus_dev *sdev = fore200e->bus_dev;
struct device *dev = &sdev->ofdev.dev;
DPRINTK(3, "SBUS DVMA unmapping: dma_addr = 0x%08x, size = %d, direction = %d,\n", DPRINTK(3, "SBUS DVMA unmapping: dma_addr = 0x%08x, size = %d, direction = %d,\n",
dma_addr, size, direction); dma_addr, size, direction);
sbus_unmap_single((struct sbus_dev*)fore200e->bus_dev, dma_addr, size, direction); sbus_unmap_single(dev, dma_addr, size, direction);
} }
static void static void
fore200e_sba_dma_sync_for_cpu(struct fore200e* fore200e, u32 dma_addr, int size, int direction) fore200e_sba_dma_sync_for_cpu(struct fore200e* fore200e, u32 dma_addr, int size, int direction)
{ {
struct sbus_dev *sdev = fore200e->bus_dev;
struct device *dev = &sdev->ofdev.dev;
DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction); DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);
sbus_dma_sync_single_for_cpu((struct sbus_dev*)fore200e->bus_dev, dma_addr, size, direction); sbus_dma_sync_single_for_cpu(dev, dma_addr, size, direction);
} }
static void static void
fore200e_sba_dma_sync_for_device(struct fore200e* fore200e, u32 dma_addr, int size, int direction) fore200e_sba_dma_sync_for_device(struct fore200e* fore200e, u32 dma_addr, int size, int direction)
{ {
struct sbus_dev *sdev = fore200e->bus_dev;
struct device *dev = &sdev->ofdev.dev;
DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction); DPRINTK(3, "SBUS DVMA sync: dma_addr = 0x%08x, size = %d, direction = %d\n", dma_addr, size, direction);
sbus_dma_sync_single_for_device((struct sbus_dev*)fore200e->bus_dev, dma_addr, size, direction); sbus_dma_sync_single_for_device(dev, dma_addr, size, direction);
} }
...@@ -721,11 +732,13 @@ static int ...@@ -721,11 +732,13 @@ static int
fore200e_sba_dma_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk, fore200e_sba_dma_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk,
int size, int nbr, int alignment) int size, int nbr, int alignment)
{ {
struct sbus_dev *sdev = (struct sbus_dev *) fore200e->bus_dev;
struct device *dev = &sdev->ofdev.dev;
chunk->alloc_size = chunk->align_size = size * nbr; chunk->alloc_size = chunk->align_size = size * nbr;
/* returned chunks are page-aligned */ /* returned chunks are page-aligned */
chunk->alloc_addr = sbus_alloc_consistent((struct sbus_dev*)fore200e->bus_dev, chunk->alloc_addr = sbus_alloc_consistent(dev, chunk->alloc_size,
chunk->alloc_size,
&chunk->dma_addr); &chunk->dma_addr);
if ((chunk->alloc_addr == NULL) || (chunk->dma_addr == 0)) if ((chunk->alloc_addr == NULL) || (chunk->dma_addr == 0))
...@@ -742,10 +755,11 @@ fore200e_sba_dma_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk, ...@@ -742,10 +755,11 @@ fore200e_sba_dma_chunk_alloc(struct fore200e* fore200e, struct chunk* chunk,
static void static void
fore200e_sba_dma_chunk_free(struct fore200e* fore200e, struct chunk* chunk) fore200e_sba_dma_chunk_free(struct fore200e* fore200e, struct chunk* chunk)
{ {
sbus_free_consistent((struct sbus_dev*)fore200e->bus_dev, struct sbus_dev *sdev = (struct sbus_dev *) fore200e->bus_dev;
chunk->alloc_size, struct device *dev = &sdev->ofdev.dev;
chunk->alloc_addr,
chunk->dma_addr); sbus_free_consistent(dev, chunk->alloc_size,
chunk->alloc_addr, chunk->dma_addr);
} }
......
drivers/net/myri_sbus.c
View file @ 7a715f46
...@@ -243,7 +243,8 @@ static void myri_clean_rings(struct myri_eth *mp) ...@@ -243,7 +243,8 @@ static void myri_clean_rings(struct myri_eth *mp)
u32 dma_addr; u32 dma_addr;
dma_addr = sbus_readl(&rxd->myri_scatters[0].addr); dma_addr = sbus_readl(&rxd->myri_scatters[0].addr);
sbus_unmap_single(mp->myri_sdev, dma_addr, RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE); sbus_unmap_single(&mp->myri_sdev->ofdev.dev, dma_addr,
RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);
dev_kfree_skb(mp->rx_skbs[i]); dev_kfree_skb(mp->rx_skbs[i]);
mp->rx_skbs[i] = NULL; mp->rx_skbs[i] = NULL;
} }
...@@ -259,7 +260,9 @@ static void myri_clean_rings(struct myri_eth *mp) ...@@ -259,7 +260,9 @@ static void myri_clean_rings(struct myri_eth *mp)
u32 dma_addr; u32 dma_addr;
dma_addr = sbus_readl(&txd->myri_gathers[0].addr); dma_addr = sbus_readl(&txd->myri_gathers[0].addr);
sbus_unmap_single(mp->myri_sdev, dma_addr, (skb->len + 3) & ~3, SBUS_DMA_TODEVICE); sbus_unmap_single(&mp->myri_sdev->ofdev.dev, dma_addr,
(skb->len + 3) & ~3,
SBUS_DMA_TODEVICE);
dev_kfree_skb(mp->tx_skbs[i]); dev_kfree_skb(mp->tx_skbs[i]);
mp->tx_skbs[i] = NULL; mp->tx_skbs[i] = NULL;
} }
...@@ -288,7 +291,9 @@ static void myri_init_rings(struct myri_eth *mp, int from_irq) ...@@ -288,7 +291,9 @@ static void myri_init_rings(struct myri_eth *mp, int from_irq)
skb->dev = dev; skb->dev = dev;
skb_put(skb, RX_ALLOC_SIZE); skb_put(skb, RX_ALLOC_SIZE);
dma_addr = sbus_map_single(mp->myri_sdev, skb->data, RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE); dma_addr = sbus_map_single(&mp->myri_sdev->ofdev.dev,
skb->data, RX_ALLOC_SIZE,
SBUS_DMA_FROMDEVICE);
sbus_writel(dma_addr, &rxd[i].myri_scatters[0].addr); sbus_writel(dma_addr, &rxd[i].myri_scatters[0].addr);
sbus_writel(RX_ALLOC_SIZE, &rxd[i].myri_scatters[0].len); sbus_writel(RX_ALLOC_SIZE, &rxd[i].myri_scatters[0].len);
sbus_writel(i, &rxd[i].ctx); sbus_writel(i, &rxd[i].ctx);
...@@ -344,7 +349,8 @@ static void myri_tx(struct myri_eth *mp, struct net_device *dev) ...@@ -344,7 +349,8 @@ static void myri_tx(struct myri_eth *mp, struct net_device *dev)
DTX(("SKB[%d] ", entry)); DTX(("SKB[%d] ", entry));
dma_addr = sbus_readl(&sq->myri_txd[entry].myri_gathers[0].addr); dma_addr = sbus_readl(&sq->myri_txd[entry].myri_gathers[0].addr);
sbus_unmap_single(mp->myri_sdev, dma_addr, skb->len, SBUS_DMA_TODEVICE); sbus_unmap_single(&mp->myri_sdev->ofdev.dev, dma_addr,
skb->len, SBUS_DMA_TODEVICE);
dev_kfree_skb(skb); dev_kfree_skb(skb);
mp->tx_skbs[entry] = NULL; mp->tx_skbs[entry] = NULL;
dev->stats.tx_packets++; dev->stats.tx_packets++;
...@@ -423,7 +429,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev) ...@@ -423,7 +429,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
/* Check for errors. */ /* Check for errors. */
DRX(("rxd[%d]: %p len[%d] csum[%08x] ", entry, rxd, len, csum)); DRX(("rxd[%d]: %p len[%d] csum[%08x] ", entry, rxd, len, csum));
sbus_dma_sync_single_for_cpu(mp->myri_sdev, sbus_dma_sync_single_for_cpu(&mp->myri_sdev->ofdev.dev,
sbus_readl(&rxd->myri_scatters[0].addr), sbus_readl(&rxd->myri_scatters[0].addr),
RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE); RX_ALLOC_SIZE, SBUS_DMA_FROMDEVICE);
if (len < (ETH_HLEN + MYRI_PAD_LEN) || (skb->data[0] != MYRI_PAD_LEN)) { if (len < (ETH_HLEN + MYRI_PAD_LEN) || (skb->data[0] != MYRI_PAD_LEN)) {
...@@ -442,7 +448,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev) ...@@ -442,7 +448,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
drops++; drops++;
DRX(("DROP ")); DRX(("DROP "));
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
sbus_dma_sync_single_for_device(mp->myri_sdev, sbus_dma_sync_single_for_device(&mp->myri_sdev->ofdev.dev,
sbus_readl(&rxd->myri_scatters[0].addr), sbus_readl(&rxd->myri_scatters[0].addr),
RX_ALLOC_SIZE, RX_ALLOC_SIZE,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
...@@ -464,14 +470,14 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev) ...@@ -464,14 +470,14 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
DRX(("skb_alloc(FAILED) ")); DRX(("skb_alloc(FAILED) "));
goto drop_it; goto drop_it;
} }
sbus_unmap_single(mp->myri_sdev, sbus_unmap_single(&mp->myri_sdev->ofdev.dev,
sbus_readl(&rxd->myri_scatters[0].addr), sbus_readl(&rxd->myri_scatters[0].addr),
RX_ALLOC_SIZE, RX_ALLOC_SIZE,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
mp->rx_skbs[index] = new_skb; mp->rx_skbs[index] = new_skb;
new_skb->dev = dev; new_skb->dev = dev;
skb_put(new_skb, RX_ALLOC_SIZE); skb_put(new_skb, RX_ALLOC_SIZE);
dma_addr = sbus_map_single(mp->myri_sdev, dma_addr = sbus_map_single(&mp->myri_sdev->ofdev.dev,
new_skb->data, new_skb->data,
RX_ALLOC_SIZE, RX_ALLOC_SIZE,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
...@@ -500,7 +506,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev) ...@@ -500,7 +506,7 @@ static void myri_rx(struct myri_eth *mp, struct net_device *dev)
/* Reuse original ring buffer. */ /* Reuse original ring buffer. */
DRX(("reuse ")); DRX(("reuse "));
sbus_dma_sync_single_for_device(mp->myri_sdev, sbus_dma_sync_single_for_device(&mp->myri_sdev->ofdev.dev,
sbus_readl(&rxd->myri_scatters[0].addr), sbus_readl(&rxd->myri_scatters[0].addr),
RX_ALLOC_SIZE, RX_ALLOC_SIZE,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
...@@ -652,7 +658,8 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -652,7 +658,8 @@ static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)
sbus_writew((skb->data[4] << 8) | skb->data[5], &txd->addr[3]); sbus_writew((skb->data[4] << 8) | skb->data[5], &txd->addr[3]);
} }
dma_addr = sbus_map_single(mp->myri_sdev, skb->data, len, SBUS_DMA_TODEVICE); dma_addr = sbus_map_single(&mp->myri_sdev->ofdev.dev, skb->data,
len, SBUS_DMA_TODEVICE);
sbus_writel(dma_addr, &txd->myri_gathers[0].addr); sbus_writel(dma_addr, &txd->myri_gathers[0].addr);
sbus_writel(len, &txd->myri_gathers[0].len); sbus_writel(len, &txd->myri_gathers[0].len);
sbus_writel(1, &txd->num_sg); sbus_writel(1, &txd->num_sg);
......
drivers/net/sunbmac.c
View file @ 7a715f46
...@@ -239,7 +239,7 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq) ...@@ -239,7 +239,7 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq)
skb_reserve(skb, 34); skb_reserve(skb, 34);
bb->be_rxd[i].rx_addr = bb->be_rxd[i].rx_addr =
sbus_map_single(bp->bigmac_sdev, skb->data, sbus_map_single(&bp->bigmac_sdev->ofdev.dev, skb->data,
RX_BUF_ALLOC_SIZE - 34, RX_BUF_ALLOC_SIZE - 34,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
bb->be_rxd[i].rx_flags = bb->be_rxd[i].rx_flags =
...@@ -776,7 +776,7 @@ static void bigmac_tx(struct bigmac *bp) ...@@ -776,7 +776,7 @@ static void bigmac_tx(struct bigmac *bp)
skb = bp->tx_skbs[elem]; skb = bp->tx_skbs[elem];
bp->enet_stats.tx_packets++; bp->enet_stats.tx_packets++;
bp->enet_stats.tx_bytes += skb->len; bp->enet_stats.tx_bytes += skb->len;
sbus_unmap_single(bp->bigmac_sdev, sbus_unmap_single(&bp->bigmac_sdev->ofdev.dev,
this->tx_addr, skb->len, this->tx_addr, skb->len,
SBUS_DMA_TODEVICE); SBUS_DMA_TODEVICE);
...@@ -831,7 +831,7 @@ static void bigmac_rx(struct bigmac *bp) ...@@ -831,7 +831,7 @@ static void bigmac_rx(struct bigmac *bp)
drops++; drops++;
goto drop_it; goto drop_it;
} }
sbus_unmap_single(bp->bigmac_sdev, sbus_unmap_single(&bp->bigmac_sdev->ofdev.dev,
this->rx_addr, this->rx_addr,
RX_BUF_ALLOC_SIZE - 34, RX_BUF_ALLOC_SIZE - 34,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
...@@ -839,10 +839,11 @@ static void bigmac_rx(struct bigmac *bp) ...@@ -839,10 +839,11 @@ static void bigmac_rx(struct bigmac *bp)
new_skb->dev = bp->dev; new_skb->dev = bp->dev;
skb_put(new_skb, ETH_FRAME_LEN); skb_put(new_skb, ETH_FRAME_LEN);
skb_reserve(new_skb, 34); skb_reserve(new_skb, 34);
this->rx_addr = sbus_map_single(bp->bigmac_sdev, this->rx_addr =
new_skb->data, sbus_map_single(&bp->bigmac_sdev->ofdev.dev,
RX_BUF_ALLOC_SIZE - 34, new_skb->data,
SBUS_DMA_FROMDEVICE); RX_BUF_ALLOC_SIZE - 34,
SBUS_DMA_FROMDEVICE);
this->rx_flags = this->rx_flags =
(RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) & RXD_LENGTH)); (RXD_OWN | ((RX_BUF_ALLOC_SIZE - 34) & RXD_LENGTH));
...@@ -857,11 +858,11 @@ static void bigmac_rx(struct bigmac *bp) ...@@ -857,11 +858,11 @@ static void bigmac_rx(struct bigmac *bp)
} }
skb_reserve(copy_skb, 2); skb_reserve(copy_skb, 2);
skb_put(copy_skb, len); skb_put(copy_skb, len);
sbus_dma_sync_single_for_cpu(bp->bigmac_sdev, sbus_dma_sync_single_for_cpu(&bp->bigmac_sdev->ofdev.dev,
this->rx_addr, len, this->rx_addr, len,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
skb_copy_to_linear_data(copy_skb, (unsigned char *)skb->data, len); skb_copy_to_linear_data(copy_skb, (unsigned char *)skb->data, len);
sbus_dma_sync_single_for_device(bp->bigmac_sdev, sbus_dma_sync_single_for_device(&bp->bigmac_sdev->ofdev.dev,
this->rx_addr, len, this->rx_addr, len,
SBUS_DMA_FROMDEVICE); SBUS_DMA_FROMDEVICE);
...@@ -959,7 +960,8 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -959,7 +960,8 @@ static int bigmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
u32 mapping; u32 mapping;
len = skb->len; len = skb->len;
mapping = sbus_map_single(bp->bigmac_sdev, skb->data, len, SBUS_DMA_TODEVICE); mapping = sbus_map_single(&bp->bigmac_sdev->ofdev.dev, skb->data,
len, SBUS_DMA_TODEVICE);
/* Avoid a race... */ /* Avoid a race... */
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);
...@@ -1183,7 +1185,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev) ...@@ -1183,7 +1185,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
bigmac_stop(bp); bigmac_stop(bp);
/* Allocate transmit/receive descriptor DVMA block. */ /* Allocate transmit/receive descriptor DVMA block. */
bp->bmac_block = sbus_alloc_consistent(bp->bigmac_sdev, bp->bmac_block = sbus_alloc_consistent(&bp->bigmac_sdev->ofdev.dev,
PAGE_SIZE, PAGE_SIZE,
&bp->bblock_dvma); &bp->bblock_dvma);
if (bp->bmac_block == NULL || bp->bblock_dvma == 0) { if (bp->bmac_block == NULL || bp->bblock_dvma == 0) {
...@@ -1245,7 +1247,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev) ...@@ -1245,7 +1247,7 @@ static int __devinit bigmac_ether_init(struct sbus_dev *qec_sdev)
sbus_iounmap(bp->tregs, TCVR_REG_SIZE); sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
if (bp->bmac_block) if (bp->bmac_block)
sbus_free_consistent(bp->bigmac_sdev, sbus_free_consistent(&bp->bigmac_sdev->ofdev.dev,
PAGE_SIZE, PAGE_SIZE,
bp->bmac_block, bp->bmac_block,
bp->bblock_dvma); bp->bblock_dvma);
...@@ -1280,7 +1282,7 @@ static int __devexit bigmac_sbus_remove(struct of_device *dev) ...@@ -1280,7 +1282,7 @@ static int __devexit bigmac_sbus_remove(struct of_device *dev)
sbus_iounmap(bp->creg, CREG_REG_SIZE); sbus_iounmap(bp->creg, CREG_REG_SIZE);
sbus_iounmap(bp->bregs, BMAC_REG_SIZE); sbus_iounmap(bp->bregs, BMAC_REG_SIZE);
sbus_iounmap(bp->tregs, TCVR_REG_SIZE); sbus_iounmap(bp->tregs, TCVR_REG_SIZE);
sbus_free_consistent(bp->bigmac_sdev, sbus_free_consistent(&bp->bigmac_sdev->ofdev.dev,
PAGE_SIZE, PAGE_SIZE,
bp->bmac_block, bp->bmac_block,
bp->bblock_dvma); bp->bblock_dvma);
......
drivers/net/sunhme.c
View file @ 7a715f46
...@@ -251,13 +251,13 @@ static u32 pci_hme_read_desc32(hme32 *p) ...@@ -251,13 +251,13 @@ static u32 pci_hme_read_desc32(hme32 *p)
#define hme_read_desc32(__hp, __p) \ #define hme_read_desc32(__hp, __p) \
((__hp)->read_desc32(__p)) ((__hp)->read_desc32(__p))
#define hme_dma_map(__hp, __ptr, __size, __dir) \ #define hme_dma_map(__hp, __ptr, __size, __dir) \
((__hp)->dma_map((__hp)->happy_dev, (__ptr), (__size), (__dir))) ((__hp)->dma_map((__hp)->dma_dev, (__ptr), (__size), (__dir)))
#define hme_dma_unmap(__hp, __addr, __size, __dir) \ #define hme_dma_unmap(__hp, __addr, __size, __dir) \
((__hp)->dma_unmap((__hp)->happy_dev, (__addr), (__size), (__dir))) ((__hp)->dma_unmap((__hp)->dma_dev, (__addr), (__size), (__dir)))
#define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \ #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \
((__hp)->dma_sync_for_cpu((__hp)->happy_dev, (__addr), (__size), (__dir))) ((__hp)->dma_sync_for_cpu((__hp)->dma_dev, (__addr), (__size), (__dir)))
#define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \ #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \
((__hp)->dma_sync_for_device((__hp)->happy_dev, (__addr), (__size), (__dir))) ((__hp)->dma_sync_for_device((__hp)->dma_dev, (__addr), (__size), (__dir)))
#else #else
#ifdef CONFIG_SBUS #ifdef CONFIG_SBUS
/* SBUS only compilation */ /* SBUS only compilation */
...@@ -277,13 +277,13 @@ do { (__txd)->tx_addr = (__force hme32)(u32)(__addr); \ ...@@ -277,13 +277,13 @@ do { (__txd)->tx_addr = (__force hme32)(u32)(__addr); \
} while(0) } while(0)
#define hme_read_desc32(__hp, __p) ((__force u32)(hme32)*(__p)) #define hme_read_desc32(__hp, __p) ((__force u32)(hme32)*(__p))
#define hme_dma_map(__hp, __ptr, __size, __dir) \ #define hme_dma_map(__hp, __ptr, __size, __dir) \
sbus_map_single((__hp)->happy_dev, (__ptr), (__size), (__dir)) sbus_map_single((__hp)->dma_dev, (__ptr), (__size), (__dir))
#define hme_dma_unmap(__hp, __addr, __size, __dir) \ #define hme_dma_unmap(__hp, __addr, __size, __dir) \
sbus_unmap_single((__hp)->happy_dev, (__addr), (__size), (__dir)) sbus_unmap_single((__hp)->dma_dev, (__addr), (__size), (__dir))
#define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \ #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \
sbus_dma_sync_single_for_cpu((__hp)->happy_dev, (__addr), (__size), (__dir)) sbus_dma_sync_single_for_cpu((__hp)->dma_dev, (__addr), (__size), (__dir))
#define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \ #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \
sbus_dma_sync_single_for_device((__hp)->happy_dev, (__addr), (__size), (__dir)) sbus_dma_sync_single_for_device((__hp)->dma_dev, (__addr), (__size), (__dir))
#else #else
/* PCI only compilation */ /* PCI only compilation */
#define hme_write32(__hp, __reg, __val) \ #define hme_write32(__hp, __reg, __val) \
...@@ -305,13 +305,13 @@ static inline u32 hme_read_desc32(struct happy_meal *hp, hme32 *p) ...@@ -305,13 +305,13 @@ static inline u32 hme_read_desc32(struct happy_meal *hp, hme32 *p)
return le32_to_cpup((__le32 *)p); return le32_to_cpup((__le32 *)p);
} }
#define hme_dma_map(__hp, __ptr, __size, __dir) \ #define hme_dma_map(__hp, __ptr, __size, __dir) \
pci_map_single((__hp)->happy_dev, (__ptr), (__size), (__dir)) pci_map_single((__hp)->dma_dev, (__ptr), (__size), (__dir))
#define hme_dma_unmap(__hp, __addr, __size, __dir) \ #define hme_dma_unmap(__hp, __addr, __size, __dir) \
pci_unmap_single((__hp)->happy_dev, (__addr), (__size), (__dir)) pci_unmap_single((__hp)->dma_dev, (__addr), (__size), (__dir))
#define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \ #define hme_dma_sync_for_cpu(__hp, __addr, __size, __dir) \
pci_dma_sync_single_for_cpu((__hp)->happy_dev, (__addr), (__size), (__dir)) pci_dma_sync_single_for_cpu((__hp)->dma_dev, (__addr), (__size), (__dir))
#define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \ #define hme_dma_sync_for_device(__hp, __addr, __size, __dir) \
pci_dma_sync_single_for_device((__hp)->happy_dev, (__addr), (__size), (__dir)) pci_dma_sync_single_for_device((__hp)->dma_dev, (__addr), (__size), (__dir))
#endif #endif
#endif #endif
...@@ -2716,6 +2716,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe ...@@ -2716,6 +2716,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
hp = dev->priv; hp = dev->priv;
hp->happy_dev = sdev; hp->happy_dev = sdev;
hp->dma_dev = &sdev->ofdev.dev;
spin_lock_init(&hp->happy_lock); spin_lock_init(&hp->happy_lock);
...@@ -2785,7 +2786,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe ...@@ -2785,7 +2786,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
hp->happy_bursts = of_getintprop_default(sdev->bus->ofdev.node, hp->happy_bursts = of_getintprop_default(sdev->bus->ofdev.node,
"burst-sizes", 0x00); "burst-sizes", 0x00);
hp->happy_block = sbus_alloc_consistent(hp->happy_dev, hp->happy_block = sbus_alloc_consistent(hp->dma_dev,
PAGE_SIZE, PAGE_SIZE,
&hp->hblock_dvma); &hp->hblock_dvma);
err = -ENOMEM; err = -ENOMEM;
...@@ -2860,7 +2861,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe ...@@ -2860,7 +2861,7 @@ static int __devinit happy_meal_sbus_probe_one(struct sbus_dev *sdev, int is_qfe
return 0; return 0;
err_out_free_consistent: err_out_free_consistent:
sbus_free_consistent(hp->happy_dev, sbus_free_consistent(hp->dma_dev,
PAGE_SIZE, PAGE_SIZE,
hp->happy_block, hp->happy_block,
hp->hblock_dvma); hp->hblock_dvma);
...@@ -3035,6 +3036,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, ...@@ -3035,6 +3036,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
memset(hp, 0, sizeof(*hp)); memset(hp, 0, sizeof(*hp));
hp->happy_dev = pdev; hp->happy_dev = pdev;
hp->dma_dev = pdev;
spin_lock_init(&hp->happy_lock); spin_lock_init(&hp->happy_lock);
...@@ -3231,12 +3233,12 @@ static void __devexit happy_meal_pci_remove(struct pci_dev *pdev) ...@@ -3231,12 +3233,12 @@ static void __devexit happy_meal_pci_remove(struct pci_dev *pdev)
unregister_netdev(net_dev); unregister_netdev(net_dev);
pci_free_consistent(hp->happy_dev, pci_free_consistent(hp->dma_dev,
PAGE_SIZE, PAGE_SIZE,
hp->happy_block, hp->happy_block,
hp->hblock_dvma); hp->hblock_dvma);
iounmap(hp->gregs); iounmap(hp->gregs);
pci_release_regions(hp->happy_dev); pci_release_regions(hp->dma_dev);
free_netdev(net_dev); free_netdev(net_dev);
...@@ -3306,7 +3308,7 @@ static int __devexit hme_sbus_remove(struct of_device *dev) ...@@ -3306,7 +3308,7 @@ static int __devexit hme_sbus_remove(struct of_device *dev)
sbus_iounmap(hp->erxregs, ERX_REG_SIZE); sbus_iounmap(hp->erxregs, ERX_REG_SIZE);
sbus_iounmap(hp->bigmacregs, BMAC_REG_SIZE); sbus_iounmap(hp->bigmacregs, BMAC_REG_SIZE);
sbus_iounmap(hp->tcvregs, TCVR_REG_SIZE); sbus_iounmap(hp->tcvregs, TCVR_REG_SIZE);
sbus_free_consistent(hp->happy_dev, sbus_free_consistent(hp->dma_dev,
PAGE_SIZE, PAGE_SIZE,
hp->happy_block, hp->happy_block,
hp->hblock_dvma); hp->hblock_dvma);
......
drivers/net/sunhme.h
View file @ 7a715f46
...@@ -413,6 +413,7 @@ struct happy_meal { ...@@ -413,6 +413,7 @@ struct happy_meal {
/* This is either a sbus_dev or a pci_dev. */ /* This is either a sbus_dev or a pci_dev. */
void *happy_dev; void *happy_dev;
void *dma_dev;
spinlock_t happy_lock; spinlock_t happy_lock;
......
drivers/net/sunlance.c
View file @ 7a715f46
...@@ -1283,7 +1283,7 @@ static void lance_free_hwresources(struct lance_private *lp) ...@@ -1283,7 +1283,7 @@ static void lance_free_hwresources(struct lance_private *lp)
sbus_iounmap(lp->init_block_iomem, sbus_iounmap(lp->init_block_iomem,
sizeof(struct lance_init_block)); sizeof(struct lance_init_block));
} else if (lp->init_block_mem) { } else if (lp->init_block_mem) {
sbus_free_consistent(lp->sdev, sbus_free_consistent(&lp->sdev->ofdev.dev,
sizeof(struct lance_init_block), sizeof(struct lance_init_block),
lp->init_block_mem, lp->init_block_mem,
lp->init_block_dvma); lp->init_block_dvma);
...@@ -1384,7 +1384,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev, ...@@ -1384,7 +1384,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev,
lp->tx = lance_tx_pio; lp->tx = lance_tx_pio;
} else { } else {
lp->init_block_mem = lp->init_block_mem =
sbus_alloc_consistent(sdev, sizeof(struct lance_init_block), sbus_alloc_consistent(&sdev->ofdev.dev,
sizeof(struct lance_init_block),
&lp->init_block_dvma); &lp->init_block_dvma);
if (!lp->init_block_mem || lp->init_block_dvma == 0) { if (!lp->init_block_mem || lp->init_block_dvma == 0) {
printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n"); printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n");
......
drivers/net/sunqe.c
View file @ 7a715f46
...@@ -879,10 +879,10 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev) ...@@ -879,10 +879,10 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
goto fail; goto fail;
} }
qe->qe_block = sbus_alloc_consistent(qe->qe_sdev, qe->qe_block = sbus_alloc_consistent(&qe->qe_sdev->ofdev.dev,
PAGE_SIZE, PAGE_SIZE,
&qe->qblock_dvma); &qe->qblock_dvma);
qe->buffers = sbus_alloc_consistent(qe->qe_sdev, qe->buffers = sbus_alloc_consistent(&qe->qe_sdev->ofdev.dev,
sizeof(struct sunqe_buffers), sizeof(struct sunqe_buffers),
&qe->buffers_dvma); &qe->buffers_dvma);
if (qe->qe_block == NULL || qe->qblock_dvma == 0 || if (qe->qe_block == NULL || qe->qblock_dvma == 0 ||
...@@ -926,12 +926,12 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev) ...@@ -926,12 +926,12 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
if (qe->mregs) if (qe->mregs)
sbus_iounmap(qe->mregs, MREGS_REG_SIZE); sbus_iounmap(qe->mregs, MREGS_REG_SIZE);
if (qe->qe_block) if (qe->qe_block)
sbus_free_consistent(qe->qe_sdev, sbus_free_consistent(&qe->qe_sdev->ofdev.dev,
PAGE_SIZE, PAGE_SIZE,
qe->qe_block, qe->qe_block,
qe->qblock_dvma); qe->qblock_dvma);
if (qe->buffers) if (qe->buffers)
sbus_free_consistent(qe->qe_sdev, sbus_free_consistent(&qe->qe_sdev->ofdev.dev,
sizeof(struct sunqe_buffers), sizeof(struct sunqe_buffers),
qe->buffers, qe->buffers,
qe->buffers_dvma); qe->buffers_dvma);
...@@ -957,11 +957,11 @@ static int __devexit qec_sbus_remove(struct of_device *dev) ...@@ -957,11 +957,11 @@ static int __devexit qec_sbus_remove(struct of_device *dev)
sbus_iounmap(qp->qcregs, CREG_REG_SIZE); sbus_iounmap(qp->qcregs, CREG_REG_SIZE);
sbus_iounmap(qp->mregs, MREGS_REG_SIZE); sbus_iounmap(qp->mregs, MREGS_REG_SIZE);
sbus_free_consistent(qp->qe_sdev, sbus_free_consistent(&qp->qe_sdev->ofdev.dev,
PAGE_SIZE, PAGE_SIZE,
qp->qe_block, qp->qe_block,
qp->qblock_dvma); qp->qblock_dvma);
sbus_free_consistent(qp->qe_sdev, sbus_free_consistent(&qp->qe_sdev->ofdev.dev,
sizeof(struct sunqe_buffers), sizeof(struct sunqe_buffers),
qp->buffers, qp->buffers,
qp->buffers_dvma); qp->buffers_dvma);
......
drivers/scsi/qlogicpti.c
View file @ 7a715f46
...@@ -788,7 +788,7 @@ static int __devinit qpti_map_queues(struct qlogicpti *qpti) ...@@ -788,7 +788,7 @@ static int __devinit qpti_map_queues(struct qlogicpti *qpti)
struct sbus_dev *sdev = qpti->sdev; struct sbus_dev *sdev = qpti->sdev;
#define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN) #define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN)
qpti->res_cpu = sbus_alloc_consistent(sdev, qpti->res_cpu = sbus_alloc_consistent(&sdev->ofdev.dev,
QSIZE(RES_QUEUE_LEN), QSIZE(RES_QUEUE_LEN),
&qpti->res_dvma); &qpti->res_dvma);
if (qpti->res_cpu == NULL || if (qpti->res_cpu == NULL ||
...@@ -797,12 +797,12 @@ static int __devinit qpti_map_queues(struct qlogicpti *qpti) ...@@ -797,12 +797,12 @@ static int __devinit qpti_map_queues(struct qlogicpti *qpti)
return -1; return -1;
} }
qpti->req_cpu = sbus_alloc_consistent(sdev, qpti->req_cpu = sbus_alloc_consistent(&sdev->ofdev.dev,
QSIZE(QLOGICPTI_REQ_QUEUE_LEN), QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
&qpti->req_dvma); &qpti->req_dvma);
if (qpti->req_cpu == NULL || if (qpti->req_cpu == NULL ||
qpti->req_dvma == 0) { qpti->req_dvma == 0) {
sbus_free_consistent(sdev, QSIZE(RES_QUEUE_LEN), sbus_free_consistent(&sdev->ofdev.dev, QSIZE(RES_QUEUE_LEN),
qpti->res_cpu, qpti->res_dvma); qpti->res_cpu, qpti->res_dvma);
printk("QPTI: Cannot map request queue.\n"); printk("QPTI: Cannot map request queue.\n");
return -1; return -1;
...@@ -875,8 +875,9 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd, ...@@ -875,8 +875,9 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
int sg_count; int sg_count;
sg = scsi_sglist(Cmnd); sg = scsi_sglist(Cmnd);
sg_count = sbus_map_sg(qpti->sdev, sg, scsi_sg_count(Cmnd), sg_count = sbus_map_sg(&qpti->sdev->ofdev.dev, sg,
Cmnd->sc_data_direction); scsi_sg_count(Cmnd),
Cmnd->sc_data_direction);
ds = cmd->dataseg; ds = cmd->dataseg;
cmd->segment_cnt = sg_count; cmd->segment_cnt = sg_count;
...@@ -1151,7 +1152,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti) ...@@ -1151,7 +1152,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
Cmnd->result = DID_ERROR << 16; Cmnd->result = DID_ERROR << 16;
if (scsi_bufflen(Cmnd)) if (scsi_bufflen(Cmnd))
sbus_unmap_sg(qpti->sdev, sbus_unmap_sg(&qpti->sdev->ofdev.dev,
scsi_sglist(Cmnd), scsi_sg_count(Cmnd), scsi_sglist(Cmnd), scsi_sg_count(Cmnd),
Cmnd->sc_data_direction); Cmnd->sc_data_direction);
...@@ -1356,10 +1357,10 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi ...@@ -1356,10 +1357,10 @@ static int __devinit qpti_sbus_probe(struct of_device *dev, const struct of_devi
fail_unmap_queues: fail_unmap_queues:
#define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN) #define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN)
sbus_free_consistent(qpti->sdev, sbus_free_consistent(&qpti->sdev->ofdev.dev,
QSIZE(RES_QUEUE_LEN), QSIZE(RES_QUEUE_LEN),
qpti->res_cpu, qpti->res_dvma); qpti->res_cpu, qpti->res_dvma);
sbus_free_consistent(qpti->sdev, sbus_free_consistent(&qpti->sdev->ofdev.dev,
QSIZE(QLOGICPTI_REQ_QUEUE_LEN), QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
qpti->req_cpu, qpti->req_dvma); qpti->req_cpu, qpti->req_dvma);
#undef QSIZE #undef QSIZE
...@@ -1394,10 +1395,10 @@ static int __devexit qpti_sbus_remove(struct of_device *dev) ...@@ -1394,10 +1395,10 @@ static int __devexit qpti_sbus_remove(struct of_device *dev)
free_irq(qpti->irq, qpti); free_irq(qpti->irq, qpti);
#define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN) #define QSIZE(entries) (((entries) + 1) * QUEUE_ENTRY_LEN)
sbus_free_consistent(qpti->sdev, sbus_free_consistent(&qpti->sdev->ofdev.dev,
QSIZE(RES_QUEUE_LEN), QSIZE(RES_QUEUE_LEN),
qpti->res_cpu, qpti->res_dvma); qpti->res_cpu, qpti->res_dvma);
sbus_free_consistent(qpti->sdev, sbus_free_consistent(&qpti->sdev->ofdev.dev,
QSIZE(QLOGICPTI_REQ_QUEUE_LEN), QSIZE(QLOGICPTI_REQ_QUEUE_LEN),
qpti->req_cpu, qpti->req_dvma); qpti->req_cpu, qpti->req_dvma);
#undef QSIZE #undef QSIZE
......
drivers/scsi/sun_esp.c
View file @ 7a715f46
...@@ -101,7 +101,7 @@ static int __devinit esp_sbus_map_command_block(struct esp *esp) ...@@ -101,7 +101,7 @@ static int __devinit esp_sbus_map_command_block(struct esp *esp)
{ {
struct sbus_dev *sdev = esp->dev; struct sbus_dev *sdev = esp->dev;
esp->command_block = sbus_alloc_consistent(sdev, 16, esp->command_block = sbus_alloc_consistent(&sdev->ofdev.dev, 16,
&esp->command_block_dma); &esp->command_block_dma);
if (!esp->command_block) if (!esp->command_block)
return -ENOMEM; return -ENOMEM;
...@@ -223,25 +223,33 @@ static u8 sbus_esp_read8(struct esp *esp, unsigned long reg) ...@@ -223,25 +223,33 @@ static u8 sbus_esp_read8(struct esp *esp, unsigned long reg)
static dma_addr_t sbus_esp_map_single(struct esp *esp, void *buf, static dma_addr_t sbus_esp_map_single(struct esp *esp, void *buf,
size_t sz, int dir) size_t sz, int dir)
{ {
return sbus_map_single(esp->dev, buf, sz, dir); struct sbus_dev *sdev = esp->dev;
return sbus_map_single(&sdev->ofdev.dev, buf, sz, dir);
} }
static int sbus_esp_map_sg(struct esp *esp, struct scatterlist *sg, static int sbus_esp_map_sg(struct esp *esp, struct scatterlist *sg,
int num_sg, int dir) int num_sg, int dir)
{ {
return sbus_map_sg(esp->dev, sg, num_sg, dir); struct sbus_dev *sdev = esp->dev;
return sbus_map_sg(&sdev->ofdev.dev, sg, num_sg, dir);
} }
static void sbus_esp_unmap_single(struct esp *esp, dma_addr_t addr, static void sbus_esp_unmap_single(struct esp *esp, dma_addr_t addr,
size_t sz, int dir) size_t sz, int dir)
{ {
sbus_unmap_single(esp->dev, addr, sz, dir); struct sbus_dev *sdev = esp->dev;
sbus_unmap_single(&sdev->ofdev.dev, addr, sz, dir);
} }
static void sbus_esp_unmap_sg(struct esp *esp, struct scatterlist *sg, static void sbus_esp_unmap_sg(struct esp *esp, struct scatterlist *sg,
int num_sg, int dir) int num_sg, int dir)
{ {
sbus_unmap_sg(esp->dev, sg, num_sg, dir); struct sbus_dev *sdev = esp->dev;
sbus_unmap_sg(&sdev->ofdev.dev, sg, num_sg, dir);
} }
static int sbus_esp_irq_pending(struct esp *esp) static int sbus_esp_irq_pending(struct esp *esp)
...@@ -550,7 +558,7 @@ static int __devinit esp_sbus_probe_one(struct device *dev, ...@@ -550,7 +558,7 @@ static int __devinit esp_sbus_probe_one(struct device *dev,
fail_free_irq: fail_free_irq:
free_irq(host->irq, esp); free_irq(host->irq, esp);
fail_unmap_command_block: fail_unmap_command_block:
sbus_free_consistent(esp->dev, 16, sbus_free_consistent(&esp_dev->ofdev.dev, 16,
esp->command_block, esp->command_block,
esp->command_block_dma); esp->command_block_dma);
fail_unmap_regs: fail_unmap_regs:
...@@ -589,6 +597,7 @@ static int __devinit esp_sbus_probe(struct of_device *dev, const struct of_devic ...@@ -589,6 +597,7 @@ static int __devinit esp_sbus_probe(struct of_device *dev, const struct of_devic
static int __devexit esp_sbus_remove(struct of_device *dev) static int __devexit esp_sbus_remove(struct of_device *dev)
{ {
struct esp *esp = dev_get_drvdata(&dev->dev); struct esp *esp = dev_get_drvdata(&dev->dev);
struct sbus_dev *sdev = esp->dev;
struct of_device *dma_of = esp->dma; struct of_device *dma_of = esp->dma;
unsigned int irq = esp->host->irq; unsigned int irq = esp->host->irq;
u32 val; u32 val;
...@@ -600,7 +609,7 @@ static int __devexit esp_sbus_remove(struct of_device *dev) ...@@ -600,7 +609,7 @@ static int __devexit esp_sbus_remove(struct of_device *dev)
dma_write32(val & ~DMA_INT_ENAB, DMA_CSR); dma_write32(val & ~DMA_INT_ENAB, DMA_CSR);
free_irq(irq, esp); free_irq(irq, esp);
sbus_free_consistent(esp->dev, 16, sbus_free_consistent(&sdev->ofdev.dev, 16,
esp->command_block, esp->command_block,
esp->command_block_dma); esp->command_block_dma);
sbus_iounmap(esp->regs, SBUS_ESP_REG_SIZE); sbus_iounmap(esp->regs, SBUS_ESP_REG_SIZE);
......
sound/core/memalloc.c
View file @ 7a715f46
...@@ -192,7 +192,8 @@ static void *snd_malloc_sbus_pages(struct device *dev, size_t size, ...@@ -192,7 +192,8 @@ static void *snd_malloc_sbus_pages(struct device *dev, size_t size,
snd_assert(size > 0, return NULL); snd_assert(size > 0, return NULL);
snd_assert(dma_addr != NULL, return NULL); snd_assert(dma_addr != NULL, return NULL);
pg = get_order(size); pg = get_order(size);
res = sbus_alloc_consistent(sdev, PAGE_SIZE * (1 << pg), dma_addr); res = sbus_alloc_consistent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg),
dma_addr);
if (res != NULL) if (res != NULL)
inc_snd_pages(pg); inc_snd_pages(pg);
return res; return res;
...@@ -208,7 +209,8 @@ static void snd_free_sbus_pages(struct device *dev, size_t size, ...@@ -208,7 +209,8 @@ static void snd_free_sbus_pages(struct device *dev, size_t size,
return; return;
pg = get_order(size); pg = get_order(size);
dec_snd_pages(pg); dec_snd_pages(pg);
sbus_free_consistent(sdev, PAGE_SIZE * (1 << pg), ptr, dma_addr); sbus_free_consistent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg),
ptr, dma_addr);
} }
#endif /* CONFIG_SBUS */ #endif /* CONFIG_SBUS */
......
sound/sparc/dbri.c
View file @ 7a715f46
...@@ -2097,7 +2097,8 @@ static int snd_dbri_hw_params(struct snd_pcm_substream *substream, ...@@ -2097,7 +2097,8 @@ static int snd_dbri_hw_params(struct snd_pcm_substream *substream,
else else
direction = SBUS_DMA_FROMDEVICE; direction = SBUS_DMA_FROMDEVICE;
info->dvma_buffer = sbus_map_single(dbri->sdev, info->dvma_buffer =
sbus_map_single(&dbri->sdev->ofdev.dev,
runtime->dma_area, runtime->dma_area,
params_buffer_bytes(hw_params), params_buffer_bytes(hw_params),
direction); direction);
...@@ -2125,7 +2126,7 @@ static int snd_dbri_hw_free(struct snd_pcm_substream *substream) ...@@ -2125,7 +2126,7 @@ static int snd_dbri_hw_free(struct snd_pcm_substream *substream)
else else
direction = SBUS_DMA_FROMDEVICE; direction = SBUS_DMA_FROMDEVICE;
sbus_unmap_single(dbri->sdev, info->dvma_buffer, sbus_unmap_single(&dbri->sdev->ofdev.dev, info->dvma_buffer,
substream->runtime->buffer_size, direction); substream->runtime->buffer_size, direction);
info->dvma_buffer = 0; info->dvma_buffer = 0;
} }
...@@ -2524,7 +2525,8 @@ static int __devinit snd_dbri_create(struct snd_card *card, ...@@ -2524,7 +2525,8 @@ static int __devinit snd_dbri_create(struct snd_card *card,
dbri->sdev = sdev; dbri->sdev = sdev;
dbri->irq = irq; dbri->irq = irq;
dbri->dma = sbus_alloc_consistent(sdev, sizeof(struct dbri_dma), dbri->dma = sbus_alloc_consistent(&sdev->ofdev.dev,
sizeof(struct dbri_dma),
&dbri->dma_dvma); &dbri->dma_dvma);
memset((void *)dbri->dma, 0, sizeof(struct dbri_dma)); memset((void *)dbri->dma, 0, sizeof(struct dbri_dma));
...@@ -2537,7 +2539,7 @@ static int __devinit snd_dbri_create(struct snd_card *card, ...@@ -2537,7 +2539,7 @@ static int __devinit snd_dbri_create(struct snd_card *card,
dbri->regs_size, "DBRI Registers"); dbri->regs_size, "DBRI Registers");
if (!dbri->regs) { if (!dbri->regs) {
printk(KERN_ERR "DBRI: could not allocate registers\n"); printk(KERN_ERR "DBRI: could not allocate registers\n");
sbus_free_consistent(sdev, sizeof(struct dbri_dma), sbus_free_consistent(&sdev->ofdev.dev, sizeof(struct dbri_dma),
(void *)dbri->dma, dbri->dma_dvma); (void *)dbri->dma, dbri->dma_dvma);
return -EIO; return -EIO;
} }
...@@ -2547,7 +2549,7 @@ static int __devinit snd_dbri_create(struct snd_card *card, ...@@ -2547,7 +2549,7 @@ static int __devinit snd_dbri_create(struct snd_card *card,
if (err) { if (err) {
printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq); printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq);
sbus_iounmap(dbri->regs, dbri->regs_size); sbus_iounmap(dbri->regs, dbri->regs_size);
sbus_free_consistent(sdev, sizeof(struct dbri_dma), sbus_free_consistent(&sdev->ofdev.dev, sizeof(struct dbri_dma),
(void *)dbri->dma, dbri->dma_dvma); (void *)dbri->dma, dbri->dma_dvma);
return err; return err;
} }
...@@ -2575,7 +2577,8 @@ static void snd_dbri_free(struct snd_dbri *dbri) ...@@ -2575,7 +2577,8 @@ static void snd_dbri_free(struct snd_dbri *dbri)
sbus_iounmap(dbri->regs, dbri->regs_size); sbus_iounmap(dbri->regs, dbri->regs_size);
if (dbri->dma) if (dbri->dma)
sbus_free_consistent(dbri->sdev, sizeof(struct dbri_dma), sbus_free_consistent(&dbri->sdev->ofdev.dev,
sizeof(struct dbri_dma),
(void *)dbri->dma, dbri->dma_dvma); (void *)dbri->dma, dbri->dma_dvma);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7