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

Pull s390 updates from Martin Schwidefsky:
 "The bulk of the s390 updates for v3.14.

  New features are the perf support for the CPU-Measurement Sample
  Facility and the EP11 support for the crypto cards.  And the normal
  cleanups and bug-fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (44 commits)
  s390/cpum_sf: fix printk format warnings
  s390: Fix misspellings using 'codespell' tool
  s390/qdio: bridgeport support - CHSC part
  s390: delete new instances of __cpuinit usage
  s390/compat: fix PSW32_USER_BITS definition
  s390/zcrypt: add support for EP11 coprocessor cards
  s390/mm: optimize randomize_et_dyn for !PF_RANDOMIZE
  s390: use IS_ENABLED to check if a CONFIG is set to y or m
  s390/cio: use device_lock to synchronize calls to the ccwgroup driver
  s390/cio: use device_lock to synchronize calls to the ccw driver
  s390/cio: fix unlocked access of online member
  s390/cpum_sf: Add flag to process full SDBs only
  s390/cpum_sf: Add raw data sampling to support the diagnostic-sampling function
  s390/cpum_sf: Filter perf events based event->attr.exclude_* settings
  s390/cpum_sf: Detect KVM guest samples
  s390/cpum_sf: Add helper to read TOD from trailer entries
  s390/cpum_sf: Atomically reset trailer entry fields of sample-data-blocks
  s390/cpum_sf: Dynamically extend the sampling buffer if overflows occur
  s390/pci: reenable per default
  s390/pci/dma: fix accounting of allocated_pages
  ...

8 files changed, 362 insertions, 9 deletions

diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 4bf9da03591e..5d7e8cf83bd6 100644
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -38,7 +38,8 @@
 
 #define PSW32_USER_BITS (PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT | \
                          PSW32_DEFAULT_KEY | PSW32_MASK_BASE | \
-                         PSW32_MASK_MCHECK | PSW32_MASK_PSTATE | PSW32_ASC_HOME)
+                         PSW32_MASK_MCHECK | PSW32_MASK_PSTATE | \
+                         PSW32_ASC_PRIMARY)
 
 #define COMPAT_USER_HZ          100
 #define COMPAT_UTS_MACHINE      "s390\0\0\0\0"
diff --git a/arch/s390/include/asm/cpu_mf.h b/arch/s390/include/asm/cpu_mf.h
index c879fad404c8..cb700d54bd83 100644
--- a/arch/s390/include/asm/cpu_mf.h
+++ b/arch/s390/include/asm/cpu_mf.h
@@ -56,6 +56,96 @@ struct cpumf_ctr_info {
         u32   reserved2[12];
 } __packed;
 
