Commit 23a4757d authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Vasily Gorbik
Browse files

s390/zcrypt: Move inline function rng_type6cprb_msgx from header to code 



Function rng_type6cprb_msgx() is only used once and thus no need
to provide it in header file any more. Move it at the place within
the code where it is used.

Reviewed-by: default avatarHolger Dengler <dengler@linux.ibm.com>
Reviewed-by: default avatarAnthony Krowiak <akrowiak@linux.ibm.com>
Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent fa8be59c

drivers/s390/crypto/zcrypt_msgtype6.c

+49 −0
Original line number Diff line number Diff line
@@ -1250,6 +1250,55 @@ static long zcrypt_msgtype6_send_ep11_cprb(bool userspace, struct zcrypt_queue * 
	return rc;

}



/**

 * Prepare a type6 CPRB message for random number generation

 *

 * @ap_dev: AP device pointer

 * @ap_msg: pointer to AP message

 */

static inline void rng_type6cprb_msgx(struct ap_message *ap_msg,

				      unsigned int random_number_length,

				      unsigned int *domain)

{

	struct {

		struct type6_hdr hdr;

		struct CPRBX cprbx;

		char function_code[2];

		short int rule_length;

		char rule[8];

		short int verb_length;

		short int key_length;

	} __packed * msg = ap_msg->msg;

	static struct type6_hdr static_type6_hdrX = {

		.type		= 0x06,

		.offset1	= 0x00000058,

		.agent_id	= {'C', 'A'},

		.function_code	= {'R', 'L'},

		.tocardlen1	= sizeof(*msg) - sizeof(msg->hdr),

		.fromcardlen1	= sizeof(*msg) - sizeof(msg->hdr),

	};

	static struct CPRBX local_cprbx = {

		.cprb_len	= 0x00dc,

		.cprb_ver_id	= 0x02,

		.func_id	= {0x54, 0x32},

		.req_parml	= sizeof(*msg) - sizeof(msg->hdr) -

				  sizeof(msg->cprbx),

		.rpl_msgbl	= sizeof(*msg) - sizeof(msg->hdr),

	};



	msg->hdr = static_type6_hdrX;

	msg->hdr.fromcardlen2 = random_number_length;

	msg->cprbx = local_cprbx;

	msg->cprbx.rpl_datal = random_number_length;

	memcpy(msg->function_code, msg->hdr.function_code, 0x02);

	msg->rule_length = 0x0a;

	memcpy(msg->rule, "RANDOM  ", 8);

	msg->verb_length = 0x02;

	msg->key_length = 0x02;

	ap_msg->len = sizeof(*msg);

	*domain = (unsigned short)msg->cprbx.domain;

}



/*

 * Prepare a CEXXC get random request ap message.

 * This function assumes that ap_msg has been initialized with

drivers/s390/crypto/zcrypt_msgtype6.h

+0 −49
Original line number Diff line number Diff line
@@ -110,55 +110,6 @@ int prep_rng_ap_msg(struct ap_message *ap_msg, 
int speed_idx_cca(int);

int speed_idx_ep11(int);



/**

 * Prepare a type6 CPRB message for random number generation

 *

 * @ap_dev: AP device pointer

 * @ap_msg: pointer to AP message

 */

static inline void rng_type6cprb_msgx(struct ap_message *ap_msg,

				      unsigned int random_number_length,

				      unsigned int *domain)

{

	struct {

		struct type6_hdr hdr;

		struct CPRBX cprbx;

		char function_code[2];

		short int rule_length;

		char rule[8];

		short int verb_length;

		short int key_length;

	} __packed * msg = ap_msg->msg;

	static struct type6_hdr static_type6_hdrX = {

		.type		= 0x06,

		.offset1	= 0x00000058,

		.agent_id	= {'C', 'A'},

		.function_code	= {'R', 'L'},

		.tocardlen1	= sizeof(*msg) - sizeof(msg->hdr),

		.fromcardlen1	= sizeof(*msg) - sizeof(msg->hdr),

	};

	static struct CPRBX local_cprbx = {

		.cprb_len	= 0x00dc,

		.cprb_ver_id	= 0x02,

		.func_id	= {0x54, 0x32},

		.req_parml	= sizeof(*msg) - sizeof(msg->hdr) -

				  sizeof(msg->cprbx),

		.rpl_msgbl	= sizeof(*msg) - sizeof(msg->hdr),

	};



	msg->hdr = static_type6_hdrX;

	msg->hdr.fromcardlen2 = random_number_length;

	msg->cprbx = local_cprbx;

	msg->cprbx.rpl_datal = random_number_length;

	memcpy(msg->function_code, msg->hdr.function_code, 0x02);

	msg->rule_length = 0x0a;

	memcpy(msg->rule, "RANDOM  ", 8);

	msg->verb_length = 0x02;

	msg->key_length = 0x02;

	ap_msg->len = sizeof(*msg);

	*domain = (unsigned short)msg->cprbx.domain;

}



void zcrypt_msgtype6_init(void);

void zcrypt_msgtype6_exit(void);