Commit 3e71e121 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Vasily Gorbik:

 - Enable paes-s390 cipher selftests in testmgr (acked-by Herbert Xu).

 - Fix protected key length update in PKEY_SEC2PROTK ioctl and increase
   card/queue requests counter to 64-bit in crypto code.

 - Fix clang warning in get_tod_clock.

 - Fix ultravisor info length extensions handling.

 - Fix style of SPDX License Identifier in vfio-ccw.

 - Avoid unnecessary GFP_ATOMIC and simplify ACK tracking in qdio.

* tag 's390-5.6-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  crypto/testmgr: enable selftests for paes-s390 ciphers
  s390/time: Fix clk type in get_tod_clock
  s390/uv: Fix handling of length extensions
  s390/qdio: don't allocate *aob array with GFP_ATOMIC
  s390/qdio: simplify ACK tracking
  s390/zcrypt: fix card and queue total counter wrap
  s390/pkey: fix missing length of protected key on return
  vfio-ccw: Use the correct style for SPDX License Identifier
parents bd516133 c7ff8573

arch/s390/boot/uv.c

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ void uv_query_info(void) 
	if (!test_facility(158))

		return;



	if (uv_call(0, (uint64_t)&uvcb))

	/* rc==0x100 means that there is additional data we do not process */

	if (uv_call(0, (uint64_t)&uvcb) && uvcb.header.rc != 0x100)

		return;



	if (test_bit_inv(BIT_UVC_CMD_SET_SHARED_ACCESS, (unsigned long *)uvcb.inst_calls_list) &&

arch/s390/include/asm/timex.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static inline void get_tod_clock_ext(char *clk) 


static inline unsigned long long get_tod_clock(void)

{

	unsigned char clk[STORE_CLOCK_EXT_SIZE];

	char clk[STORE_CLOCK_EXT_SIZE];



	get_tod_clock_ext(clk);

	return *((unsigned long long *)&clk[1]);

crypto/testmgr.c

+36 −0
Original line number Diff line number Diff line
@@ -4436,6 +4436,15 @@ static const struct alg_test_desc alg_test_descs[] = { 
			.cipher = __VECS(tf_cbc_tv_template)

		},

	}, {

#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)

		.alg = "cbc-paes-s390",

		.fips_allowed = 1,

		.test = alg_test_skcipher,

		.suite = {

			.cipher = __VECS(aes_cbc_tv_template)

		}

	}, {

#endif

		.alg = "cbcmac(aes)",

		.fips_allowed = 1,

		.test = alg_test_hash,
@@ -4587,6 +4596,15 @@ static const struct alg_test_desc alg_test_descs[] = { 
			.cipher = __VECS(tf_ctr_tv_template)

		}

	}, {

#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)

		.alg = "ctr-paes-s390",

		.fips_allowed = 1,

		.test = alg_test_skcipher,

		.suite = {

			.cipher = __VECS(aes_ctr_tv_template)

		}

	}, {

#endif

		.alg = "cts(cbc(aes))",

		.test = alg_test_skcipher,

		.fips_allowed = 1,
@@ -4879,6 +4897,15 @@ static const struct alg_test_desc alg_test_descs[] = { 
			.cipher = __VECS(xtea_tv_template)

		}

	}, {

#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)

		.alg = "ecb-paes-s390",

		.fips_allowed = 1,

		.test = alg_test_skcipher,

		.suite = {

			.cipher = __VECS(aes_tv_template)

		}

	}, {

#endif

		.alg = "ecdh",

		.test = alg_test_kpp,

		.fips_allowed = 1,
@@ -5465,6 +5492,15 @@ static const struct alg_test_desc alg_test_descs[] = { 
			.cipher = __VECS(tf_xts_tv_template)

		}

	}, {

#if IS_ENABLED(CONFIG_CRYPTO_PAES_S390)

		.alg = "xts-paes-s390",

		.fips_allowed = 1,

		.test = alg_test_skcipher,

		.suite = {

			.cipher = __VECS(aes_xts_tv_template)

		}

	}, {

#endif

		.alg = "xts4096(paes)",

		.test = alg_test_null,

		.fips_allowed = 1,

drivers/s390/cio/qdio.h

+1 −3
Original line number Diff line number Diff line
@@ -182,11 +182,9 @@ enum qdio_queue_irq_states { 
};



struct qdio_input_q {

	/* input buffer acknowledgement flag */

	int polling;

	/* first ACK'ed buffer */

	int ack_start;

	/* how much sbals are acknowledged with qebsm */

	/* how many SBALs are acknowledged */

	int ack_count;

	/* last time of noticing incoming data */

	u64 timestamp;

drivers/s390/cio/qdio_debug.c

+2 −3
Original line number Diff line number Diff line
@@ -124,9 +124,8 @@ static int qstat_show(struct seq_file *m, void *v) 
	seq_printf(m, "nr_used: %d  ftc: %d\n",

		   atomic_read(&q->nr_buf_used), q->first_to_check);

	if (q->is_input_q) {

		seq_printf(m, "polling: %d  ack start: %d  ack count: %d\n",

			   q->u.in.polling, q->u.in.ack_start,

			   q->u.in.ack_count);

		seq_printf(m, "ack start: %d  ack count: %d\n",

			   q->u.in.ack_start, q->u.in.ack_count);

		seq_printf(m, "DSCI: %x   IRQs disabled: %u\n",

			   *(u8 *)q->irq_ptr->dsci,

			   test_bit(QDIO_QUEUE_IRQS_DISABLED,

CRA Git | Maintained and supported by SUSTech CRA and CCSE