+/* QUERY SAMPLING INFORMATION block */
+struct hws_qsi_info_block {         /* Bit(s) */
+        unsigned int b0_13:14;      /* 0-13: zeros                       */
+        unsigned int as:1;          /* 14: basic-sampling authorization  */
+        unsigned int ad:1;          /* 15: diag-sampling authorization   */
+        unsigned int b16_21:6;      /* 16-21: zeros                      */
+        unsigned int es:1;          /* 22: basic-sampling enable control */
+        unsigned int ed:1;          /* 23: diag-sampling enable control  */
+        unsigned int b24_29:6;      /* 24-29: zeros                      */
+        unsigned int cs:1;          /* 30: basic-sampling activation control */
+        unsigned int cd:1;          /* 31: diag-sampling activation control */
+        unsigned int bsdes:16;      /* 4-5: size of basic sampling entry */
+        unsigned int dsdes:16;      /* 6-7: size of diagnostic sampling entry */
+        unsigned long min_sampl_rate; /* 8-15: minimum sampling interval */
+        unsigned long max_sampl_rate; /* 16-23: maximum sampling interval*/
+        unsigned long tear;         /* 24-31: TEAR contents              */
+        unsigned long dear;         /* 32-39: DEAR contents              */
+        unsigned int rsvrd0;        /* 40-43: reserved                   */
+        unsigned int cpu_speed;     /* 44-47: CPU speed                  */
+        unsigned long long rsvrd1;  /* 48-55: reserved                   */
+        unsigned long long rsvrd2;  /* 56-63: reserved                   */
+} __packed;
+
+/* SET SAMPLING CONTROLS request block */
+struct hws_lsctl_request_block {
+        unsigned int s:1;           /* 0: maximum buffer indicator       */
+        unsigned int h:1;           /* 1: part. level reserved for VM use*/
+        unsigned long long b2_53:52;/* 2-53: zeros                       */
+        unsigned int es:1;          /* 54: basic-sampling enable control */
+        unsigned int ed:1;          /* 55: diag-sampling enable control  */
+        unsigned int b56_61:6;      /* 56-61: - zeros                    */
+        unsigned int cs:1;          /* 62: basic-sampling activation control */
+        unsigned int cd:1;          /* 63: diag-sampling activation control  */
+        unsigned long interval;     /* 8-15: sampling interval           */
+        unsigned long tear;         /* 16-23: TEAR contents              */
+        unsigned long dear;         /* 24-31: DEAR contents              */
+        /* 32-63:                                                        */
+        unsigned long rsvrd1;       /* reserved                          */
+        unsigned long rsvrd2;       /* reserved                          */
+        unsigned long rsvrd3;       /* reserved                          */
+        unsigned long rsvrd4;       /* reserved                          */
+} __packed;
+
+struct hws_basic_entry {
+        unsigned int def:16;        /* 0-15  Data Entry Format           */
+        unsigned int R:4;           /* 16-19 reserved                    */
+        unsigned int U:4;           /* 20-23 Number of unique instruct.  */
+        unsigned int z:2;           /* zeros                             */
+        unsigned int T:1;           /* 26 PSW DAT mode                   */
+        unsigned int W:1;           /* 27 PSW wait state                 */
+        unsigned int P:1;           /* 28 PSW Problem state              */
+        unsigned int AS:2;          /* 29-30 PSW address-space control   */
+        unsigned int I:1;           /* 31 entry valid or invalid         */
+        unsigned int:16;
+        unsigned int prim_asn:16;   /* primary ASN                       */
+        unsigned long long ia;      /* Instruction Address               */
+        unsigned long long gpp;     /* Guest Program Parameter           */
+        unsigned long long hpp;     /* Host Program Parameter            */
+} __packed;
+
+struct hws_diag_entry {
+        unsigned int def:16;        /* 0-15  Data Entry Format           */
+        unsigned int R:14;          /* 16-19 and 20-30 reserved          */
+        unsigned int I:1;           /* 31 entry valid or invalid         */
+        u8           data[];        /* Machine-dependent sample data     */
+} __packed;
+
+struct hws_combined_entry {
+        struct hws_basic_entry  basic;  /* Basic-sampling data entry */
+        struct hws_diag_entry   diag;   /* Diagnostic-sampling data entry */
+} __packed;
+
+struct hws_trailer_entry {
+        union {
+                struct {
+                        unsigned int f:1;       /* 0 - Block Full Indicator   */
+                        unsigned int a:1;       /* 1 - Alert request control  */
+                        unsigned int t:1;       /* 2 - Timestamp format       */
+                        unsigned long long:61;  /* 3 - 63: Reserved           */
+                };
+                unsigned long long flags;       /* 0 - 63: All indicators     */
+        };
+        unsigned long long overflow;     /* 64 - sample Overflow count        */
+        unsigned char timestamp[16];     /* 16 - 31 timestamp                 */
+        unsigned long long reserved1;    /* 32 -Reserved                      */
+        unsigned long long reserved2;    /*                                   */
+        unsigned long long progusage1;   /* 48 - reserved for programming use */
+        unsigned long long progusage2;   /*                                   */
+} __packed;
+
 /* Query counter information */
 static inline int qctri(struct cpumf_ctr_info *info)
 {
@@ -99,4 +189,95 @@ static inline int ecctr(u64 ctr, u64 *val)
         return cc;
 }
 
