ACK: [PATCH Xenial/Yakkety SRU] s390/zcrypt: Introduce CEX6 toleration

Colin Ian King colin.king at canonical.com
Mon Dec 19 17:11:25 UTC 2016


On 19/12/16 16:31, Tim Gardner wrote:
> From: Harald Freudenberger <freude at linux.vnet.ibm.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1644557
> 
> Signed-off-by: Harald Freudenberger <freude at linux.vnet.ibm.com>
> Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
> (cherry picked from commit b3e8652bcbfa04807e44708d4d0c8cdad39c9215)
> Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
> ---
>  drivers/s390/crypto/ap_bus.c | 3 +++
>  drivers/s390/crypto/ap_bus.h | 1 +
>  2 files changed, 4 insertions(+)
> 
> diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
> index 24ec282..7c3b8d3 100644
> --- a/drivers/s390/crypto/ap_bus.c
> +++ b/drivers/s390/crypto/ap_bus.c
> @@ -1651,6 +1651,9 @@ static void ap_scan_bus(struct work_struct *unused)
>  		ap_dev->queue_depth = queue_depth;
>  		ap_dev->raw_hwtype = device_type;
>  		ap_dev->device_type = device_type;
> +		/* CEX6 toleration: map to CEX5 */
> +		if (device_type == AP_DEVICE_TYPE_CEX6)
> +			ap_dev->device_type = AP_DEVICE_TYPE_CEX5;
>  		ap_dev->functions = device_functions;
>  		spin_lock_init(&ap_dev->lock);
>  		INIT_LIST_HEAD(&ap_dev->pendingq);
> diff --git a/drivers/s390/crypto/ap_bus.h b/drivers/s390/crypto/ap_bus.h
> index 6adcbdf..cc741e9 100644
> --- a/drivers/s390/crypto/ap_bus.h
> +++ b/drivers/s390/crypto/ap_bus.h
> @@ -105,6 +105,7 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr)
>  #define AP_DEVICE_TYPE_CEX3C	9
>  #define AP_DEVICE_TYPE_CEX4	10
>  #define AP_DEVICE_TYPE_CEX5	11
> +#define AP_DEVICE_TYPE_CEX6	12
>  
>  /*
>   * Known function facilities
> 

Acked-by: Colin Ian King <colin.king at canonical.com>




More information about the kernel-team mailing list