Commit 8168f902 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[PATCH] ppc64: make dma_addr_t 64 bits

There has been a need expressed for dma_addr_t to be 64 bits on PPC64.
This patch does that.
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent bf20a000
...@@ -532,7 +532,7 @@ static int ibmveth_open(struct net_device *netdev) ...@@ -532,7 +532,7 @@ static int ibmveth_open(struct net_device *netdev)
if(lpar_rc != H_Success) { if(lpar_rc != H_Success) {
ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc); ibmveth_error_printk("h_register_logical_lan failed with %ld\n", lpar_rc);
ibmveth_error_printk("buffer TCE:0x%x filter TCE:0x%x rxq desc:0x%lx MAC:0x%lx\n", ibmveth_error_printk("buffer TCE:0x%lx filter TCE:0x%lx rxq desc:0x%lx MAC:0x%lx\n",
adapter->buffer_list_dma, adapter->buffer_list_dma,
adapter->filter_list_dma, adapter->filter_list_dma,
rxq_desc.desc, rxq_desc.desc,
......
...@@ -85,7 +85,11 @@ typedef unsigned long long u64; ...@@ -85,7 +85,11 @@ typedef unsigned long long u64;
typedef __vector128 vector128; typedef __vector128 vector128;
#ifdef __powerpc64__
typedef u64 dma_addr_t;
#else
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
#endif
typedef u64 dma64_addr_t; typedef u64 dma64_addr_t;
typedef struct { typedef struct {
......
...@@ -19,7 +19,7 @@ struct scatterlist { ...@@ -19,7 +19,7 @@ struct scatterlist {
unsigned int length; unsigned int length;
/* For TCE support */ /* For TCE support */
u32 dma_address; dma_addr_t dma_address;
u32 dma_length; u32 dma_length;
}; };
......
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