Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Martin Schwidefsky:

 - The remaining patches for the z13 machine support: kernel build
   option for z13, the cache synonym avoidance, SMT support,
   compare-and-delay for spinloops and the CES5S crypto adapater.

 - The ftrace support for function tracing with the gcc hotpatch option.
   This touches common code Makefiles, Steven is ok with the changes.

 - The hypfs file system gets an extension to access diagnose 0x0c data
   in user space for performance analysis for Linux running under z/VM.

 - The iucv hvc console gets wildcard spport for the user id filtering.

 - The cacheinfo code is converted to use the generic infrastructure.

 - Cleanup and bug fixes.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (42 commits)
  s390/process: free vx save area when releasing tasks
  s390/hypfs: Eliminate hypfs interval
  s390/hypfs: Add diagnose 0c support
  s390/cacheinfo: don't use smp_processor_id() in preemptible context
  s390/zcrypt: fixed domain scanning problem (again)
  s390/smp: increase maximum value of NR_CPUS to 512
  s390/jump label: use different nop instruction
  s390/jump label: add sanity checks
  s390/mm: correct missing space when reporting user process faults
  s390/dasd: cleanup profiling
  s390/dasd: add locking for global_profile access
  s390/ftrace: hotpatch support for function tracing
  ftrace: let notrace function attribute disable hotpatching if necessary
  ftrace: allow architectures to specify ftrace compile options
  s390: reintroduce diag 44 calls for cpu_relax()
  s390/zcrypt: Add support for new crypto express (CEX5S) adapter.
  s390/zcrypt: Number of supported ap domains is not retrievable.
  s390/spinlock: add compare-and-delay to lock wait loops
  s390/tape: remove redundant if statement
  s390/hvc_iucv: add simple wildcard matches to the iucv allow filter
  ...

1 files changed, 100 insertions, 44 deletions

diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 4d41bf75c233..3d7f19fb9a4e 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -204,6 +204,24 @@ ap_test_queue(ap_qid_t qid, int *queue_depth, int *device_type)
 }
 
 /**
+ * ap_query_facilities(): PQAP(TAPQ) query facilities.
+ * @qid: The AP queue number
+ *
+ * Returns content of general register 2 after the PQAP(TAPQ)
+ * instruction was called.
+ */
+static inline unsigned long ap_query_facilities(ap_qid_t qid)
+{
+        register unsigned long reg0 asm ("0") = qid | 0x00800000UL;
+        register unsigned long reg1 asm ("1");
+        register unsigned long reg2 asm ("2") = 0UL;
+
+        asm volatile(".long 0xb2af0000"  /* PQAP(TAPQ) */
+                     : "+d" (reg0), "=d" (reg1), "+d" (reg2) : : "cc");
+        return reg2;
+}
+
+/**
  * ap_reset_queue(): Reset adjunct processor queue.
  * @qid: The AP queue number
  *
@@ -1007,6 +1025,51 @@ void ap_bus_force_rescan(void)
 EXPORT_SYMBOL(ap_bus_force_rescan);
 
 /*
+ * ap_test_config(): helper function to extract the nrth bit
+ *                   within the unsigned int array field.
+ */
+static inline int ap_test_config(unsigned int *field, unsigned int nr)
+{
+        if (nr > 0xFFu)
+                return 0;
+        return ap_test_bit((field + (nr >> 5)), (nr & 0x1f));
+}
+
+/*
+ * ap_test_config_card_id(): Test, whether an AP card ID is configured.
+ * @id AP card ID
+ *
+ * Returns 0 if the card is not configured
+ *         1 if the card is configured or
+ *           if the configuration information is not available
+ */
+static inline int ap_test_config_card_id(unsigned int id)
+{
+        if (!ap_configuration)
+                return 1;
+        return ap_test_config(ap_configuration->apm, id);
+}
+
+/*
+ * ap_test_config_domain(): Test, whether an AP usage domain is configured.
+ * @domain AP usage domain ID
+ *
+ * Returns 0 if the usage domain is not configured
+ *         1 if the usage domain is configured or
+ *           if the configuration information is not available
+ */
+static inline int ap_test_config_domain(unsigned int domain)
+{
+        if (!ap_configuration)    /* QCI not supported */
+                if (domain < 16)
+                        return 1; /* then domains 0...15 are configured */
+                else
+                        return 0;
+        else
+                return ap_test_config(ap_configuration->aqm, domain);
+}
+
+/*
  * AP bus attributes.
  */
 static ssize_t ap_domain_show(struct bus_type *bus, char *buf)