+/* Query sampling information */
+static inline int qsi(struct hws_qsi_info_block *info)
+{
+        int cc;
+        cc = 1;
+
+        asm volatile(
+                "0:     .insn   s,0xb2860000,0(%1)\n"
+                "1:     lhi     %0,0\n"
+                "2:\n"
+                EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)
+                : "=d" (cc), "+a" (info)
+                : "m" (*info)
+                : "cc", "memory");
+
+        return cc ? -EINVAL : 0;
+}
+
+/* Load sampling controls */
+static inline int lsctl(struct hws_lsctl_request_block *req)
+{
+        int cc;
+
+        cc = 1;
+        asm volatile(
+                "0:     .insn   s,0xb2870000,0(%1)\n"
+                "1:     ipm     %0\n"
+                "       srl     %0,28\n"
+                "2:\n"
+                EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)
+                : "+d" (cc), "+a" (req)
+                : "m" (*req)
+                : "cc", "memory");
+
+        return cc ? -EINVAL : 0;
+}
+
+/* Sampling control helper functions */
+
+#include <linux/time.h>
+
+static inline unsigned long freq_to_sample_rate(struct hws_qsi_info_block *qsi,
+                                                unsigned long freq)
+{
+        return (USEC_PER_SEC / freq) * qsi->cpu_speed;
+}
+
+static inline unsigned long sample_rate_to_freq(struct hws_qsi_info_block *qsi,
+                                                unsigned long rate)
+{
+        return USEC_PER_SEC * qsi->cpu_speed / rate;
+}
+
+#define SDB_TE_ALERT_REQ_MASK   0x4000000000000000UL
+#define SDB_TE_BUFFER_FULL_MASK 0x8000000000000000UL
+
+/* Return TOD timestamp contained in an trailer entry */
+static inline unsigned long long trailer_timestamp(struct hws_trailer_entry *te)
+{
+        /* TOD in STCKE format */
+        if (te->t)
+                return *((unsigned long long *) &te->timestamp[1]);
+
+        /* TOD in STCK format */
+        return *((unsigned long long *) &te->timestamp[0]);
+}
+
+/* Return pointer to trailer entry of an sample data block */
+static inline unsigned long *trailer_entry_ptr(unsigned long v)
+{
+        void *ret;
+
+        ret = (void *) v;
+        ret += PAGE_SIZE;
+        ret -= sizeof(struct hws_trailer_entry);
+
+        return (unsigned long *) ret;
+}
+
+/* Return if the entry in the sample data block table (sdbt)
+ * is a link to the next sdbt */
+static inline int is_link_entry(unsigned long *s)
+{
+        return *s & 0x1ul ? 1 : 0;
+}
+
+/* Return pointer to the linked sdbt */
+static inline unsigned long *get_next_sdbt(unsigned long *s)
+{
+        return (unsigned long *) (*s & ~0x1ul);
+}
 #endif /* _ASM_S390_CPU_MF_H */
diff --git a/arch/s390/include/asm/css_chars.h b/arch/s390/include/asm/css_chars.h
index 7e1c917bbba2..09d1dd46bd57 100644
--- a/arch/s390/include/asm/css_chars.h
+++ b/arch/s390/include/asm/css_chars.h
@@ -29,6 +29,8 @@ struct css_general_char {
         u32 fcx : 1;     /* bit 88 */
         u32 : 19;
         u32 alt_ssi : 1; /* bit 108 */
+        u32:1;
+        u32 narf:1;      /* bit 110 */
 } __packed;
 
 extern struct css_general_char css_general_characteristics;
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index c129ab2ac731..2583466f576b 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -144,6 +144,7 @@ int clp_disable_fh(struct zpci_dev *);
 void zpci_event_error(void *);
 void zpci_event_availability(void *);
 void zpci_rescan(void);
+bool zpci_is_enabled(void);
 #else /* CONFIG_PCI */
 static inline void zpci_event_error(void *e) {}
 static inline void zpci_event_availability(void *e) {}
diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h
index 1141fb3e7b21..159a8ec6da9a 100644
--- a/arch/s390/include/asm/perf_event.h
+++ b/arch/s390/include/asm/perf_event.h
@@ -1,21 +1,40 @@
 /*
  * Performance event support - s390 specific definitions.
  *
- * Copyright IBM Corp. 2009, 2012
+ * Copyright IBM Corp. 2009, 2013
  * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
  *            Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
  */
 
