Commit 598bbefa authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Vasily Gorbik
Browse files

s390/zcrypt: Enable AUTOSEL_DOM for CCA serialnr sysfs attribute 



The serialnr sysfs attribute for CCA cards when queried always
used the default domain for sending the request down to the card.
If for any reason exactly this default domain is disabled then
the attribute code fails to retrieve the CCA info and the sysfs
entry shows an empty string. Works as designed but the serial
number is a card attribute and thus it does not matter which
domain is used for the query. So if there are other domains on
this card available, these could be used.

So extend the code to use AUTOSEL_DOM for the domain value to
address any online domain within the card for querying the cca
info and thus show the serialnr as long as there is one domain
usable regardless of the default domain setting.

Fixes: 8f291ebf ("s390/zcrypt: enable card/domain autoselect on ep11 cprbs")
Suggested-by: default avatarIngo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Reviewed-by: default avatarIngo Franzki <ifranzki@linux.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 75aa996e

drivers/s390/crypto/zcrypt_ccamisc.c

+7 −5
Original line number Diff line number Diff line
@@ -1639,11 +1639,13 @@ int cca_get_info(u16 cardnr, u16 domain, struct cca_info *ci, u32 xflags) 


	memset(ci, 0, sizeof(*ci));



	/* get first info from zcrypt device driver about this apqn */

	/* if specific domain given, fetch status and hw info for this apqn */

	if (domain != AUTOSEL_DOM) {

		rc = zcrypt_device_status_ext(cardnr, domain, &devstat);

		if (rc)

			return rc;

		ci->hwtype = devstat.hwtype;

	}



	/*

	 * Prep memory for rule array and var array use.

drivers/s390/crypto/zcrypt_cex4.c

+1 −2
Original line number Diff line number Diff line
@@ -85,8 +85,7 @@ static ssize_t cca_serialnr_show(struct device *dev, 


	memset(&ci, 0, sizeof(ci));



	if (ap_domain_index >= 0)

		cca_get_info(ac->id, ap_domain_index, &ci, 0);

	cca_get_info(ac->id, AUTOSEL_DOM, &ci, 0);



	return sysfs_emit(buf, "%s\n", ci.serial);

}