lkml.org 
[lkml]   [2019]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 35/35] crypto: ccree: handle tee fips error during power management resume
    Date
    From: Ofir Drang <ofir.drang@arm.com>

    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 <ofir.drang@arm.com>
    Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
    Cc: stable@vger.kernel.org # v4.19+
    ---
    drivers/crypto/ccree/cc_pm.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c
    index 77025da2dcb6..2dad9c9543c6 100644
    --- 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) {
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-04-18 15:43    [W:5.491 / U:1.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site