s390/zcrypt: remove support for PCICC and PCICA cards
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Mon, 14 Sep 2015 15:28:26 +0000 (17:28 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 14 Oct 2015 12:32:24 +0000 (14:32 +0200)
Remove the code for really old crypt cards, PCICC and PCICA.
These cards have been out of service for several years.

Reviewd-by: Ingo Tuchscherer <ingo.tuchscherer@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/crypto/Makefile
drivers/s390/crypto/ap_bus.c
drivers/s390/crypto/zcrypt_pcica.c [deleted file]
drivers/s390/crypto/zcrypt_pcica.h [deleted file]
drivers/s390/crypto/zcrypt_pcicc.c [deleted file]
drivers/s390/crypto/zcrypt_pcicc.h [deleted file]

index 771faf7094d602d8fb5e17eb062980b3a093bc47..57f710b3c8a42862357d65653494f72d89580b32 100644 (file)
@@ -3,6 +3,6 @@
 #
 
 ap-objs := ap_bus.o
-obj-$(CONFIG_ZCRYPT) += ap.o zcrypt_api.o zcrypt_pcicc.o zcrypt_pcixcc.o
-obj-$(CONFIG_ZCRYPT) += zcrypt_pcica.o zcrypt_cex2a.o zcrypt_cex4.o
+obj-$(CONFIG_ZCRYPT) += ap.o zcrypt_api.o zcrypt_pcixcc.o
+obj-$(CONFIG_ZCRYPT) += zcrypt_cex2a.o zcrypt_cex4.o
 obj-$(CONFIG_ZCRYPT) += zcrypt_msgtype6.o zcrypt_msgtype50.o
index 92d3b67b38390a5517fec204009fc23bcb886522..1d61c8698425d7d2f84c49e8d92d95f0e0246851 100644 (file)
@@ -1590,103 +1590,6 @@ static int ap_select_domain(void)
        return -ENODEV;
 }
 
-/**
- * ap_probe_device_type(): Find the device type of an AP.
- * @ap_dev: pointer to the AP device.
- *
- * Find the device type if query queue returned a device type of 0.
- */
-static int ap_probe_device_type(struct ap_device *ap_dev)
-{
-       static unsigned char msg[] = {
-               0x00,0x06,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x58,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x01,0x00,0x43,0x43,0x41,0x2d,0x41,0x50,
-               0x50,0x4c,0x20,0x20,0x20,0x01,0x01,0x01,
-               0x00,0x00,0x00,0x00,0x50,0x4b,0x00,0x00,
-               0x00,0x00,0x01,0x1c,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x05,0xb8,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x70,0x00,0x41,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x54,0x32,0x01,0x00,0xa0,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0xb8,0x05,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x0a,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-               0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,
-               0x49,0x43,0x53,0x46,0x20,0x20,0x20,0x20,
-               0x50,0x4b,0x0a,0x00,0x50,0x4b,0x43,0x53,
-               0x2d,0x31,0x2e,0x32,0x37,0x00,0x11,0x22,
-               0x33,0x44,0x55,0x66,0x77,0x88,0x99,0x00,
-               0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88,
-               0x99,0x00,0x11,0x22,0x33,0x44,0x55,0x66,
-               0x77,0x88,0x99,0x00,0x11,0x22,0x33,0x44,
-               0x55,0x66,0x77,0x88,0x99,0x00,0x11,0x22,
-               0x33,0x44,0x55,0x66,0x77,0x88,0x99,0x00,
-               0x11,0x22,0x33,0x5d,0x00,0x5b,0x00,0x77,
-               0x88,0x1e,0x00,0x00,0x57,0x00,0x00,0x00,
-               0x00,0x04,0x00,0x00,0x4f,0x00,0x00,0x00,
-               0x03,0x02,0x00,0x00,0x40,0x01,0x00,0x01,
-               0xce,0x02,0x68,0x2d,0x5f,0xa9,0xde,0x0c,
-               0xf6,0xd2,0x7b,0x58,0x4b,0xf9,0x28,0x68,
-               0x3d,0xb4,0xf4,0xef,0x78,0xd5,0xbe,0x66,
-               0x63,0x42,0xef,0xf8,0xfd,0xa4,0xf8,0xb0,
-               0x8e,0x29,0xc2,0xc9,0x2e,0xd8,0x45,0xb8,
-               0x53,0x8c,0x6f,0x4e,0x72,0x8f,0x6c,0x04,
-               0x9c,0x88,0xfc,0x1e,0xc5,0x83,0x55,0x57,
-               0xf7,0xdd,0xfd,0x4f,0x11,0x36,0x95,0x5d,
-       };
-       struct ap_queue_status status;
-       unsigned long long psmid;
-       char *reply;
-       int rc, i;
-
-       reply = (void *) get_zeroed_page(GFP_KERNEL);
-       if (!reply) {
-               rc = -ENOMEM;
-               goto out;
-       }
-
-       status = __ap_send(ap_dev->qid, 0x0102030405060708ULL,
-                          msg, sizeof(msg), 0);
-       if (status.response_code != AP_RESPONSE_NORMAL) {
-               rc = -ENODEV;
-               goto out_free;
-       }
-
-       /* Wait for the test message to complete. */
-       for (i = 0; i < 6; i++) {
-               msleep(300);
-               status = __ap_recv(ap_dev->qid, &psmid, reply, 4096);
-               if (status.response_code == AP_RESPONSE_NORMAL &&
-                   psmid == 0x0102030405060708ULL)
-                       break;
-       }
-       if (i < 6) {
-               /* Got an answer. */
-               if (reply[0] == 0x00 && reply[1] == 0x86)
-                       ap_dev->device_type = AP_DEVICE_TYPE_PCICC;
-               else
-                       ap_dev->device_type = AP_DEVICE_TYPE_PCICA;
-               rc = 0;
-       } else
-               rc = -ENODEV;
-
-out_free:
-       free_page((unsigned long) reply);
-out:
-       return rc;
-}
-
 /**
  * __ap_scan_bus(): Scan the AP bus.
  * @dev: Pointer to device
@@ -1750,12 +1653,6 @@ static void ap_scan_bus(struct work_struct *unused)
                INIT_LIST_HEAD(&ap_dev->list);
                setup_timer(&ap_dev->timeout, ap_request_timeout,
                            (unsigned long) ap_dev);
-               if (ap_dev->device_type == 0)
-                       /* device type probing for old cards */
-                       if (ap_probe_device_type(ap_dev)) {
-                               kfree(ap_dev);
-                               continue;
-                       }
 
                ap_dev->device.bus = &ap_bus_type;
                ap_dev->device.parent = ap_root_device;
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c
deleted file mode 100644 (file)
index 6af9c9f..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2006
- *  Author(s): Robert Burroughs
- *            Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *                               Ralph Wuerthner <rwuerthn@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define KMSG_COMPONENT "zcrypt"
-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/atomic.h>
-#include <asm/uaccess.h>
-
-#include "ap_bus.h"
-#include "zcrypt_api.h"
-#include "zcrypt_error.h"
-#include "zcrypt_pcica.h"
-
-#define PCICA_MIN_MOD_SIZE       1     /*    8 bits    */
-#define PCICA_MAX_MOD_SIZE     256     /* 2048 bits    */
-
-#define PCICA_SPEED_RATING     2800
-
-#define PCICA_MAX_MESSAGE_SIZE 0x3a0   /* sizeof(struct type4_lcr)          */
-#define PCICA_MAX_RESPONSE_SIZE 0x110  /* max outputdatalength + type80_hdr */
-
-#define PCICA_CLEANUP_TIME     (15*HZ)
-
-static struct ap_device_id zcrypt_pcica_ids[] = {
-       { AP_DEVICE(AP_DEVICE_TYPE_PCICA) },
-       { /* end of list */ },
-};
-
-MODULE_DEVICE_TABLE(ap, zcrypt_pcica_ids);
-MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("PCICA Cryptographic Coprocessor device driver, "
-                  "Copyright IBM Corp. 2001, 2006");
-MODULE_LICENSE("GPL");
-
-static int zcrypt_pcica_probe(struct ap_device *ap_dev);
-static void zcrypt_pcica_remove(struct ap_device *ap_dev);
-static void zcrypt_pcica_receive(struct ap_device *, struct ap_message *,
-                                struct ap_message *);
-
-static struct ap_driver zcrypt_pcica_driver = {
-       .probe = zcrypt_pcica_probe,
-       .remove = zcrypt_pcica_remove,
-       .ids = zcrypt_pcica_ids,
-       .request_timeout = PCICA_CLEANUP_TIME,
-};
-
-/**
- * Convert a ICAMEX message to a type4 MEX message.
- *
- * @zdev: crypto device pointer
- * @zreq: crypto request pointer
- * @mex: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICAMEX_msg_to_type4MEX_msg(struct zcrypt_device *zdev,
-                                     struct ap_message *ap_msg,
-                                     struct ica_rsa_modexpo *mex)
-{
-       unsigned char *modulus, *exponent, *message;
-       int mod_len;
-
-       mod_len = mex->inputdatalength;
-
-       if (mod_len <= 128) {
-               struct type4_sme *sme = ap_msg->message;
-               memset(sme, 0, sizeof(*sme));
-               ap_msg->length = sizeof(*sme);
-               sme->header.msg_fmt = TYPE4_SME_FMT;
-               sme->header.msg_len = sizeof(*sme);
-               sme->header.msg_type_code = TYPE4_TYPE_CODE;
-               sme->header.request_code = TYPE4_REQU_CODE;
-               modulus = sme->modulus + sizeof(sme->modulus) - mod_len;
-               exponent = sme->exponent + sizeof(sme->exponent) - mod_len;
-               message = sme->message + sizeof(sme->message) - mod_len;
-       } else {
-               struct type4_lme *lme = ap_msg->message;
-               memset(lme, 0, sizeof(*lme));
-               ap_msg->length = sizeof(*lme);
-               lme->header.msg_fmt = TYPE4_LME_FMT;
-               lme->header.msg_len = sizeof(*lme);
-               lme->header.msg_type_code = TYPE4_TYPE_CODE;
-               lme->header.request_code = TYPE4_REQU_CODE;
-               modulus = lme->modulus + sizeof(lme->modulus) - mod_len;
-               exponent = lme->exponent + sizeof(lme->exponent) - mod_len;
-               message = lme->message + sizeof(lme->message) - mod_len;
-       }
-
-       if (copy_from_user(modulus, mex->n_modulus, mod_len) ||
-           copy_from_user(exponent, mex->b_key, mod_len) ||
-           copy_from_user(message, mex->inputdata, mod_len))
-               return -EFAULT;
-       return 0;
-}
-
-/**
- * Convert a ICACRT message to a type4 CRT message.
- *
- * @zdev: crypto device pointer
- * @zreq: crypto request pointer
- * @crt: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICACRT_msg_to_type4CRT_msg(struct zcrypt_device *zdev,
-                                     struct ap_message *ap_msg,
-                                     struct ica_rsa_modexpo_crt *crt)
-{
-       unsigned char *p, *q, *dp, *dq, *u, *inp;
-       int mod_len, short_len, long_len;
-
-       mod_len = crt->inputdatalength;
-       short_len = (mod_len + 1) / 2;
-       long_len = mod_len / 2 + 8;
-
-       if (mod_len <= 128) {
-               struct type4_scr *scr = ap_msg->message;
-               memset(scr, 0, sizeof(*scr));
-               ap_msg->length = sizeof(*scr);
-               scr->header.msg_type_code = TYPE4_TYPE_CODE;
-               scr->header.request_code = TYPE4_REQU_CODE;
-               scr->header.msg_fmt = TYPE4_SCR_FMT;
-               scr->header.msg_len = sizeof(*scr);
-               p = scr->p + sizeof(scr->p) - long_len;
-               q = scr->q + sizeof(scr->q) - short_len;
-               dp = scr->dp + sizeof(scr->dp) - long_len;
-               dq = scr->dq + sizeof(scr->dq) - short_len;
-               u = scr->u + sizeof(scr->u) - long_len;
-               inp = scr->message + sizeof(scr->message) - mod_len;
-       } else {
-               struct type4_lcr *lcr = ap_msg->message;
-               memset(lcr, 0, sizeof(*lcr));
-               ap_msg->length = sizeof(*lcr);
-               lcr->header.msg_type_code = TYPE4_TYPE_CODE;
-               lcr->header.request_code = TYPE4_REQU_CODE;
-               lcr->header.msg_fmt = TYPE4_LCR_FMT;
-               lcr->header.msg_len = sizeof(*lcr);
-               p = lcr->p + sizeof(lcr->p) - long_len;
-               q = lcr->q + sizeof(lcr->q) - short_len;
-               dp = lcr->dp + sizeof(lcr->dp) - long_len;
-               dq = lcr->dq + sizeof(lcr->dq) - short_len;
-               u = lcr->u + sizeof(lcr->u) - long_len;
-               inp = lcr->message + sizeof(lcr->message) - mod_len;
-       }
-
-       if (copy_from_user(p, crt->np_prime, long_len) ||
-           copy_from_user(q, crt->nq_prime, short_len) ||
-           copy_from_user(dp, crt->bp_key, long_len) ||
-           copy_from_user(dq, crt->bq_key, short_len) ||
-           copy_from_user(u, crt->u_mult_inv, long_len) ||
-           copy_from_user(inp, crt->inputdata, mod_len))
-               return -EFAULT;
-       return 0;
-}
-
-/**
- * Copy results from a type 84 reply message back to user space.
- *
- * @zdev: crypto device pointer
- * @reply: reply AP message.
- * @data: pointer to user output data
- * @length: size of user output data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int convert_type84(struct zcrypt_device *zdev,
-                         struct ap_message *reply,
-                         char __user *outputdata,
-                         unsigned int outputdatalength)
-{
-       struct type84_hdr *t84h = reply->message;
-       char *data;
-
-       if (t84h->len < sizeof(*t84h) + outputdatalength) {
-               /* The result is too short, the PCICA card may not do that.. */
-               zdev->online = 0;
-               pr_err("Cryptographic device %x failed and was set offline\n",
-                      zdev->ap_dev->qid);
-               ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                              zdev->ap_dev->qid, zdev->online, t84h->code);
-               return -EAGAIN; /* repeat the request on a different device. */
-       }
-       BUG_ON(t84h->len > PCICA_MAX_RESPONSE_SIZE);
-       data = reply->message + t84h->len - outputdatalength;
-       if (copy_to_user(outputdata, data, outputdatalength))
-               return -EFAULT;
-       return 0;
-}
-
-static int convert_response(struct zcrypt_device *zdev,
-                           struct ap_message *reply,
-                           char __user *outputdata,
-                           unsigned int outputdatalength)
-{
-       /* Response type byte is the second byte in the response. */
-       switch (((unsigned char *) reply->message)[1]) {
-       case TYPE82_RSP_CODE:
-       case TYPE88_RSP_CODE:
-               return convert_error(zdev, reply);
-       case TYPE84_RSP_CODE:
-               return convert_type84(zdev, reply,
-                                     outputdata, outputdatalength);
-       default: /* Unknown response type, this should NEVER EVER happen */
-               zdev->online = 0;
-               pr_err("Cryptographic device %x failed and was set offline\n",
-                      zdev->ap_dev->qid);
-               ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%dfail",
-                              zdev->ap_dev->qid, zdev->online);
-               return -EAGAIN; /* repeat the request on a different device. */
-       }
-}
-
-/**
- * This function is called from the AP bus code after a crypto request
- * "msg" has finished with the reply message "reply".
- * It is called from tasklet context.
- * @ap_dev: pointer to the AP device
- * @msg: pointer to the AP message
- * @reply: pointer to the AP reply message
- */
-static void zcrypt_pcica_receive(struct ap_device *ap_dev,
-                                struct ap_message *msg,
-                                struct ap_message *reply)
-{
-       static struct error_hdr error_reply = {
-               .type = TYPE82_RSP_CODE,
-               .reply_code = REP82_ERROR_MACHINE_FAILURE,
-       };
-       struct type84_hdr *t84h;
-       int length;
-
-       /* Copy the reply message to the request message buffer. */
-       if (!reply)
-               goto out;       /* ap_msg->rc indicates the error */
-       t84h = reply->message;
-       if (t84h->code == TYPE84_RSP_CODE) {
-               length = min(PCICA_MAX_RESPONSE_SIZE, (int) t84h->len);
-               memcpy(msg->message, reply->message, length);
-       } else
-               memcpy(msg->message, reply->message, sizeof error_reply);
-out:
-       complete((struct completion *) msg->private);
-}
-
-static atomic_t zcrypt_step = ATOMIC_INIT(0);
-
-/**
- * The request distributor calls this function if it picked the PCICA
- * device to handle a modexpo request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *       PCICA device to the request distributor
- * @mex: pointer to the modexpo request buffer
- */
-static long zcrypt_pcica_modexpo(struct zcrypt_device *zdev,
-                                struct ica_rsa_modexpo *mex)
-{
-       struct ap_message ap_msg;
-       struct completion work;
-       int rc;
-
-       ap_init_message(&ap_msg);
-       ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
-       if (!ap_msg.message)
-               return -ENOMEM;
-       ap_msg.receive = zcrypt_pcica_receive;
-       ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                               atomic_inc_return(&zcrypt_step);
-       ap_msg.private = &work;
-       rc = ICAMEX_msg_to_type4MEX_msg(zdev, &ap_msg, mex);
-       if (rc)
-               goto out_free;
-       init_completion(&work);
-       ap_queue_message(zdev->ap_dev, &ap_msg);
-       rc = wait_for_completion_interruptible(&work);
-       if (rc == 0) {
-               rc = ap_msg.rc;
-               if (rc == 0)
-                       rc = convert_response(zdev, &ap_msg, mex->outputdata,
-                                             mex->outputdatalength);
-       } else
-               /* Signal pending. */
-               ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-       kfree(ap_msg.message);
-       return rc;
-}
-
-/**
- * The request distributor calls this function if it picked the PCICA
- * device to handle a modexpo_crt request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *       PCICA device to the request distributor
- * @crt: pointer to the modexpoc_crt request buffer
- */
-static long zcrypt_pcica_modexpo_crt(struct zcrypt_device *zdev,
-                                    struct ica_rsa_modexpo_crt *crt)
-{
-       struct ap_message ap_msg;
-       struct completion work;
-       int rc;
-
-       ap_init_message(&ap_msg);
-       ap_msg.message = kmalloc(PCICA_MAX_MESSAGE_SIZE, GFP_KERNEL);
-       if (!ap_msg.message)
-               return -ENOMEM;
-       ap_msg.receive = zcrypt_pcica_receive;
-       ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                               atomic_inc_return(&zcrypt_step);
-       ap_msg.private = &work;
-       rc = ICACRT_msg_to_type4CRT_msg(zdev, &ap_msg, crt);
-       if (rc)
-               goto out_free;
-       init_completion(&work);
-       ap_queue_message(zdev->ap_dev, &ap_msg);
-       rc = wait_for_completion_interruptible(&work);
-       if (rc == 0) {
-               rc = ap_msg.rc;
-               if (rc == 0)
-                       rc = convert_response(zdev, &ap_msg, crt->outputdata,
-                                             crt->outputdatalength);
-       } else
-               /* Signal pending. */
-               ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-       kfree(ap_msg.message);
-       return rc;
-}
-
-/**
- * The crypto operations for a PCICA card.
- */
-static struct zcrypt_ops zcrypt_pcica_ops = {
-       .rsa_modexpo = zcrypt_pcica_modexpo,
-       .rsa_modexpo_crt = zcrypt_pcica_modexpo_crt,
-};
-
-/**
- * Probe function for PCICA cards. It always accepts the AP device
- * since the bus_match already checked the hardware type.
- * @ap_dev: pointer to the AP device.
- */
-static int zcrypt_pcica_probe(struct ap_device *ap_dev)
-{
-       struct zcrypt_device *zdev;
-       int rc;
-
-       zdev = zcrypt_device_alloc(PCICA_MAX_RESPONSE_SIZE);
-       if (!zdev)
-               return -ENOMEM;
-       zdev->ap_dev = ap_dev;
-       zdev->ops = &zcrypt_pcica_ops;
-       zdev->online = 1;
-       zdev->user_space_type = ZCRYPT_PCICA;
-       zdev->type_string = "PCICA";
-       zdev->min_mod_size = PCICA_MIN_MOD_SIZE;
-       zdev->max_mod_size = PCICA_MAX_MOD_SIZE;
-       zdev->speed_rating = PCICA_SPEED_RATING;
-       zdev->max_exp_bit_length = PCICA_MAX_MOD_SIZE;
-       ap_dev->reply = &zdev->reply;
-       ap_dev->private = zdev;
-       rc = zcrypt_device_register(zdev);
-       if (rc)
-               goto out_free;
-       return 0;
-
-out_free:
-       ap_dev->private = NULL;
-       zcrypt_device_free(zdev);
-       return rc;
-}
-
-/**
- * This is called to remove the extended PCICA driver information
- * if an AP device is removed.
- */
-static void zcrypt_pcica_remove(struct ap_device *ap_dev)
-{
-       struct zcrypt_device *zdev = ap_dev->private;
-
-       zcrypt_device_unregister(zdev);
-}
-
-int __init zcrypt_pcica_init(void)
-{
-       return ap_driver_register(&zcrypt_pcica_driver, THIS_MODULE, "pcica");
-}
-
-void zcrypt_pcica_exit(void)
-{
-       ap_driver_unregister(&zcrypt_pcica_driver);
-}
-
-module_init(zcrypt_pcica_init);
-module_exit(zcrypt_pcica_exit);
diff --git a/drivers/s390/crypto/zcrypt_pcica.h b/drivers/s390/crypto/zcrypt_pcica.h
deleted file mode 100644 (file)
index 9a59155..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2006
- *  Author(s): Robert Burroughs
- *            Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _ZCRYPT_PCICA_H_
-#define _ZCRYPT_PCICA_H_
-
-/**
- * The type 4 message family is associated with a PCICA card.
- *
- * The four members of the family are described below.
- *
- * Note that all unsigned char arrays are right-justified and left-padded
- * with zeroes.
- *
- * Note that all reserved fields must be zeroes.
- */
-struct type4_hdr {
-       unsigned char  reserved1;
-       unsigned char  msg_type_code;   /* 0x04 */
-       unsigned short msg_len;
-       unsigned char  request_code;    /* 0x40 */
-       unsigned char  msg_fmt;
-       unsigned short reserved2;
-} __attribute__((packed));
-
-#define TYPE4_TYPE_CODE 0x04
-#define TYPE4_REQU_CODE 0x40
-
-#define TYPE4_SME_FMT 0x00
-#define TYPE4_LME_FMT 0x10
-#define TYPE4_SCR_FMT 0x40
-#define TYPE4_LCR_FMT 0x50
-
-/* Mod-Exp, with a small modulus */
-struct type4_sme {
-       struct type4_hdr header;
-       unsigned char    message[128];
-       unsigned char    exponent[128];
-       unsigned char    modulus[128];
-} __attribute__((packed));
-
-/* Mod-Exp, with a large modulus */
-struct type4_lme {
-       struct type4_hdr header;
-       unsigned char    message[256];
-       unsigned char    exponent[256];
-       unsigned char    modulus[256];
-} __attribute__((packed));
-
-/* CRT, with a small modulus */
-struct type4_scr {
-       struct type4_hdr header;
-       unsigned char    message[128];
-       unsigned char    dp[72];
-       unsigned char    dq[64];
-       unsigned char    p[72];
-       unsigned char    q[64];
-       unsigned char    u[72];
-} __attribute__((packed));
-
-/* CRT, with a large modulus */
-struct type4_lcr {
-       struct type4_hdr header;
-       unsigned char    message[256];
-       unsigned char    dp[136];
-       unsigned char    dq[128];
-       unsigned char    p[136];
-       unsigned char    q[128];
-       unsigned char    u[136];
-} __attribute__((packed));
-
-/**
- * The type 84 response family is associated with a PCICA card.
- *
- * Note that all unsigned char arrays are right-justified and left-padded
- * with zeroes.
- *
- * Note that all reserved fields must be zeroes.
- */
-
-struct type84_hdr {
-       unsigned char  reserved1;
-       unsigned char  code;
-       unsigned short len;
-       unsigned char  reserved2[4];
-} __attribute__((packed));
-
-#define TYPE84_RSP_CODE 0x84
-
-int zcrypt_pcica_init(void);
-void zcrypt_pcica_exit(void);
-
-#endif /* _ZCRYPT_PCICA_H_ */
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c
deleted file mode 100644 (file)
index 4cf2115..0000000
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2006
- *  Author(s): Robert Burroughs
- *            Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *                               Ralph Wuerthner <rwuerthn@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define KMSG_COMPONENT "zcrypt"
-#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/gfp.h>
-#include <linux/err.h>
-#include <linux/atomic.h>
-#include <asm/uaccess.h>
-
-#include "ap_bus.h"
-#include "zcrypt_api.h"
-#include "zcrypt_error.h"
-#include "zcrypt_pcicc.h"
-#include "zcrypt_cca_key.h"
-
-#define PCICC_MIN_MOD_SIZE      64     /*  512 bits */
-#define PCICC_MAX_MOD_SIZE_OLD 128     /* 1024 bits */
-#define PCICC_MAX_MOD_SIZE     256     /* 2048 bits */
-
-/*
- * PCICC cards need a speed rating of 0. This keeps them at the end of
- * the zcrypt device list (see zcrypt_api.c). PCICC cards are only
- * used if no other cards are present because they are slow and can only
- * cope with PKCS12 padded requests. The logic is queer. PKCS11 padded
- * requests are rejected. The modexpo function encrypts PKCS12 padded data
- * and decrypts any non-PKCS12 padded data (except PKCS11) in the assumption
- * that it's encrypted PKCS12 data. The modexpo_crt function always decrypts
- * the data in the assumption that its PKCS12 encrypted data.
- */
-#define PCICC_SPEED_RATING     0
-
-#define PCICC_MAX_MESSAGE_SIZE 0x710   /* max size type6 v1 crt message */
-#define PCICC_MAX_RESPONSE_SIZE 0x710  /* max size type86 v1 reply      */
-
-#define PCICC_CLEANUP_TIME     (15*HZ)
-
-static struct ap_device_id zcrypt_pcicc_ids[] = {
-       { AP_DEVICE(AP_DEVICE_TYPE_PCICC) },
-       { /* end of list */ },
-};
-
-MODULE_DEVICE_TABLE(ap, zcrypt_pcicc_ids);
-MODULE_AUTHOR("IBM Corporation");
-MODULE_DESCRIPTION("PCICC Cryptographic Coprocessor device driver, "
-                  "Copyright IBM Corp. 2001, 2006");
-MODULE_LICENSE("GPL");
-
-static int zcrypt_pcicc_probe(struct ap_device *ap_dev);
-static void zcrypt_pcicc_remove(struct ap_device *ap_dev);
-static void zcrypt_pcicc_receive(struct ap_device *, struct ap_message *,
-                                struct ap_message *);
-
-static struct ap_driver zcrypt_pcicc_driver = {
-       .probe = zcrypt_pcicc_probe,
-       .remove = zcrypt_pcicc_remove,
-       .ids = zcrypt_pcicc_ids,
-       .request_timeout = PCICC_CLEANUP_TIME,
-};
-
-/**
- * The following is used to initialize the CPRB passed to the PCICC card
- * in a type6 message. The 3 fields that must be filled in at execution
- * time are  req_parml, rpl_parml and usage_domain. Note that all three
- * fields are *little*-endian. Actually, everything about this interface
- * is ascii/little-endian, since the device has 'Intel inside'.
- *
- * The CPRB is followed immediately by the parm block.
- * The parm block contains:
- * - function code ('PD' 0x5044 or 'PK' 0x504B)
- * - rule block (0x0A00 'PKCS-1.2' or 0x0A00 'ZERO-PAD')
- * - VUD block
- */
-static struct CPRB static_cprb = {
-       .cprb_len       = cpu_to_le16(0x0070),
-       .cprb_ver_id    =  0x41,
-       .func_id        = {0x54,0x32},
-       .checkpoint_flag=  0x01,
-       .svr_namel      = cpu_to_le16(0x0008),
-       .svr_name       = {'I','C','S','F',' ',' ',' ',' '}
-};
-
-/**
- * Check the message for PKCS11 padding.
- */
-static inline int is_PKCS11_padded(unsigned char *buffer, int length)
-{
-       int i;
-       if ((buffer[0] != 0x00) || (buffer[1] != 0x01))
-               return 0;
-       for (i = 2; i < length; i++)
-               if (buffer[i] != 0xFF)
-                       break;
-       if (i < 10 || i == length)
-               return 0;
-       if (buffer[i] != 0x00)
-               return 0;
-       return 1;
-}
-
-/**
- * Check the message for PKCS12 padding.
- */
-static inline int is_PKCS12_padded(unsigned char *buffer, int length)
-{
-       int i;
-       if ((buffer[0] != 0x00) || (buffer[1] != 0x02))
-               return 0;
-       for (i = 2; i < length; i++)
-               if (buffer[i] == 0x00)
-                       break;
-       if ((i < 10) || (i == length))
-               return 0;
-       if (buffer[i] != 0x00)
-               return 0;
-       return 1;
-}
-
-/**
- * Convert a ICAMEX message to a type6 MEX message.
- *
- * @zdev: crypto device pointer
- * @zreq: crypto request pointer
- * @mex: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICAMEX_msg_to_type6MEX_msg(struct zcrypt_device *zdev,
-                                     struct ap_message *ap_msg,
-                                     struct ica_rsa_modexpo *mex)
-{
-       static struct type6_hdr static_type6_hdr = {
-               .type           =  0x06,
-               .offset1        =  0x00000058,
-               .agent_id       = {0x01,0x00,0x43,0x43,0x41,0x2D,0x41,0x50,
-                                  0x50,0x4C,0x20,0x20,0x20,0x01,0x01,0x01},
-               .function_code  = {'P','K'},
-       };
-       static struct function_and_rules_block static_pke_function_and_rules ={
-               .function_code  = {'P','K'},
-               .ulen           = cpu_to_le16(10),
-               .only_rule      = {'P','K','C','S','-','1','.','2'}
-       };
-       struct {
-               struct type6_hdr hdr;
-               struct CPRB cprb;
-               struct function_and_rules_block fr;
-               unsigned short length;
-               char text[0];
-       } __attribute__((packed)) *msg = ap_msg->message;
-       int vud_len, pad_len, size;
-
-       /* VUD.ciphertext */
-       if (copy_from_user(msg->text, mex->inputdata, mex->inputdatalength))
-               return -EFAULT;
-
-       if (is_PKCS11_padded(msg->text, mex->inputdatalength))
-               return -EINVAL;
-
-       /* static message header and f&r */
-       msg->hdr = static_type6_hdr;
-       msg->fr = static_pke_function_and_rules;
-
-       if (is_PKCS12_padded(msg->text, mex->inputdatalength)) {
-               /* strip the padding and adjust the data length */
-               pad_len = strnlen(msg->text + 2, mex->inputdatalength - 2) + 3;
-               if (pad_len <= 9 || pad_len >= mex->inputdatalength)
-                       return -ENODEV;
-               vud_len = mex->inputdatalength - pad_len;
-               memmove(msg->text, msg->text + pad_len, vud_len);
-               msg->length = cpu_to_le16(vud_len + 2);
-
-               /* Set up key after the variable length text. */
-               size = zcrypt_type6_mex_key_en(mex, msg->text + vud_len, 0);
-               if (size < 0)
-                       return size;
-               size += sizeof(*msg) + vud_len; /* total size of msg */
-       } else {
-               vud_len = mex->inputdatalength;
-               msg->length = cpu_to_le16(2 + vud_len);
-
-               msg->hdr.function_code[1] = 'D';
-               msg->fr.function_code[1] = 'D';
-
-               /* Set up key after the variable length text. */
-               size = zcrypt_type6_mex_key_de(mex, msg->text + vud_len, 0);
-               if (size < 0)
-                       return size;
-               size += sizeof(*msg) + vud_len; /* total size of msg */
-       }
-
-       /* message header, cprb and f&r */
-       msg->hdr.ToCardLen1 = (size - sizeof(msg->hdr) + 3) & -4;
-       msg->hdr.FromCardLen1 = PCICC_MAX_RESPONSE_SIZE - sizeof(msg->hdr);
-
-       msg->cprb = static_cprb;
-       msg->cprb.usage_domain[0]= AP_QID_QUEUE(zdev->ap_dev->qid);
-       msg->cprb.req_parml = cpu_to_le16(size - sizeof(msg->hdr) -
-                                          sizeof(msg->cprb));
-       msg->cprb.rpl_parml = cpu_to_le16(msg->hdr.FromCardLen1);
-
-       ap_msg->length = (size + 3) & -4;
-       return 0;
-}
-
-/**
- * Convert a ICACRT message to a type6 CRT message.
- *
- * @zdev: crypto device pointer
- * @zreq: crypto request pointer
- * @crt: pointer to user input data
- *
- * Returns 0 on success or -EFAULT.
- */
-static int ICACRT_msg_to_type6CRT_msg(struct zcrypt_device *zdev,
-                                     struct ap_message *ap_msg,
-                                     struct ica_rsa_modexpo_crt *crt)
-{
-       static struct type6_hdr static_type6_hdr = {
-               .type           =  0x06,
-               .offset1        =  0x00000058,
-               .agent_id       = {0x01,0x00,0x43,0x43,0x41,0x2D,0x41,0x50,
-                                  0x50,0x4C,0x20,0x20,0x20,0x01,0x01,0x01},
-               .function_code  = {'P','D'},
-       };
-       static struct function_and_rules_block static_pkd_function_and_rules ={
-               .function_code  = {'P','D'},
-               .ulen           = cpu_to_le16(10),
-               .only_rule      = {'P','K','C','S','-','1','.','2'}
-       };
-       struct {
-               struct type6_hdr hdr;
-               struct CPRB cprb;
-               struct function_and_rules_block fr;
-               unsigned short length;
-               char text[0];
-       } __attribute__((packed)) *msg = ap_msg->message;
-       int size;
-
-       /* VUD.ciphertext */
-       msg->length = cpu_to_le16(2 + crt->inputdatalength);
-       if (copy_from_user(msg->text, crt->inputdata, crt->inputdatalength))
-               return -EFAULT;
-
-       if (is_PKCS11_padded(msg->text, crt->inputdatalength))
-               return -EINVAL;
-
-       /* Set up key after the variable length text. */
-       size = zcrypt_type6_crt_key(crt, msg->text + crt->inputdatalength, 0);
-       if (size < 0)
-               return size;
-       size += sizeof(*msg) + crt->inputdatalength;    /* total size of msg */
-
-       /* message header, cprb and f&r */
-       msg->hdr = static_type6_hdr;
-       msg->hdr.ToCardLen1 = (size -  sizeof(msg->hdr) + 3) & -4;
-       msg->hdr.FromCardLen1 = PCICC_MAX_RESPONSE_SIZE - sizeof(msg->hdr);
-
-       msg->cprb = static_cprb;
-       msg->cprb.usage_domain[0] = AP_QID_QUEUE(zdev->ap_dev->qid);
-       msg->cprb.req_parml = msg->cprb.rpl_parml =
-               cpu_to_le16(size - sizeof(msg->hdr) - sizeof(msg->cprb));
-
-       msg->fr = static_pkd_function_and_rules;
-
-       ap_msg->length = (size + 3) & -4;
-       return 0;
-}
-
-/**
- * Copy results from a type 86 reply message back to user space.
- *
- * @zdev: crypto device pointer
- * @reply: reply AP message.
- * @data: pointer to user output data
- * @length: size of user output data
- *
- * Returns 0 on success or -EINVAL, -EFAULT, -EAGAIN in case of an error.
- */
-struct type86_reply {
-       struct type86_hdr hdr;
-       struct type86_fmt2_ext fmt2;
-       struct CPRB cprb;
-       unsigned char pad[4];   /* 4 byte function code/rules block ? */
-       unsigned short length;
-       char text[0];
-} __attribute__((packed));
-
-static int convert_type86(struct zcrypt_device *zdev,
-                         struct ap_message *reply,
-                         char __user *outputdata,
-                         unsigned int outputdatalength)
-{
-       static unsigned char static_pad[] = {
-               0x00,0x02,
-               0x1B,0x7B,0x5D,0xB5,0x75,0x01,0x3D,0xFD,
-               0x8D,0xD1,0xC7,0x03,0x2D,0x09,0x23,0x57,
-               0x89,0x49,0xB9,0x3F,0xBB,0x99,0x41,0x5B,
-               0x75,0x21,0x7B,0x9D,0x3B,0x6B,0x51,0x39,
-               0xBB,0x0D,0x35,0xB9,0x89,0x0F,0x93,0xA5,
-               0x0B,0x47,0xF1,0xD3,0xBB,0xCB,0xF1,0x9D,
-               0x23,0x73,0x71,0xFF,0xF3,0xF5,0x45,0xFB,
-               0x61,0x29,0x23,0xFD,0xF1,0x29,0x3F,0x7F,
-               0x17,0xB7,0x1B,0xA9,0x19,0xBD,0x57,0xA9,
-               0xD7,0x95,0xA3,0xCB,0xED,0x1D,0xDB,0x45,
-               0x7D,0x11,0xD1,0x51,0x1B,0xED,0x71,0xE9,
-               0xB1,0xD1,0xAB,0xAB,0x21,0x2B,0x1B,0x9F,
-               0x3B,0x9F,0xF7,0xF7,0xBD,0x63,0xEB,0xAD,
-               0xDF,0xB3,0x6F,0x5B,0xDB,0x8D,0xA9,0x5D,
-               0xE3,0x7D,0x77,0x49,0x47,0xF5,0xA7,0xFD,
-               0xAB,0x2F,0x27,0x35,0x77,0xD3,0x49,0xC9,
-               0x09,0xEB,0xB1,0xF9,0xBF,0x4B,0xCB,0x2B,
-               0xEB,0xEB,0x05,0xFF,0x7D,0xC7,0x91,0x8B,
-               0x09,0x83,0xB9,0xB9,0x69,0x33,0x39,0x6B,
-               0x79,0x75,0x19,0xBF,0xBB,0x07,0x1D,0xBD,
-               0x29,0xBF,0x39,0x95,0x93,0x1D,0x35,0xC7,
-               0xC9,0x4D,0xE5,0x97,0x0B,0x43,0x9B,0xF1,
-               0x16,0x93,0x03,0x1F,0xA5,0xFB,0xDB,0xF3,
-               0x27,0x4F,0x27,0x61,0x05,0x1F,0xB9,0x23,
-               0x2F,0xC3,0x81,0xA9,0x23,0x71,0x55,0x55,
-               0xEB,0xED,0x41,0xE5,0xF3,0x11,0xF1,0x43,
-               0x69,0x03,0xBD,0x0B,0x37,0x0F,0x51,0x8F,
-               0x0B,0xB5,0x89,0x5B,0x67,0xA9,0xD9,0x4F,
-               0x01,0xF9,0x21,0x77,0x37,0x73,0x79,0xC5,
-               0x7F,0x51,0xC1,0xCF,0x97,0xA1,0x75,0xAD,
-               0x35,0x9D,0xD3,0xD3,0xA7,0x9D,0x5D,0x41,
-               0x6F,0x65,0x1B,0xCF,0xA9,0x87,0x91,0x09
-       };
-       struct type86_reply *msg = reply->message;
-       unsigned short service_rc, service_rs;
-       unsigned int reply_len, pad_len;
-       char *data;
-
-       service_rc = le16_to_cpu(msg->cprb.ccp_rtcode);
-       if (unlikely(service_rc != 0)) {
-               service_rs = le16_to_cpu(msg->cprb.ccp_rscode);
-               if (service_rc == 8 && service_rs == 66)
-                       return -EINVAL;
-               if (service_rc == 8 && service_rs == 65)
-                       return -EINVAL;
-               if (service_rc == 8 && service_rs == 770) {
-                       zdev->max_mod_size = PCICC_MAX_MOD_SIZE_OLD;
-                       return -EAGAIN;
-               }
-               if (service_rc == 8 && service_rs == 783) {
-                       zdev->max_mod_size = PCICC_MAX_MOD_SIZE_OLD;
-                       return -EAGAIN;
-               }
-               if (service_rc == 8 && service_rs == 72)
-                       return -EINVAL;
-               zdev->online = 0;
-               pr_err("Cryptographic device %x failed and was set offline\n",
-                      zdev->ap_dev->qid);
-               ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%drc%d",
-                              zdev->ap_dev->qid, zdev->online,
-                              msg->hdr.reply_code);
-               return -EAGAIN; /* repeat the request on a different device. */
-       }
-       data = msg->text;
-       reply_len = le16_to_cpu(msg->length) - 2;
-       if (reply_len > outputdatalength)
-               return -EINVAL;
-       /*
-        * For all encipher requests, the length of the ciphertext (reply_len)
-        * will always equal the modulus length. For MEX decipher requests
-        * the output needs to get padded. Minimum pad size is 10.
-        *
-        * Currently, the cases where padding will be added is for:
-        * - PCIXCC_MCL2 using a CRT form token (since PKD didn't support
-        *   ZERO-PAD and CRT is only supported for PKD requests)
-        * - PCICC, always
-        */
-       pad_len = outputdatalength - reply_len;
-       if (pad_len > 0) {
-               if (pad_len < 10)
-                       return -EINVAL;
-               /* 'restore' padding left in the PCICC/PCIXCC card. */
-               if (copy_to_user(outputdata, static_pad, pad_len - 1))
-                       return -EFAULT;
-               if (put_user(0, outputdata + pad_len - 1))
-                       return -EFAULT;
-       }
-       /* Copy the crypto response to user space. */
-       if (copy_to_user(outputdata + pad_len, data, reply_len))
-               return -EFAULT;
-       return 0;
-}
-
-static int convert_response(struct zcrypt_device *zdev,
-                           struct ap_message *reply,
-                           char __user *outputdata,
-                           unsigned int outputdatalength)
-{
-       struct type86_reply *msg = reply->message;
-
-       /* Response type byte is the second byte in the response. */
-       switch (msg->hdr.type) {
-       case TYPE82_RSP_CODE:
-       case TYPE88_RSP_CODE:
-               return convert_error(zdev, reply);
-       case TYPE86_RSP_CODE:
-               if (msg->hdr.reply_code)
-                       return convert_error(zdev, reply);
-               if (msg->cprb.cprb_ver_id == 0x01)
-                       return convert_type86(zdev, reply,
-                                             outputdata, outputdatalength);
-               /* no break, incorrect cprb version is an unknown response */
-       default: /* Unknown response type, this should NEVER EVER happen */
-               zdev->online = 0;
-               pr_err("Cryptographic device %x failed and was set offline\n",
-                      zdev->ap_dev->qid);
-               ZCRYPT_DBF_DEV(DBF_ERR, zdev, "dev%04xo%dfail",
-                              zdev->ap_dev->qid, zdev->online);
-               return -EAGAIN; /* repeat the request on a different device. */
-       }
-}
-
-/**
- * This function is called from the AP bus code after a crypto request
- * "msg" has finished with the reply message "reply".
- * It is called from tasklet context.
- * @ap_dev: pointer to the AP device
- * @msg: pointer to the AP message
- * @reply: pointer to the AP reply message
- */
-static void zcrypt_pcicc_receive(struct ap_device *ap_dev,
-                                struct ap_message *msg,
-                                struct ap_message *reply)
-{
-       static struct error_hdr error_reply = {
-               .type = TYPE82_RSP_CODE,
-               .reply_code = REP82_ERROR_MACHINE_FAILURE,
-       };
-       struct type86_reply *t86r;
-       int length;
-
-       /* Copy the reply message to the request message buffer. */
-       if (!reply)
-               goto out;       /* ap_msg->rc indicates the error */
-       t86r = reply->message;
-       if (t86r->hdr.type == TYPE86_RSP_CODE &&
-                t86r->cprb.cprb_ver_id == 0x01) {
-               length = sizeof(struct type86_reply) + t86r->length - 2;
-               length = min(PCICC_MAX_RESPONSE_SIZE, length);
-               memcpy(msg->message, reply->message, length);
-       } else
-               memcpy(msg->message, reply->message, sizeof error_reply);
-out:
-       complete((struct completion *) msg->private);
-}
-
-static atomic_t zcrypt_step = ATOMIC_INIT(0);
-
-/**
- * The request distributor calls this function if it picked the PCICC
- * device to handle a modexpo request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *       PCICC device to the request distributor
- * @mex: pointer to the modexpo request buffer
- */
-static long zcrypt_pcicc_modexpo(struct zcrypt_device *zdev,
-                                struct ica_rsa_modexpo *mex)
-{
-       struct ap_message ap_msg;
-       struct completion work;
-       int rc;
-
-       ap_init_message(&ap_msg);
-       ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
-       if (!ap_msg.message)
-               return -ENOMEM;
-       ap_msg.receive = zcrypt_pcicc_receive;
-       ap_msg.length = PAGE_SIZE;
-       ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                               atomic_inc_return(&zcrypt_step);
-       ap_msg.private = &work;
-       rc = ICAMEX_msg_to_type6MEX_msg(zdev, &ap_msg, mex);
-       if (rc)
-               goto out_free;
-       init_completion(&work);
-       ap_queue_message(zdev->ap_dev, &ap_msg);
-       rc = wait_for_completion_interruptible(&work);
-       if (rc == 0) {
-               rc = ap_msg.rc;
-               if (rc == 0)
-                       rc = convert_response(zdev, &ap_msg, mex->outputdata,
-                                             mex->outputdatalength);
-       } else
-               /* Signal pending. */
-               ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-       free_page((unsigned long) ap_msg.message);
-       return rc;
-}
-
-/**
- * The request distributor calls this function if it picked the PCICC
- * device to handle a modexpo_crt request.
- * @zdev: pointer to zcrypt_device structure that identifies the
- *       PCICC device to the request distributor
- * @crt: pointer to the modexpoc_crt request buffer
- */
-static long zcrypt_pcicc_modexpo_crt(struct zcrypt_device *zdev,
-                                    struct ica_rsa_modexpo_crt *crt)
-{
-       struct ap_message ap_msg;
-       struct completion work;
-       int rc;
-
-       ap_init_message(&ap_msg);
-       ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);
-       if (!ap_msg.message)
-               return -ENOMEM;
-       ap_msg.receive = zcrypt_pcicc_receive;
-       ap_msg.length = PAGE_SIZE;
-       ap_msg.psmid = (((unsigned long long) current->pid) << 32) +
-                               atomic_inc_return(&zcrypt_step);
-       ap_msg.private = &work;
-       rc = ICACRT_msg_to_type6CRT_msg(zdev, &ap_msg, crt);
-       if (rc)
-               goto out_free;
-       init_completion(&work);
-       ap_queue_message(zdev->ap_dev, &ap_msg);
-       rc = wait_for_completion_interruptible(&work);
-       if (rc == 0) {
-               rc = ap_msg.rc;
-               if (rc == 0)
-                       rc = convert_response(zdev, &ap_msg, crt->outputdata,
-                                             crt->outputdatalength);
-       } else
-               /* Signal pending. */
-               ap_cancel_message(zdev->ap_dev, &ap_msg);
-out_free:
-       free_page((unsigned long) ap_msg.message);
-       return rc;
-}
-
-/**
- * The crypto operations for a PCICC card.
- */
-static struct zcrypt_ops zcrypt_pcicc_ops = {
-       .rsa_modexpo = zcrypt_pcicc_modexpo,
-       .rsa_modexpo_crt = zcrypt_pcicc_modexpo_crt,
-};
-
-/**
- * Probe function for PCICC cards. It always accepts the AP device
- * since the bus_match already checked the hardware type.
- * @ap_dev: pointer to the AP device.
- */
-static int zcrypt_pcicc_probe(struct ap_device *ap_dev)
-{
-       struct zcrypt_device *zdev;
-       int rc;
-
-       zdev = zcrypt_device_alloc(PCICC_MAX_RESPONSE_SIZE);
-       if (!zdev)
-               return -ENOMEM;
-       zdev->ap_dev = ap_dev;
-       zdev->ops = &zcrypt_pcicc_ops;
-       zdev->online = 1;
-       zdev->user_space_type = ZCRYPT_PCICC;
-       zdev->type_string = "PCICC";
-       zdev->min_mod_size = PCICC_MIN_MOD_SIZE;
-       zdev->max_mod_size = PCICC_MAX_MOD_SIZE;
-       zdev->speed_rating = PCICC_SPEED_RATING;
-       zdev->max_exp_bit_length = PCICC_MAX_MOD_SIZE;
-       ap_dev->reply = &zdev->reply;
-       ap_dev->private = zdev;
-       rc = zcrypt_device_register(zdev);
-       if (rc)
-               goto out_free;
-       return 0;
-
- out_free:
-       ap_dev->private = NULL;
-       zcrypt_device_free(zdev);
-       return rc;
-}
-
-/**
- * This is called to remove the extended PCICC driver information
- * if an AP device is removed.
- */
-static void zcrypt_pcicc_remove(struct ap_device *ap_dev)
-{
-       struct zcrypt_device *zdev = ap_dev->private;
-
-       zcrypt_device_unregister(zdev);
-}
-
-int __init zcrypt_pcicc_init(void)
-{
-       return ap_driver_register(&zcrypt_pcicc_driver, THIS_MODULE, "pcicc");
-}
-
-void zcrypt_pcicc_exit(void)
-{
-       ap_driver_unregister(&zcrypt_pcicc_driver);
-}
-
-module_init(zcrypt_pcicc_init);
-module_exit(zcrypt_pcicc_exit);
diff --git a/drivers/s390/crypto/zcrypt_pcicc.h b/drivers/s390/crypto/zcrypt_pcicc.h
deleted file mode 100644 (file)
index 7fe27e1..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  zcrypt 2.1.0
- *
- *  Copyright IBM Corp. 2001, 2006
- *  Author(s): Robert Burroughs
- *            Eric Rossman (edrossma@us.ibm.com)
- *
- *  Hotplug & misc device support: Jochen Roehrig (roehrig@de.ibm.com)
- *  Major cleanup & driver split: Martin Schwidefsky <schwidefsky@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _ZCRYPT_PCICC_H_
-#define _ZCRYPT_PCICC_H_
-
-/**
- * The type 6 message family is associated with PCICC or PCIXCC cards.
- *
- * It contains a message header followed by a CPRB, both of which
- * are described below.
- *
- * Note that all reserved fields must be zeroes.
- */
-struct type6_hdr {
-       unsigned char reserved1;        /* 0x00                         */
-       unsigned char type;             /* 0x06                         */
-       unsigned char reserved2[2];     /* 0x0000                       */
-       unsigned char right[4];         /* 0x00000000                   */
-       unsigned char reserved3[2];     /* 0x0000                       */
-       unsigned char reserved4[2];     /* 0x0000                       */
-       unsigned char apfs[4];          /* 0x00000000                   */
-       unsigned int  offset1;          /* 0x00000058 (offset to CPRB)  */
-       unsigned int  offset2;          /* 0x00000000                   */
-       unsigned int  offset3;          /* 0x00000000                   */
-       unsigned int  offset4;          /* 0x00000000                   */
-       unsigned char agent_id[16];     /* PCICC:                       */
-                                       /*    0x0100                    */
-                                       /*    0x4343412d4150504c202020  */
-                                       /*    0x010101                  */
-                                       /* PCIXCC:                      */
-                                       /*    0x4341000000000000        */
-                                       /*    0x0000000000000000        */
-       unsigned char rqid[2];          /* rqid.  internal to 603       */
-       unsigned char reserved5[2];     /* 0x0000                       */
-       unsigned char function_code[2]; /* for PKD, 0x5044 (ascii 'PD') */
-       unsigned char reserved6[2];     /* 0x0000                       */
-       unsigned int  ToCardLen1;       /* (request CPRB len + 3) & -4  */
-       unsigned int  ToCardLen2;       /* db len 0x00000000 for PKD    */
-       unsigned int  ToCardLen3;       /* 0x00000000                   */
-       unsigned int  ToCardLen4;       /* 0x00000000                   */
-       unsigned int  FromCardLen1;     /* response buffer length       */
-       unsigned int  FromCardLen2;     /* db len 0x00000000 for PKD    */
-       unsigned int  FromCardLen3;     /* 0x00000000                   */
-       unsigned int  FromCardLen4;     /* 0x00000000                   */
-} __attribute__((packed));
-
-/**
- * CPRB
- *       Note that all shorts, ints and longs are little-endian.
- *       All pointer fields are 32-bits long, and mean nothing
- *
- *       A request CPRB is followed by a request_parameter_block.
- *
- *       The request (or reply) parameter block is organized thus:
- *         function code
- *         VUD block
- *         key block
- */
-struct CPRB {
-       unsigned short cprb_len;        /* CPRB length                   */
-       unsigned char cprb_ver_id;      /* CPRB version id.              */
-       unsigned char pad_000;          /* Alignment pad byte.           */
-       unsigned char srpi_rtcode[4];   /* SRPI return code LELONG       */
-       unsigned char srpi_verb;        /* SRPI verb type                */
-       unsigned char flags;            /* flags                         */
-       unsigned char func_id[2];       /* function id                   */
-       unsigned char checkpoint_flag;  /*                               */
-       unsigned char resv2;            /* reserved                      */
-       unsigned short req_parml;       /* request parameter buffer      */
-                                       /* length 16-bit little endian   */
-       unsigned char req_parmp[4];     /* request parameter buffer      *
-                                        * pointer (means nothing: the   *
-                                        * parameter buffer follows      *
-                                        * the CPRB).                    */
-       unsigned char req_datal[4];     /* request data buffer           */
-                                       /* length         ULELONG        */
-       unsigned char req_datap[4];     /* request data buffer           */
-                                       /* pointer                       */
-       unsigned short rpl_parml;       /* reply  parameter buffer       */
-                                       /* length 16-bit little endian   */
-       unsigned char pad_001[2];       /* Alignment pad bytes. ULESHORT */
-       unsigned char rpl_parmp[4];     /* reply parameter buffer        *
-                                        * pointer (means nothing: the   *
-                                        * parameter buffer follows      *
-                                        * the CPRB).                    */
-       unsigned char rpl_datal[4];     /* reply data buffer len ULELONG */
-       unsigned char rpl_datap[4];     /* reply data buffer             */
-                                       /* pointer                       */
-       unsigned short ccp_rscode;      /* server reason code   ULESHORT */
-       unsigned short ccp_rtcode;      /* server return code   ULESHORT */
-       unsigned char repd_parml[2];    /* replied parameter len ULESHORT*/
-       unsigned char mac_data_len[2];  /* Mac Data Length      ULESHORT */
-       unsigned char repd_datal[4];    /* replied data length  ULELONG  */
-       unsigned char req_pc[2];        /* PC identifier                 */
-       unsigned char res_origin[8];    /* resource origin               */
-       unsigned char mac_value[8];     /* Mac Value                     */
-       unsigned char logon_id[8];      /* Logon Identifier              */
-       unsigned char usage_domain[2];  /* cdx                           */
-       unsigned char resv3[18];        /* reserved for requestor        */
-       unsigned short svr_namel;       /* server name length  ULESHORT  */
-       unsigned char svr_name[8];      /* server name                   */
-} __attribute__((packed));
-
-/**
- * The type 86 message family is associated with PCICC and PCIXCC cards.
- *
- * It contains a message header followed by a CPRB.  The CPRB is
- * the same as the request CPRB, which is described above.
- *
- * If format is 1, an error condition exists and no data beyond
- * the 8-byte message header is of interest.
- *
- * The non-error message is shown below.
- *
- * Note that all reserved fields must be zeroes.
- */
-struct type86_hdr {
-       unsigned char reserved1;        /* 0x00                         */
-       unsigned char type;             /* 0x86                         */
-       unsigned char format;           /* 0x01 (error) or 0x02 (ok)    */
-       unsigned char reserved2;        /* 0x00                         */
-       unsigned char reply_code;       /* reply code (see above)       */
-       unsigned char reserved3[3];     /* 0x000000                     */
-} __attribute__((packed));
-
-#define TYPE86_RSP_CODE 0x86
-#define TYPE86_FMT2    0x02
-
-struct type86_fmt2_ext {
-       unsigned char     reserved[4];  /* 0x00000000                   */
-       unsigned char     apfs[4];      /* final status                 */
-       unsigned int      count1;       /* length of CPRB + parameters  */
-       unsigned int      offset1;      /* offset to CPRB               */
-       unsigned int      count2;       /* 0x00000000                   */
-       unsigned int      offset2;      /* db offset 0x00000000 for PKD */
-       unsigned int      count3;       /* 0x00000000                   */
-       unsigned int      offset3;      /* 0x00000000                   */
-       unsigned int      count4;       /* 0x00000000                   */
-       unsigned int      offset4;      /* 0x00000000                   */
-} __attribute__((packed));
-
-struct function_and_rules_block {
-       unsigned char function_code[2];
-       unsigned short ulen;
-       unsigned char only_rule[8];
-} __attribute__((packed));
-
-int zcrypt_pcicc_init(void);
-void zcrypt_pcicc_exit(void);
-
-#endif /* _ZCRYPT_PCICC_H_ */