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: 8f291ebf3270 ("s390/zcrypt: enable card/domain autoselect on ep11 cprbs")
Suggested-by: Ingo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: Harald Freudenberger <freude@linux.ibm.com>
Reviewed-by: Ingo Franzki <ifranzki@linux.ibm.com>
Cc: stable@vger.kernel.org
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/drivers/s390/crypto/zcrypt_ccamisc.c b/drivers/s390/crypto/zcrypt_ccamisc.c
index 573bad1d6d86c789810feebc83379c67810cb083..37a157a1d9691d0f69468dcca17daf325c643f7e 100644 (file)
--- a/drivers/s390/crypto/zcrypt_ccamisc.c
+++ b/drivers/s390/crypto/zcrypt_ccamisc.c
@@ -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 */
-       rc = zcrypt_device_status_ext(cardnr, domain, &devstat);
-       if (rc)
-               return rc;
-       ci->hwtype = devstat.hwtype;
+       /* 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.

diff --git a/drivers/s390/crypto/zcrypt_cex4.c b/drivers/s390/crypto/zcrypt_cex4.c
index e9a984903bffb7901bd0b33e2bc2e810440d2954..e7b0ed26a9ecdb4dd77bffc5d529565aef87af53 100644 (file)
--- a/drivers/s390/crypto/zcrypt_cex4.c
+++ b/drivers/s390/crypto/zcrypt_cex4.c
@@ -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);
 }