-#include <asm/cpu_mf.h>
+#ifndef _ASM_S390_PERF_EVENT_H
+#define _ASM_S390_PERF_EVENT_H
 
-/* CPU-measurement counter facility */
-#define PERF_CPUM_CF_MAX_CTR            256
+#ifdef CONFIG_64BIT
+
+#include <linux/perf_event.h>
+#include <linux/device.h>
+#include <asm/cpu_mf.h>
 
 /* Per-CPU flags for PMU states */
 #define PMU_F_RESERVED                  0x1000
 #define PMU_F_ENABLED                   0x2000
+#define PMU_F_IN_USE                    0x4000
+#define PMU_F_ERR_IBE                   0x0100
+#define PMU_F_ERR_LSDA                  0x0200
+#define PMU_F_ERR_MASK                  (PMU_F_ERR_IBE|PMU_F_ERR_LSDA)
+
+/* Perf defintions for PMU event attributes in sysfs */
+extern __init const struct attribute_group **cpumf_cf_event_group(void);
+extern ssize_t cpumf_events_sysfs_show(struct device *dev,
+                                       struct device_attribute *attr,
+                                       char *page);
+#define EVENT_VAR(_cat, _name)          event_attr_##_cat##_##_name
+#define EVENT_PTR(_cat, _name)          (&EVENT_VAR(_cat, _name).attr.attr)
+
+#define CPUMF_EVENT_ATTR(cat, name, id)                 \
+        PMU_EVENT_ATTR(name, EVENT_VAR(cat, name), id, cpumf_events_sysfs_show)
+#define CPUMF_EVENT_PTR(cat, name)      EVENT_PTR(cat, name)
 
-#ifdef CONFIG_64BIT
 
 /* Perf callbacks */
 struct pt_regs;
@@ -23,4 +42,55 @@ extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
 extern unsigned long perf_misc_flags(struct pt_regs *regs);
 #define perf_misc_flags(regs) perf_misc_flags(regs)
 
+/* Perf pt_regs extension for sample-data-entry indicators */
+struct perf_sf_sde_regs {
+        unsigned char in_guest:1;         /* guest sample */
+        unsigned long reserved:63;        /* reserved */
+};
+
+/* Perf PMU definitions for the counter facility */
+#define PERF_CPUM_CF_MAX_CTR            256
+
+/* Perf PMU definitions for the sampling facility */
+#define PERF_CPUM_SF_MAX_CTR            2
+#define PERF_EVENT_CPUM_SF              0xB0000UL /* Event: Basic-sampling */
+#define PERF_EVENT_CPUM_SF_DIAG         0xBD000UL /* Event: Combined-sampling */
+#define PERF_CPUM_SF_BASIC_MODE         0x0001    /* Basic-sampling flag */
+#define PERF_CPUM_SF_DIAG_MODE          0x0002    /* Diagnostic-sampling flag */
+#define PERF_CPUM_SF_MODE_MASK          (PERF_CPUM_SF_BASIC_MODE| \
+                                         PERF_CPUM_SF_DIAG_MODE)
+#define PERF_CPUM_SF_FULL_BLOCKS        0x0004    /* Process full SDBs only */
+
+#define REG_NONE                0
+#define REG_OVERFLOW            1
+#define OVERFLOW_REG(hwc)       ((hwc)->extra_reg.config)
+#define SFB_ALLOC_REG(hwc)      ((hwc)->extra_reg.alloc)
+#define RAWSAMPLE_REG(hwc)      ((hwc)->config)
+#define TEAR_REG(hwc)           ((hwc)->last_tag)
+#define SAMPL_RATE(hwc)         ((hwc)->event_base)
+#define SAMPL_FLAGS(hwc)        ((hwc)->config_base)
+#define SAMPL_DIAG_MODE(hwc)    (SAMPL_FLAGS(hwc) & PERF_CPUM_SF_DIAG_MODE)
+#define SDB_FULL_BLOCKS(hwc)    (SAMPL_FLAGS(hwc) & PERF_CPUM_SF_FULL_BLOCKS)
+
+/* Structure for sampling data entries to be passed as perf raw sample data
+ * to user space.  Note that raw sample data must be aligned and, thus, might
+ * be padded with zeros.
+ */
+struct sf_raw_sample {
+#define SF_RAW_SAMPLE_BASIC     PERF_CPUM_SF_BASIC_MODE
+#define SF_RAW_SAMPLE_DIAG      PERF_CPUM_SF_DIAG_MODE
+        u64                     format;
+        u32                      size;    /* Size of sf_raw_sample */
+        u16                     bsdes;    /* Basic-sampling data entry size */
+        u16                     dsdes;    /* Diagnostic-sampling data entry size */
+        struct hws_basic_entry  basic;    /* Basic-sampling data entry */
+        struct hws_diag_entry    diag;    /* Diagnostic-sampling data entry */
+        u8                  padding[];    /* Padding to next multiple of 8 */
+} __packed;
+
+/* Perf hardware reserve and release functions */
+int perf_reserve_sampling(void);
+void perf_release_sampling(void);
+
 #endif /* CONFIG_64BIT */