@@ -1121,6 +1184,42 @@ static ssize_t poll_timeout_store(struct bus_type *bus, const char *buf,
 
 static BUS_ATTR(poll_timeout, 0644, poll_timeout_show, poll_timeout_store);
 
+static ssize_t ap_max_domain_id_show(struct bus_type *bus, char *buf)
+{
+        ap_qid_t qid;
+        int i, nd, max_domain_id = -1;
+        unsigned long fbits;
+
+        if (ap_configuration) {
+                if (ap_domain_index >= 0 && ap_domain_index < AP_DOMAINS) {
+                        for (i = 0; i < AP_DEVICES; i++) {
+                                if (!ap_test_config_card_id(i))
+                                        continue;
+                                qid = AP_MKQID(i, ap_domain_index);
+                                fbits = ap_query_facilities(qid);
+                                if (fbits & (1UL << 57)) {
+                                        /* the N bit is 0, Nd field is filled */
+                                        nd = (int)((fbits & 0x00FF0000UL)>>16);
+                                        if (nd > 0)
+                                                max_domain_id = nd;
+                                        else
+                                                max_domain_id = 15;
+                                } else {
+                                        /* N bit is 1, max 16 domains */
+                                        max_domain_id = 15;
+                                }
+                                break;
+                        }
+                }
+        } else {
+                /* no APXA support, older machines with max 16 domains */
+                max_domain_id = 15;
+        }
+        return snprintf(buf, PAGE_SIZE, "%d\n", max_domain_id);
+}
+
+static BUS_ATTR(ap_max_domain_id, 0444, ap_max_domain_id_show, NULL);
+
 static struct bus_attribute *const ap_bus_attrs[] = {
         &bus_attr_ap_domain,
         &bus_attr_ap_control_domain_mask,
@@ -1128,50 +1227,10 @@ static struct bus_attribute *const ap_bus_attrs[] = {
         &bus_attr_poll_thread,
         &bus_attr_ap_interrupts,
         &bus_attr_poll_timeout,
+        &bus_attr_ap_max_domain_id,
         NULL,
 };
 
-static inline int ap_test_config(unsigned int *field, unsigned int nr)
-{
-        if (nr > 0xFFu)
-                return 0;
-        return ap_test_bit((field + (nr >> 5)), (nr & 0x1f));
-}
-
-/*
- * ap_test_config_card_id(): Test, whether an AP card ID is configured.
- * @id AP card ID
- *
- * Returns 0 if the card is not configured
- *         1 if the card is configured or
- *           if the configuration information is not available
- */
-static inline int ap_test_config_card_id(unsigned int id)
-{
-        if (!ap_configuration)
-                return 1;
-        return ap_test_config(ap_configuration->apm, id);
-}
-
-/*
- * ap_test_config_domain(): Test, whether an AP usage domain is configured.
- * @domain AP usage domain ID
- *
- * Returns 0 if the usage domain is not configured
- *         1 if the usage domain is configured or
- *           if the configuration information is not available
- */
-static inline int ap_test_config_domain(unsigned int domain)
-{
-        if (!ap_configuration)    /* QCI not supported */
-                if (domain < 16)
-                        return 1; /* then domains 0...15 are configured */
-                else
-                        return 0;
-        else
-                return ap_test_config(ap_configuration->aqm, domain);
-}
-
 /**
  * ap_query_configuration(): Query AP configuration information.
  *
@@ -1434,9 +1493,6 @@ static void ap_scan_bus(struct work_struct *unused)
                                 continue;
                         }
                         break;
-                case 11:
-                        ap_dev->device_type = 10;
-                        break;
                 default:
                         ap_dev->device_type = device_type;
                 }