From patchwork Mon May 20 12:14:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 164616 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp225903ili; Mon, 20 May 2019 05:30:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4lF5oYXykTNXfpiqgkxydbAamQ+h/719y/9xsXatpKS1+SMI9L0vLlMsyrGDWi1X+7knw X-Received: by 2002:a65:520b:: with SMTP id o11mr20948965pgp.184.1558355409533; Mon, 20 May 2019 05:30:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558355409; cv=none; d=google.com; s=arc-20160816; b=wes73KXDvEcvAa8PvtCgHdySErW+koVpH1/thwwIW5U4bRMrZGQIp0SgByN2bTuN5h MOrpGy5alivg2Wa0QzRG5Be+YKa/qtpJxMKuBULSLlmyuz4bfN/gbQen6qusFUctU1T5 LDDT0bbGtmfd3KmMPgFOqdHY1jJ4W4qihIWosxrENe8JMysdiODfMiB8zHNiAjgyiGtv z9p5kTAP1lj7+4dbjceIUjFQ0+5UH5EM/LsdZDz+Y8/NbvHhFPodXuGj1N7PbqKD+cen DKmDCKT/p2JYfxv2nhwjVAvqBvwoHaIf61h2eOV/f+J4uF7IYQY2Q0eE6IBCOZ0zvacx BfQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Bsr5lnxGn3aaW5Bh5tHhpU2uotZZ/yJORIJIhWro+k8=; b=cNEXhPbXY0h+P4ZV17Y8Evwtb5k9bbCs2o1ybuI5VmTEfg73tJc8jEQn41A4kaV3IW 43tOHtQ0+OXnWp5eHs7XgVA79h3iOznmeDf0o0HkuYA2S8tx8EQg8Wb8380mGfMtjw+l e5GUUCqK3Jr6X7a2IqMleH1R8CtsfOKgZ2Fm7c14q4auSGdquA9SgXd/rJt+vIEOfx2y QNLzpUwtoriGrj60wFPWeSjRqLUYPv/0JrvzJTaBY7xDha67pfDeuBkVOYjLL+kTQC9c 87tzjJyjQfKQGgRby87EksxZmUzoJr9+6/bF8RrNeaI0dILBWypJ9h01QpgSX+C8dxD0 bUHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=j6oMMwDJ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 186si18145232pfc.247.2019.05.20.05.30.09; Mon, 20 May 2019 05:30:09 -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=@kernel.org header.s=default header.b=j6oMMwDJ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390034AbfETMaI (ORCPT + 14 others); Mon, 20 May 2019 08:30:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:46370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390030AbfETMaH (ORCPT ); Mon, 20 May 2019 08:30:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C881320645; Mon, 20 May 2019 12:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355407; bh=evbFVzhLxEg4SbCoKYUaCDJhdyPgsuUfMr8WxKWYoSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j6oMMwDJCsz00d/YmJS4GtQjDApvoHtByj0eb8BzAbRMSHn1DW62LMfEyCdV2445l ITngMtbWcvGmgpOxWKSp0KtFbS9UH6gO1LKh8jvVQhLrScmy2sNNvfKTerh3NbL1ay ZyMrmXPlWGuKIVChIr9OidrxKk+dB1yN+AcixNBk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ofir Drang , Gilad Ben-Yossef , Herbert Xu Subject: [PATCH 5.0 066/123] crypto: ccree - handle tee fips error during power management resume Date: Mon, 20 May 2019 14:14:06 +0200 Message-Id: <20190520115249.216173085@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115245.439864225@linuxfoundation.org> References: <20190520115245.439864225@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ofir Drang commit 7138377ce10455b7183c6dde4b2c51b33f464c45 upstream. in order to support cryptocell tee fips error that may occurs while cryptocell ree is suspended, an cc_tee_handle_fips_error call added to the cc_pm_resume function. Signed-off-by: Ofir Drang Signed-off-by: Gilad Ben-Yossef Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- drivers/crypto/ccree/cc_pm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/crypto/ccree/cc_pm.c +++ b/drivers/crypto/ccree/cc_pm.c @@ -11,6 +11,7 @@ #include "cc_ivgen.h" #include "cc_hash.h" #include "cc_pm.h" +#include "cc_fips.h" #define POWER_DOWN_ENABLE 0x01 #define POWER_DOWN_DISABLE 0x00 @@ -50,12 +51,13 @@ int cc_pm_resume(struct device *dev) } cc_iowrite(drvdata, CC_REG(HOST_POWER_DOWN_EN), POWER_DOWN_DISABLE); - rc = init_cc_regs(drvdata, false); if (rc) { dev_err(dev, "init_cc_regs (%x)\n", rc); return rc; } + /* check if tee fips error occurred during power down */ + cc_tee_handle_fips_error(drvdata); rc = cc_resume_req_queue(drvdata); if (rc) {