Re: [PATCH v2 02/10] Move GET_FIELD/SET_FIELD to vas.h
From: Dan Streetman <hidden>
Date: 2017-01-26 17:32:41
On Wed, Jan 25, 2017 at 8:38 PM, Sukadev Bhattiprolu [off-list ref] wrote:
Move the GET_FIELD and SET_FIELD macros to vas.h as VAS and other users of VAS, including NX-842 can use those macros. Signed-off-by: Sukadev Bhattiprolu <redacted>
Reviewed-by: Dan Streetman <redacted>
quoted hunk ↗ jump to hunk
--- arch/powerpc/include/asm/vas.h | 8 ++++++++ drivers/crypto/nx/nx-842-powernv.c | 1 + drivers/crypto/nx/nx-842.h | 5 ----- 3 files changed, 9 insertions(+), 5 deletions(-)diff --git a/arch/powerpc/include/asm/vas.h b/arch/powerpc/include/asm/vas.h index 1c10437..fef9e87 100644 --- a/arch/powerpc/include/asm/vas.h +++ b/arch/powerpc/include/asm/vas.h@@ -37,4 +37,12 @@ enum vas_thresh_ctl { VAS_THRESH_FIFO_GT_EIGHTH_FULL, }; +/* + * Get/Set bit fields + */ +#define GET_FIELD(m, v) (((v) & (m)) >> MASK_LSH(m)) +#define MASK_LSH(m) (__builtin_ffsl(m) - 1) +#define SET_FIELD(m, v, val) \ + (((v) & ~(m)) | ((((typeof(v))(val)) << MASK_LSH(m)) & (m))) + #endifdiff --git a/drivers/crypto/nx/nx-842-powernv.c b/drivers/crypto/nx/nx-842-powernv.c index 1710f80..ea6fb6c 100644 --- a/drivers/crypto/nx/nx-842-powernv.c +++ b/drivers/crypto/nx/nx-842-powernv.c@@ -22,6 +22,7 @@ #include <asm/prom.h> #include <asm/icswx.h> +#include <asm/vas.h> MODULE_LICENSE("GPL"); MODULE_AUTHOR("Dan Streetman <ddstreet@ieee.org>");diff --git a/drivers/crypto/nx/nx-842.h b/drivers/crypto/nx/nx-842.h index a4eee3b..30929bd 100644 --- a/drivers/crypto/nx/nx-842.h +++ b/drivers/crypto/nx/nx-842.h@@ -100,11 +100,6 @@ static inline unsigned long nx842_get_pa(void *addr) return page_to_phys(vmalloc_to_page(addr)) + offset_in_page(addr); } -/* Get/Set bit fields */ -#define MASK_LSH(m) (__builtin_ffsl(m) - 1) -#define GET_FIELD(v, m) (((v) & (m)) >> MASK_LSH(m)) -#define SET_FIELD(v, m, val) (((v) & ~(m)) | (((val) << MASK_LSH(m)) & (m))) - /** * This provides the driver's constraints. Different nx842 implementations * may have varying requirements. The constraints are: --2.7.4