+#endif /* _ASM_S390_PERF_EVENT_H */
diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index 57d0d7e794b1..d786c634e052 100644
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -336,7 +336,7 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,
 #define QDIO_FLAG_CLEANUP_USING_HALT            0x02
 
 /**
- * struct qdio_initialize - qdio initalization data
+ * struct qdio_initialize - qdio initialization data
  * @cdev: associated ccw device
  * @q_format: queue format
  * @adapter_name: name for the adapter
@@ -378,6 +378,34 @@ struct qdio_initialize {
         struct qdio_outbuf_state *output_sbal_state_array;
 };
 
+/**
+ * enum qdio_brinfo_entry_type - type of address entry for qdio_brinfo_desc()
+ * @l3_ipv6_addr: entry contains IPv6 address
+ * @l3_ipv4_addr: entry contains IPv4 address
+ * @l2_addr_lnid: entry contains MAC address and VLAN ID
+ */
+enum qdio_brinfo_entry_type {l3_ipv6_addr, l3_ipv4_addr, l2_addr_lnid};
+
+/**
+ * struct qdio_brinfo_entry_XXX - Address entry for qdio_brinfo_desc()
+ * @nit:  Network interface token
+ * @addr: Address of one of the three types
+ *
+ * The struct is passed to the callback function by qdio_brinfo_desc()
+ */
+struct qdio_brinfo_entry_l3_ipv6 {
+        u64 nit;
+        struct { unsigned char _s6_addr[16]; } addr;
+} __packed;
+struct qdio_brinfo_entry_l3_ipv4 {
+        u64 nit;
+        struct { uint32_t _s_addr; } addr;
+} __packed;
+struct qdio_brinfo_entry_l2 {
+        u64 nit;
+        struct { u8 mac[6]; u16 lnid; } addr_lnid;
+} __packed;
+
 #define QDIO_STATE_INACTIVE             0x00000002 /* after qdio_cleanup */
 #define QDIO_STATE_ESTABLISHED          0x00000004 /* after qdio_establish */
 #define QDIO_STATE_ACTIVE               0x00000008 /* after qdio_activate */
@@ -399,5 +427,10 @@ extern int qdio_get_next_buffers(struct ccw_device *, int, int *, int *);
 extern int qdio_shutdown(struct ccw_device *, int);
 extern int qdio_free(struct ccw_device *);
 extern int qdio_get_ssqd_desc(struct ccw_device *, struct qdio_ssqd_desc *);
+extern int qdio_pnso_brinfo(struct subchannel_id schid,
+                int cnc, u16 *response,
+                void (*cb)(void *priv, enum qdio_brinfo_entry_type type,
+                                void *entry),
+                void *priv);
 
 #endif /* __QDIO_H__ */
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index 2f390956c7c1..220e171413f8 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -52,8 +52,8 @@ int sclp_chp_configure(struct chp_id chpid);
 int sclp_chp_deconfigure(struct chp_id chpid);
 int sclp_chp_read_info(struct sclp_chp_info *info);
 void sclp_get_ipl_info(struct sclp_ipl_info *info);
