[U-Boot] [PATCH 2/4] MIPS: Fix _ACAST32_ for pointers on MIPS64
Paul Burton
paul.burton at imgtec.com
Tue May 17 12:56:40 CEST 2016
When building for MIPS64 and providing a pointer to _ACAST32_,
optionally via CPHYSADDR or one of the CKSEGxADDR macros, the cast
directly to a 32 bit int leads to compilation warnings such as the
following:
In file included from ./arch/mips/include/asm/io.h:17:0,
from drivers/net/pcnet.c:14:
drivers/net/pcnet.c: In function ‘pcnet_virt_to_mem’:
./arch/mips/include/asm/addrspace.h:39:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
#define _ACAST32_ (_ATYPE_)(_ATYPE32_) /* widen if necessary */
^
./arch/mips/include/asm/addrspace.h:51:25: note: in expansion of macro ‘_ACAST32_’
#define CPHYSADDR(a) ((_ACAST32_(a)) & 0x1fffffff)
^
./arch/mips/include/asm/addrspace.h:71:25: note: in expansion of macro ‘CPHYSADDR’
#define CKSEG0ADDR(a) (CPHYSADDR(a) | CKSEG0)
^
drivers/net/pcnet.c:144:23: note: in expansion of macro ‘CKSEG0ADDR’
virt_addr = (void *)CKSEG0ADDR(addr);
^
Fix this by first casting provided values to a pointer-width integer,
then truncating to a 32 bit int & widening back to pointer-width.
Signed-off-by: Paul Burton <paul.burton at imgtec.com>
---
arch/mips/include/asm/addrspace.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/include/asm/addrspace.h b/arch/mips/include/asm/addrspace.h
index 0994e96..fe497b5 100644
--- a/arch/mips/include/asm/addrspace.h
+++ b/arch/mips/include/asm/addrspace.h
@@ -36,8 +36,8 @@
#define _ACAST32_
#define _ACAST64_
#else
-#define _ACAST32_ (_ATYPE_)(_ATYPE32_) /* widen if necessary */
-#define _ACAST64_ (_ATYPE64_) /* do _not_ narrow */
+#define _ACAST32_ (_ATYPE_)(_ATYPE32_)(_ATYPE_) /* widen if necessary */
+#define _ACAST64_ (_ATYPE64_) /* do _not_ narrow */
#endif
/*
--
2.8.2
More information about the U-Boot
mailing list