Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
index a35362241805..4785d07cd447 100644
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@ -87,6 +87,7 @@ struct ap_queue_status {
 #define AP_RESPONSE_INDEX_TOO_BIG       0x11
 #define AP_RESPONSE_NO_FIRST_PART       0x13
 #define AP_RESPONSE_MESSAGE_TOO_BIG     0x15
+#define AP_RESPONSE_REQ_FAC_NOT_INST    0x16
 
 /*
  * Known device types
@@ -96,8 +97,8 @@ struct ap_queue_status {
 #define AP_DEVICE_TYPE_PCIXCC   5
 #define AP_DEVICE_TYPE_CEX2A    6
 #define AP_DEVICE_TYPE_CEX2C    7
-#define AP_DEVICE_TYPE_CEX2A2   8
-#define AP_DEVICE_TYPE_CEX2C2   9
+#define AP_DEVICE_TYPE_CEX3A    8
+#define AP_DEVICE_TYPE_CEX3C    9
 
 /*
  * AP reset flag states
@@ -161,12 +162,25 @@ struct ap_message {
         size_t length;                  /* Message length. */
 
         void *private;                  /* ap driver private pointer. */
+        unsigned int special:1;         /* Used for special commands. */
 };
 
 #define AP_DEVICE(dt)                                   \
         .dev_type=(dt),                                 \
         .match_flags=AP_DEVICE_ID_MATCH_DEVICE_TYPE,
 
+/**
+ * ap_init_message() - Initialize ap_message.
+ * Initialize a message before using. Otherwise this might result in
+ * unexpected behaviour.
+ */
+static inline void ap_init_message(struct ap_message *ap_msg)
+{
+        ap_msg->psmid = 0;
+        ap_msg->length = 0;
+        ap_msg->special = 0;
+}
+
 /*
  * Note: don't use ap_send/ap_recv after using ap_queue_message
  * for the first time. Otherwise the ap message queue will get