Commit 104ea1c8 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Yury Norov
Browse files

bits: unify the non-asm GENMASK*() 



The newly introduced GENMASK_TYPE() macro can also be used to generate
the pre-existing non-asm GENMASK*() variants.

Apply GENMASK_TYPE() to GENMASK(), GENMASK_ULL() and GENMASK_U128().

Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: default avatarYury Norov (NVIDIA) <yury.norov@gmail.com>
parent 6d447125

include/linux/bits.h

+4 −22
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ 
#ifndef __LINUX_BITS_H

#define __LINUX_BITS_H



#include <linux/const.h>

#include <vdso/bits.h>

#include <uapi/linux/bits.h>

#include <asm/bitsperlong.h>



#define BIT_MASK(nr)		(UL(1) << ((nr) % BITS_PER_LONG))

#define BIT_WORD(nr)		((nr) / BITS_PER_LONG)
@@ -35,11 +33,6 @@ 


#define GENMASK_INPUT_CHECK(h, l) BUILD_BUG_ON_ZERO(const_true((l) > (h)))



#define GENMASK(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))

#define GENMASK_ULL(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))



/*

 * Generate a mask for the specified type @t. Additional checks are made to

 * guarantee the value returned fits in that type, relying on
@@ -55,10 +48,14 @@ 
	     (type_max(t) << (l) &				\

	      type_max(t) >> (BITS_PER_TYPE(t) - 1 - (h)))))



#define GENMASK(h, l)		GENMASK_TYPE(unsigned long, h, l)

#define GENMASK_ULL(h, l)	GENMASK_TYPE(unsigned long long, h, l)



#define GENMASK_U8(h, l)	GENMASK_TYPE(u8, h, l)

#define GENMASK_U16(h, l)	GENMASK_TYPE(u16, h, l)

#define GENMASK_U32(h, l)	GENMASK_TYPE(u32, h, l)

#define GENMASK_U64(h, l)	GENMASK_TYPE(u64, h, l)

#define GENMASK_U128(h, l)	GENMASK_TYPE(u128, h, l)



/*

 * Fixed-type variants of BIT(), with additional checks like GENMASK_TYPE(). The
@@ -89,19 +86,4 @@ 


#endif /* !defined(__ASSEMBLY__) */



#if !defined(__ASSEMBLY__)

/*

 * Missing asm support

 *

 * __GENMASK_U128() depends on _BIT128() which would not work

 * in the asm code, as it shifts an 'unsigned __int128' data

 * type instead of direct representation of 128 bit constants

 * such as long and unsigned long. The fundamental problem is

 * that a 128 bit constant will get silently truncated by the

 * gcc compiler.

 */

#define GENMASK_U128(h, l) \

	(GENMASK_INPUT_CHECK(h, l) + __GENMASK_U128(h, l))

#endif



#endif	/* __LINUX_BITS_H */