s390/ap: rename ap debug configuration option

The configuration option ZCRYPT_DEBUG is used only in ap queue code,
so rename it to AP_DEBUG. It also no longer depends on ZCRYPT but on
AP. While at it, also update the help text.

Signed-off-by: Holger Dengler <dengler@linux.ibm.com>
Reviewed-by: Harald Freudenberger <freude@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index db7eb4d77d38d826e56c3725ed0260a8c055aa41..b9857aacd40b87c9f3f16fa92524c98b14b0d88d 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -737,6 +737,20 @@ config AP
 
          If unsure, say Y (default).
 
+config AP_DEBUG
+       def_bool n
+       prompt "Enable debug features for Adjunct Processor (ap) devices"
+       depends on AP
+       help
+         Say 'Y' here to enable some additional debug features for Adjunct
+         Processor (ap) devices.
+
+         There will be some more sysfs attributes displayed for ap queues.
+
+         Do not enable on production level kernel build.
+
+         If unsure, say N.
+
 config VFIO_CCW
        def_tristate n
        prompt "Support for VFIO-CCW subchannels"

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 16385658fd35d90fe18eda9e471e04d6d6a5a9ca..bfe18ebc2a981bfef3a5225ed5c40f7578e580b0 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -75,23 +75,6 @@ config ZCRYPT
          to 8 in Coprocessor (CEXxC), EP11 Coprocessor (CEXxP)
          or Accelerator (CEXxA) mode.
 
-config ZCRYPT_DEBUG
-       bool "Enable debug features for s390 cryptographic adapters"
-       default n
-       depends on DEBUG_KERNEL
-       depends on ZCRYPT
-       help
-         Say 'Y' here to enable some additional debug features on the
-         s390 cryptographic adapters driver.
-
-         There will be some more sysfs attributes displayed for ap cards
-         and queues and some flags on crypto requests are interpreted as
-         debugging messages to force error injection.
-
-         Do not enable on production level kernel build.
-
-         If unsure, say N.
-
 config PKEY
        tristate "Kernel API for protected key handling"
        depends on S390

diff --git a/drivers/s390/crypto/ap_queue.c b/drivers/s390/crypto/ap_queue.c
index 6e4e8d324a6def068638e3418b8e9beef70a098f..1f647ffd6f4db933f8526f1f6f52c7e3c1e3ade5 100644 (file)
--- a/drivers/s390/crypto/ap_queue.c
+++ b/drivers/s390/crypto/ap_queue.c
@@ -708,7 +708,7 @@ static ssize_t ap_functions_show(struct device *dev,
 
 static DEVICE_ATTR_RO(ap_functions);
 
-#ifdef CONFIG_ZCRYPT_DEBUG
+#ifdef CONFIG_AP_DEBUG
 static ssize_t states_show(struct device *dev,
                           struct device_attribute *attr, char *buf)
 {
@@ -820,7 +820,7 @@ static struct attribute *ap_queue_dev_attrs[] = {
        &dev_attr_config.attr,
        &dev_attr_chkstop.attr,
        &dev_attr_ap_functions.attr,
-#ifdef CONFIG_ZCRYPT_DEBUG
+#ifdef CONFIG_AP_DEBUG
        &dev_attr_states.attr,
        &dev_attr_last_err_rc.attr,
 #endif