staging: octeon: Use "(uintptr_t)" to cast from pointer to int
Subsystems (3)
PATCH v2 1/1 staging: octeon: Use "(uintptr_t)" to cast from pointer to int
On 32-bit:
In file included from drivers/staging/octeon/octeon-ethernet.h:41,
from drivers/staging/octeon/ethernet-tx.c:25:
drivers/staging/octeon/octeon-stubs.h: In function ‘cvmx_phys_to_ptr’:
drivers/staging/octeon/octeon-stubs.h:1205:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
return (void *)(physical_address);
^
drivers/staging/octeon/ethernet-tx.c: In function ‘cvm_oct_xmit’:
drivers/staging/octeon/ethernet-tx.c:264:37: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)skb->data);
^
drivers/staging/octeon/octeon-stubs.h:2:30: note: in definition of macro ‘XKPHYS_TO_PHYS’
#define XKPHYS_TO_PHYS(p) (p)
^
drivers/staging/octeon/ethernet-tx.c:268:37: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)skb->data);
^
drivers/staging/octeon/octeon-stubs.h:2:30: note: in definition of macro ‘XKPHYS_TO_PHYS’
#define XKPHYS_TO_PHYS(p) (p)
^
drivers/staging/octeon/ethernet-tx.c:276:20: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
XKPHYS_TO_PHYS((u64)skb_frag_address(fs));
^
drivers/staging/octeon/octeon-stubs.h:2:30: note: in definition of macro ‘XKPHYS_TO_PHYS’
#define XKPHYS_TO_PHYS(p) (p)
^
drivers/staging/octeon/ethernet-tx.c:280:37: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb));
^
drivers/staging/octeon/octeon-stubs.h:2:30: note: in definition of macro ‘XKPHYS_TO_PHYS’
#define XKPHYS_TO_PHYS(p) (p)
^Fix this by replacing casts to "u64" by casts to "uintptr_t", which is either 32-bit or 64-bit, and adding an intermediate cast to "uintptr_t" where needed.
Exposed by commit 171a9bae68c72f2d ("staging/octeon: Allow test build on !MIPS").
Signed-off-by Geert Uytterhoeven <[email protected]>
---
v2:
- Fix silly typo in oneline-summary.
--- drivers/staging/octeon/ethernet-tx.c | 9 +++++---- drivers/staging/octeon/octeon-stubs.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/staging/octeon/ethernet-tx.c +5 -4
@@ -261,11 +261,11 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)/* Build the PKO buffer pointer */ hw_buffer.u64 =0 ;if (skb_shinfo (skb)->nr_frags ==0 ) { - hw_buffer.s.addr =XKPHYS_TO_PHYS ((u64 )skb->data); + hw_buffer.s.addr =XKPHYS_TO_PHYS ((uintptr_t )skb->data); hw_buffer.s.pool =0 ; hw_buffer.s.size = skb->len; }else { - hw_buffer.s.addr =XKPHYS_TO_PHYS ((u64 )skb->data); + hw_buffer.s.addr =XKPHYS_TO_PHYS ((uintptr_t )skb->data); hw_buffer.s.pool =0 ; hw_buffer.s.size =skb_headlen (skb);CVM_OCT_SKB_CB (skb)[0 ] = hw_buffer.u64;
@@ -273,11 +273,12 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)skb_frag_t *fs =skb_shinfo (skb)->frags + i; hw_buffer.s.addr = -XKPHYS_TO_PHYS ((u64 )skb_frag_address (fs)); +XKPHYS_TO_PHYS ((uintptr_t )skb_frag_address (fs)); hw_buffer.s.size =skb_frag_size (fs);CVM_OCT_SKB_CB (skb)[i +1 ] = hw_buffer.u64; } - hw_buffer.s.addr =XKPHYS_TO_PHYS ((u64 )CVM_OCT_SKB_CB (skb)); + hw_buffer.s.addr = +XKPHYS_TO_PHYS ((uintptr_t )CVM_OCT_SKB_CB (skb)); hw_buffer.s.size =skb_shinfo (skb)->nr_frags +1 ; pko_command.s.segs =skb_shinfo (skb)->nr_frags +1 ; pko_command.s.gather =1 ;
drivers/staging/octeon/octeon-stubs.h +1 -1
@@ -1202,7 +1202,7 @@ static inline int cvmx_wqe_get_grp(cvmx_wqe_t *work)static inline void *cvmx_phys_to_ptr (uint64_t physical_address) { -return (void *)(physical_address); +return (void *)(uintptr_t )(physical_address); }static inline uint64_t cvmx_ptr_to_phys (void *ptr)
Signature · 1 line
2.17.1