lkml.org 
[lkml]   [2017]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 74/93] s390/zcrypt: Introduce CEX6 toleration
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Harald Freudenberger <freude@linux.vnet.ibm.com>

    [ Upstream commit b3e8652bcbfa04807e44708d4d0c8cdad39c9215 ]

    Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/s390/crypto/ap_bus.c | 3 +++
    drivers/s390/crypto/ap_bus.h | 1 +
    2 files changed, 4 insertions(+)

    --- a/drivers/s390/crypto/ap_bus.c
    +++ b/drivers/s390/crypto/ap_bus.c
    @@ -1712,6 +1712,9 @@ static void ap_scan_bus(struct work_stru
    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);
    --- 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 i
    #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

    \
     
     \ /
      Last update: 2017-03-20 19:26    [W:4.260 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site