-bool sclp_has_linemode(void);
-bool sclp_has_vt220(void);
+bool __init sclp_has_linemode(void);
+bool __init sclp_has_vt220(void);
 int sclp_pci_configure(u32 fid);
 int sclp_pci_deconfigure(u32 fid);
 int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode);
diff --git a/arch/s390/include/uapi/asm/zcrypt.h b/arch/s390/include/uapi/asm/zcrypt.h
index e83fc116f5bf..f2b18eacaca8 100644
--- a/arch/s390/include/uapi/asm/zcrypt.h
+++ b/arch/s390/include/uapi/asm/zcrypt.h
@@ -154,6 +154,67 @@ struct ica_xcRB {
         unsigned short  priority_window;
         unsigned int    status;
 } __attribute__((packed));
+
+/**
+ * struct ep11_cprb - EP11 connectivity programming request block
+ * @cprb_len:           CPRB header length [0x0020]
+ * @cprb_ver_id:        CPRB version id.   [0x04]
+ * @pad_000:            Alignment pad bytes
+ * @flags:              Admin cmd [0x80] or functional cmd [0x00]
+ * @func_id:            Function id / subtype [0x5434]
+ * @source_id:          Source id [originator id]
+ * @target_id:          Target id [usage/ctrl domain id]
+ * @ret_code:           Return code
+ * @reserved1:          Reserved
+ * @reserved2:          Reserved
+ * @payload_len:        Payload length
+ */
+struct ep11_cprb {
+        uint16_t        cprb_len;
+        unsigned char   cprb_ver_id;
+        unsigned char   pad_000[2];
+        unsigned char   flags;
+        unsigned char   func_id[2];
+        uint32_t        source_id;
+        uint32_t        target_id;
+        uint32_t        ret_code;
+        uint32_t        reserved1;
+        uint32_t        reserved2;
+        uint32_t        payload_len;
+} __attribute__((packed));
+
+/**
+ * struct ep11_target_dev - EP11 target device list
+ * @ap_id:      AP device id
+ * @dom_id:     Usage domain id
+ */
+struct ep11_target_dev {
+        uint16_t ap_id;
+        uint16_t dom_id;
+};
+
+/**
+ * struct ep11_urb - EP11 user request block
+ * @targets_num:        Number of target adapters
+ * @targets:            Addr to target adapter list
+ * @weight:             Level of request priority
+ * @req_no:             Request id/number
+ * @req_len:            Request length
+ * @req:                Addr to request block
+ * @resp_len:           Response length
+ * @resp:               Addr to response block
+ */
+struct ep11_urb {
+        uint16_t                targets_num;
+        uint64_t                targets;
+        uint64_t                weight;
+        uint64_t                req_no;
+        uint64_t                req_len;
+        uint64_t                req;
+        uint64_t                resp_len;
+        uint64_t                resp;
+} __attribute__((packed));
+
 #define AUTOSELECT ((unsigned int)0xFFFFFFFF)
 
 #define ZCRYPT_IOCTL_MAGIC 'z'
@@ -183,6 +244,9 @@ struct ica_xcRB {
  *   ZSECSENDCPRB
  *     Send an arbitrary CPRB to a crypto card.
  *
+ *   ZSENDEP11CPRB
+ *     Send an arbitrary EP11 CPRB to an EP11 coprocessor crypto card.
+ *
  *   Z90STAT_STATUS_MASK
  *     Return an 64 element array of unsigned chars for the status of
  *     all devices.
@@ -256,6 +320,7 @@ struct ica_xcRB {
 #define ICARSAMODEXPO   _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x05, 0)
 #define ICARSACRT       _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x06, 0)
 #define ZSECSENDCPRB    _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x81, 0)
+#define ZSENDEP11CPRB   _IOC(_IOC_READ|_IOC_WRITE, ZCRYPT_IOCTL_MAGIC, 0x04, 0)
 
 /* New status calls */
 #define Z90STAT_TOTALCOUNT      _IOR(ZCRYPT_IOCTL_MAGIC, 0x40, int)