Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6622a33 authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Michael Ellerman
Browse files

powerpc/powernv: Move GET_FIELD/SET_FIELD to vas.h 



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.

There is a lot of related code between the VAS/NX kernel drivers
and skiboot. For consistency, switch the order of parameters in
SET_FIELD to match the order in skiboot.

Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Reviewed-by: default avatarDan Streetman <ddstreet@ieee.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 96768914

arch/powerpc/include/asm/vas.h

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,14 @@ 
#define VAS_THRESH_FIFO_GT_QTR_FULL	2

#define VAS_THRESH_FIFO_GT_EIGHTH_FULL	3



/*

 * 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)))



/*

 * Co-processor Engine type.

 */

drivers/crypto/nx/nx-842-powernv.c

+4 −3
Original line number Diff line number Diff line
@@ -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>");
@@ -424,9 +425,9 @@ static int nx842_powernv_function(const unsigned char *in, unsigned int inlen, 


	/* set up CCW */

	ccw = 0;

	ccw = SET_FIELD(ccw, CCW_CT, nx842_ct);

	ccw = SET_FIELD(ccw, CCW_CI_842, 0); /* use 0 for hw auto-selection */

	ccw = SET_FIELD(ccw, CCW_FC_842, fc);

	ccw = SET_FIELD(CCW_CT, ccw, nx842_ct);

	ccw = SET_FIELD(CCW_CI_842, ccw, 0); /* use 0 for hw auto-selection */

	ccw = SET_FIELD(CCW_FC_842, ccw, fc);



	/* set up CRB's CSB addr */

	csb_addr = nx842_get_pa(csb) & CRB_CSB_ADDRESS;

drivers/crypto/nx/nx-842.h

+0 −5
Original line number Diff line number Diff line
@@ -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: