mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-04 09:34:12 +08:00
121a868d05
ap_bus and zcrypt_api assumed module information to always be present
and initialisation to be done in module loading order (symbol
dependencies). These assumptions don't hold if zcrypt is built-in;
THIS_MODULE will be NULL in this case and init call order is linker
order, i.e. Makefile order.
Fix initialisation order by ordering the object files in the Makefile
according to their dependencies, like the module loader would do.
Fix message type registration by using a dedicated "name" field rather
than piggy-backing on the module ("owner") information. There's no
change to the requirement that module name and msgtype name are
identical. The existing name macros are used.
We don't need any special code for dealing with the drivers being
built-in; the generic module support code already does the right
thing.
Test results:
1. CONFIG_MODULES=y, CONFIG_ZCRYPT=y
KVM: boots, no /sys/bus/ap (expected)
LPAR with CEX5: boots, /sys/bus/ap/devices/card*/type present
2. CONFIG_MODULES=y, CONFIG_ZCRYPT=m=:
KVM: boots, loading zcrypt_cex4 (and ap) fails (expected)
LPAR with CEX5: boots, loading =zcrypt_cex4= succeeds,
/sys/bus/ap/devices/card*/type present after explicit module
loading
3. CONFIG_MODULES unset, CONFIG_ZCRYPT=y:
KVM: boots, no /sys/bus/ap (expected)
LPAR with CEX5: boots, /sys/bus/ap/devices/card*/type present
No further testing (user-space functionality) was done.
Fixes: 3b6245fd303f ("s390/zcrypt: Separate msgtype implementation from card modules.")
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
142 lines
4.7 KiB
C
142 lines
4.7 KiB
C
/*
|
|
* zcrypt 2.1.0
|
|
*
|
|
* Copyright IBM Corp. 2001, 2012
|
|
* Author(s): Robert Burroughs
|
|
* Eric Rossman (edrossma@us.ibm.com)
|
|
* Cornelia Huck <cornelia.huck@de.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>
|
|
* MSGTYPE restruct: Holger Dengler <hd@linux.vnet.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_API_H_
|
|
#define _ZCRYPT_API_H_
|
|
|
|
#include <linux/atomic.h>
|
|
#include <asm/debug.h>
|
|
#include <asm/zcrypt.h>
|
|
#include "ap_bus.h"
|
|
|
|
/* deprecated status calls */
|
|
#define ICAZ90STATUS _IOR(ZCRYPT_IOCTL_MAGIC, 0x10, struct ica_z90_status)
|
|
#define Z90STAT_PCIXCCCOUNT _IOR(ZCRYPT_IOCTL_MAGIC, 0x43, int)
|
|
|
|
/**
|
|
* This structure is deprecated and the corresponding ioctl() has been
|
|
* replaced with individual ioctl()s for each piece of data!
|
|
*/
|
|
struct ica_z90_status {
|
|
int totalcount;
|
|
int leedslitecount; // PCICA
|
|
int leeds2count; // PCICC
|
|
// int PCIXCCCount; is not in struct for backward compatibility
|
|
int requestqWaitCount;
|
|
int pendingqWaitCount;
|
|
int totalOpenCount;
|
|
int cryptoDomain;
|
|
// status: 0=not there, 1=PCICA, 2=PCICC, 3=PCIXCC_MCL2, 4=PCIXCC_MCL3,
|
|
// 5=CEX2C
|
|
unsigned char status[64];
|
|
// qdepth: # work elements waiting for each device
|
|
unsigned char qdepth[64];
|
|
};
|
|
|
|
/**
|
|
* device type for an actual device is either PCICA, PCICC, PCIXCC_MCL2,
|
|
* PCIXCC_MCL3, CEX2C, or CEX2A
|
|
*
|
|
* NOTE: PCIXCC_MCL3 refers to a PCIXCC with May 2004 version of Licensed
|
|
* Internal Code (LIC) (EC J12220 level 29).
|
|
* PCIXCC_MCL2 refers to any LIC before this level.
|
|
*/
|
|
#define ZCRYPT_PCICA 1
|
|
#define ZCRYPT_PCICC 2
|
|
#define ZCRYPT_PCIXCC_MCL2 3
|
|
#define ZCRYPT_PCIXCC_MCL3 4
|
|
#define ZCRYPT_CEX2C 5
|
|
#define ZCRYPT_CEX2A 6
|
|
#define ZCRYPT_CEX3C 7
|
|
#define ZCRYPT_CEX3A 8
|
|
#define ZCRYPT_CEX4 10
|
|
#define ZCRYPT_CEX5 11
|
|
|
|
/**
|
|
* Large random numbers are pulled in 4096 byte chunks from the crypto cards
|
|
* and stored in a page. Be careful when increasing this buffer due to size
|
|
* limitations for AP requests.
|
|
*/
|
|
#define ZCRYPT_RNG_BUFFER_SIZE 4096
|
|
|
|
struct zcrypt_device;
|
|
|
|
struct zcrypt_ops {
|
|
long (*rsa_modexpo)(struct zcrypt_device *, struct ica_rsa_modexpo *);
|
|
long (*rsa_modexpo_crt)(struct zcrypt_device *,
|
|
struct ica_rsa_modexpo_crt *);
|
|
long (*send_cprb)(struct zcrypt_device *, struct ica_xcRB *);
|
|
long (*send_ep11_cprb)(struct zcrypt_device *, struct ep11_urb *);
|
|
long (*rng)(struct zcrypt_device *, char *);
|
|
struct list_head list; /* zcrypt ops list. */
|
|
struct module *owner;
|
|
int variant;
|
|
char name[128];
|
|
};
|
|
|
|
struct zcrypt_device {
|
|
struct list_head list; /* Device list. */
|
|
spinlock_t lock; /* Per device lock. */
|
|
struct kref refcount; /* device refcounting */
|
|
struct ap_device *ap_dev; /* The "real" ap device. */
|
|
struct zcrypt_ops *ops; /* Crypto operations. */
|
|
int online; /* User online/offline */
|
|
|
|
int user_space_type; /* User space device id. */
|
|
char *type_string; /* User space device name. */
|
|
int min_mod_size; /* Min number of bits. */
|
|
int max_mod_size; /* Max number of bits. */
|
|
int short_crt; /* Card has crt length restriction. */
|
|
int speed_rating; /* Speed of the crypto device. */
|
|
|
|
int request_count; /* # current requests. */
|
|
|
|
struct ap_message reply; /* Per-device reply structure. */
|
|
int max_exp_bit_length;
|
|
|
|
debug_info_t *dbf_area; /* debugging */
|
|
};
|
|
|
|
/* transport layer rescanning */
|
|
extern atomic_t zcrypt_rescan_req;
|
|
|
|
struct zcrypt_device *zcrypt_device_alloc(size_t);
|
|
void zcrypt_device_free(struct zcrypt_device *);
|
|
void zcrypt_device_get(struct zcrypt_device *);
|
|
int zcrypt_device_put(struct zcrypt_device *);
|
|
int zcrypt_device_register(struct zcrypt_device *);
|
|
void zcrypt_device_unregister(struct zcrypt_device *);
|
|
void zcrypt_msgtype_register(struct zcrypt_ops *);
|
|
void zcrypt_msgtype_unregister(struct zcrypt_ops *);
|
|
struct zcrypt_ops *zcrypt_msgtype_request(unsigned char *, int);
|
|
void zcrypt_msgtype_release(struct zcrypt_ops *);
|
|
int zcrypt_api_init(void);
|
|
void zcrypt_api_exit(void);
|
|
|
|
#endif /* _ZCRYPT_API_H_ */
|