From patchwork Sat Mar 25 16:18:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 95992 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp532237qgd; Sat, 25 Mar 2017 09:19:43 -0700 (PDT) X-Received: by 10.98.58.7 with SMTP id h7mr16109264pfa.234.1490458783384; Sat, 25 Mar 2017 09:19:43 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si6723034pli.62.2017.03.25.09.19.43; Sat, 25 Mar 2017 09:19:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751363AbdCYQTn (ORCPT + 5 others); Sat, 25 Mar 2017 12:19:43 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:35282 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbdCYQTm (ORCPT ); Sat, 25 Mar 2017 12:19:42 -0400 Received: by mail-pf0-f169.google.com with SMTP id 20so7969058pfk.2 for ; Sat, 25 Mar 2017 09:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NW+JnmrMdQEZ4heGeykwECteZI+UeSh2+sM3vp0//9w=; b=MwJvjLc9DAcv3VCAoHHst5I5rDODF8rlo9jhYaUNH7TWu4pzrqENsHOI62WYWS62bY FFqMPIklng+TGWaz/Bkl1PsOgS7nxDsT8T1sqMKs0FEH2Hfg/VBRcyiG2z/J+d9KtjGM N4+aQTEGFHrK8+yoJZChC4q0r1O7EVD24EVLU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NW+JnmrMdQEZ4heGeykwECteZI+UeSh2+sM3vp0//9w=; b=UGXFUoVUC0ADBXbC8I4ZPsTZwdxP92B9eE+bi4Ri9QAQt1TZicYL2uR5ldkWgOfVSk JvltQv8wvenntfsupqpmIYIwPuZcHZ4qleeWHTKeOHbu/tV/bCQ78obhBuihXFTlw228 9Kb4AfC9pl0tw9QSEg9K03409p/jdP/zQwOqR+gyAX8XaHu2sSs6eV+1ZKAlfTKKYYGH Ou2VHOSPfMC0GdVqCyFAQxHc2qzarwLesbKWiM1MgxV40oKChhI57CLyKTLguQIT4/NU 4EPeAA+JDvga+0+xsPxftTe+odBNN4KiDjateKhpAB4l0JCz5aSk6lWAyQz7zg/kbaam MvUQ== X-Gm-Message-State: AFeK/H0C9RKpThcKsPict+z9LKdPcGIqIsjpuZKDhaFeP1OnAABvb46TWcnHhULV7RMV3y9e X-Received: by 10.98.202.80 with SMTP id n77mr15512071pfg.167.1490458781008; Sat, 25 Mar 2017 09:19:41 -0700 (PDT) Received: from phantom.lan ([106.51.225.38]) by smtp.gmail.com with ESMTPSA id q194sm11469541pfq.43.2017.03.25.09.19.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Mar 2017 09:19:39 -0700 (PDT) From: Sumit Semwal To: stable@vger.kernel.org Cc: Harald Freudenberger , Martin Schwidefsky , Sasha Levin , Greg Kroah-Hartman , Sumit Semwal Subject: [PATCH for-4.4 15/19] s390/zcrypt: Introduce CEX6 toleration Date: Sat, 25 Mar 2017 21:48:15 +0530 Message-Id: <1490458699-24484-16-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490458699-24484-1-git-send-email-sumit.semwal@linaro.org> References: <1490458699-24484-1-git-send-email-sumit.semwal@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Harald Freudenberger [ Upstream commit b3e8652bcbfa04807e44708d4d0c8cdad39c9215 ] Signed-off-by: Harald Freudenberger Signed-off-by: Martin Schwidefsky Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sumit Semwal --- drivers/s390/crypto/ap_bus.c | 3 +++ drivers/s390/crypto/ap_bus.h | 1 + 2 files changed, 4 insertions(+) -- 2.7.4 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