mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-18 22:46:13 +07:00
3312eca519
Commit1685ddbe35("MIPS: Octeon: Changes to support readq()/writeq() usage.") added bitwise shift operations that assume that unsigned long is always 64-bits. This broke the build of VDSO code, as it gets compiled also in "faked" 32-bit mode. Althought the failing inline functions are never executed in 32-bit mode, they still need to pass the compilation. Fix by using 64-bit types explicitly. The patch fixes the following build failure: CC arch/mips/vdso/gettimeofday-o32.o In file included from los/git/devel/linux/arch/mips/include/asm/io.h:32:0, from los/git/devel/linux/arch/mips/include/asm/page.h:194, from los/git/devel/linux/arch/mips/vdso/vdso.h:26, from los/git/devel/linux/arch/mips/vdso/gettimeofday.c:11: los/git/devel/linux/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h: In function '__should_swizzle_bits': los/git/devel/linux/arch/mips/include/asm/mach-cavium-octeon/mangle-port.h:19:40: error: right shift count >= width of type [-Werror=shift-count-overflow] unsigned long did = ((unsigned long)a >> 40) & 0xff; ^~ Fixes:1685ddbe35("MIPS: Octeon: Changes to support readq()/writeq() usage.") Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: David Daney <ddaney@caviumnetworks.com> Cc: David Daney <david.daney@cavium.com> Cc: Steven J. Hill <steven.hill@cavium.com> Cc: Alex Smith <alex.smith@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14039/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
59 lines
1.6 KiB
C
59 lines
1.6 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 2003, 2004 Ralf Baechle
|
|
*/
|
|
#ifndef __ASM_MACH_GENERIC_MANGLE_PORT_H
|
|
#define __ASM_MACH_GENERIC_MANGLE_PORT_H
|
|
|
|
#include <asm/byteorder.h>
|
|
|
|
#ifdef __BIG_ENDIAN
|
|
|
|
static inline bool __should_swizzle_bits(volatile void *a)
|
|
{
|
|
extern const bool octeon_should_swizzle_table[];
|
|
u64 did = ((u64)(uintptr_t)a >> 40) & 0xff;
|
|
|
|
return octeon_should_swizzle_table[did];
|
|
}
|
|
|
|
# define __swizzle_addr_b(port) (port)
|
|
# define __swizzle_addr_w(port) (port)
|
|
# define __swizzle_addr_l(port) (port)
|
|
# define __swizzle_addr_q(port) (port)
|
|
|
|
#else /* __LITTLE_ENDIAN */
|
|
|
|
#define __should_swizzle_bits(a) false
|
|
|
|
static inline bool __should_swizzle_addr(u64 p)
|
|
{
|
|
/* boot bus? */
|
|
return ((p >> 40) & 0xff) == 0;
|
|
}
|
|
|
|
# define __swizzle_addr_b(port) \
|
|
(__should_swizzle_addr(port) ? (port) ^ 7 : (port))
|
|
# define __swizzle_addr_w(port) \
|
|
(__should_swizzle_addr(port) ? (port) ^ 6 : (port))
|
|
# define __swizzle_addr_l(port) \
|
|
(__should_swizzle_addr(port) ? (port) ^ 4 : (port))
|
|
# define __swizzle_addr_q(port) (port)
|
|
|
|
#endif /* __BIG_ENDIAN */
|
|
|
|
|
|
# define ioswabb(a, x) (x)
|
|
# define __mem_ioswabb(a, x) (x)
|
|
# define ioswabw(a, x) (__should_swizzle_bits(a) ? le16_to_cpu(x) : x)
|
|
# define __mem_ioswabw(a, x) (x)
|
|
# define ioswabl(a, x) (__should_swizzle_bits(a) ? le32_to_cpu(x) : x)
|
|
# define __mem_ioswabl(a, x) (x)
|
|
# define ioswabq(a, x) (__should_swizzle_bits(a) ? le64_to_cpu(x) : x)
|
|
# define __mem_ioswabq(a, x) (x)
|
|
|
|
#endif /* __ASM_MACH_GENERIC_MANGLE_PORT_H */
|