From patchwork Wed Apr 11 12:45:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10335395 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 282AA60134 for ; Wed, 11 Apr 2018 12:45:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 104012892B for ; Wed, 11 Apr 2018 12:45:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04C4B2893A; Wed, 11 Apr 2018 12:45:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EF712892B for ; Wed, 11 Apr 2018 12:45:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753185AbeDKMpe (ORCPT ); Wed, 11 Apr 2018 08:45:34 -0400 Received: from mail-qt0-f194.google.com ([209.85.216.194]:36612 "EHLO mail-qt0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753122AbeDKMpe (ORCPT ); Wed, 11 Apr 2018 08:45:34 -0400 Received: by mail-qt0-f194.google.com with SMTP id w23so1706210qtn.3 for ; Wed, 11 Apr 2018 05:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ACSSlDVLnell4BERqzxoElXzDhzJFAuw9bK5z+CbfUo=; b=S6oPMhPFGkuGdIRNZbwlk3SHTHip9fLuaAVECKfU9P43F7WXAShNLmcZltB3fEHVtj +70IqsQHk0l36VDFBb+8FmeWhMU0QDGBFDbGe8SEt1tAA/0YpVfK+gnn2GZnXdyTiz7O 24soziG/llp23ekyJhWYUuThrdbKQNlcHyJpE7Kfb/ppsjq6u3Jk0IHFF+1K2//JzKGi H3Ie5AJ582IJSpibEfAKza1k/XPJPFHGm2leaSkEgbj2q/gqZlAn3AyI67DgWrfRVMex gq3WMIXJYST6u8+928gtBgGdU4fQBRPPB7a7XrHyraexGEi18bHkfZJ+O0EhE5Nc06z8 Fkfg== 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=ACSSlDVLnell4BERqzxoElXzDhzJFAuw9bK5z+CbfUo=; b=qBSud3teNw+H3QxusZaAYGY8m1aRb+71fD9TbY3YnY1UNQo1hhhjQylyDlhuK2wvdR ECWki3qdOhHcOFy3qveGNrg1WzwMEIJ1xYv58lhrDSowv3irY2E8CRToP9uexapp+WSw +oJLkGG9GCc6eXKAGMoAlIDi+GCDoogVF/fOF9PoqnvY7PkhkrZkxEvtKTmdRpAorrBs 0vgNQlls3NdwYleeKZMEIVxI3MA+4ZOGIvPLAQOXw8yFuqmCW/76P9wVUSsGRV3COEDm sUyQirH07/6Is/46PftNIfB4O0fnxIk9m2HuhwMEe+4gO52/DB9w0mlbTPGDwIHt/Ayo nEEw== X-Gm-Message-State: ALQs6tARUPKIEMkYpJFj/RrksZQ4DNc4QCq0CYwGxnbfsA1Usx9mZfKf E1L9SfiuVEIzrXFrX/pEkDI= X-Google-Smtp-Source: AIpwx4/i/zhOJ1UBm2F/D7hvs+2niDM0OIUUw4uLKpL8KvRPQEAMeZjgOvIb6FkTuOVoUoTYmLAnnA== X-Received: by 10.237.58.131 with SMTP id o3mr7095626qte.4.1523450733576; Wed, 11 Apr 2018 05:45:33 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:c19:1b:b4:1794:dc96]) by smtp.gmail.com with ESMTPSA id c4sm891935qtd.39.2018.04.11.05.45.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Apr 2018 05:45:32 -0700 (PDT) From: Fabio Estevam To: herbert@gondor.apana.org.au Cc: horia.geanta@nxp.com, aymen.sghaier@nxp.com, bryan.odonoghue@linaro.org, breno.lima@nxp.com, linux-crypto@vger.kernel.org, Fabio Estevam Subject: [PATCH v4 2/2] crypto: caam - allow retrieving 'era' from register Date: Wed, 11 Apr 2018 09:45:20 -0300 Message-Id: <1523450720-9300-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523450720-9300-1-git-send-email-festevam@gmail.com> References: <1523450720-9300-1-git-send-email-festevam@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam The 'era' information can be retrieved from CAAM registers, so introduce a caam_get_era_from_hw() function that gets it via register reads in case the 'fsl,sec-era' property is not passed in the device tree. This function is based on the U-Boot implementation from drivers/crypto/fsl/sec.c Signed-off-by: Fabio Estevam Reviewed-by: Horia Geantă Tested-by: Breno Lima --- Changes since v3: - Make checkpatch happy drivers/crypto/caam/ctrl.c | 56 ++++++++++++++++++++++++++++++++++++++++++---- drivers/crypto/caam/regs.h | 6 +++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index bee690a..ab67e97 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -396,11 +396,56 @@ static void kick_trng(struct platform_device *pdev, int ent_delay) clrsetbits_32(&r4tst->rtmctl, RTMCTL_PRGM, RTMCTL_SAMP_MODE_RAW_ES_SC); } +static int caam_get_era_from_hw(struct caam_ctrl __iomem *ctrl) +{ + static const struct { + u16 ip_id; + u8 maj_rev; + u8 era; + } id[] = { + {0x0A10, 1, 1}, + {0x0A10, 2, 2}, + {0x0A12, 1, 3}, + {0x0A14, 1, 3}, + {0x0A14, 2, 4}, + {0x0A16, 1, 4}, + {0x0A10, 3, 4}, + {0x0A11, 1, 4}, + {0x0A18, 1, 4}, + {0x0A11, 2, 5}, + {0x0A12, 2, 5}, + {0x0A13, 1, 5}, + {0x0A1C, 1, 5} + }; + u32 ccbvid, id_ms; + u8 maj_rev, era; + u16 ip_id; + int i; + + ccbvid = rd_reg32(&ctrl->perfmon.ccb_id); + era = (ccbvid & CCBVID_ERA_MASK) >> CCBVID_ERA_SHIFT; + if (era) /* This is '0' prior to CAAM ERA-6 */ + return era; + + id_ms = rd_reg32(&ctrl->perfmon.caam_id_ms); + ip_id = (id_ms & SECVID_MS_IPID_MASK) >> SECVID_MS_IPID_SHIFT; + maj_rev = (id_ms & SECVID_MS_MAJ_REV_MASK) >> SECVID_MS_MAJ_REV_SHIFT; + + for (i = 0; i < ARRAY_SIZE(id); i++) + if (id[i].ip_id == ip_id && id[i].maj_rev == maj_rev) + return id[i].era; + + return -ENOTSUPP; +} + /** * caam_get_era() - Return the ERA of the SEC on SoC, based - * on "sec-era" propery in the DTS. This property is updated by u-boot. + * on "sec-era" optional property in the DTS. This property is updated + * by u-boot. + * In case this property is not passed an attempt to retrieve the CAAM + * era via register reads will be made. **/ -static int caam_get_era(void) +static int caam_get_era(struct caam_ctrl __iomem *ctrl) { struct device_node *caam_node; int ret; @@ -410,7 +455,10 @@ static int caam_get_era(void) ret = of_property_read_u32(caam_node, "fsl,sec-era", &prop); of_node_put(caam_node); - return ret ? -ENOTSUPP : prop; + if (!ret) + return prop; + else + return caam_get_era_from_hw(ctrl); } static const struct of_device_id caam_match[] = { @@ -622,7 +670,7 @@ static int caam_probe(struct platform_device *pdev) goto iounmap_ctrl; } - ctrlpriv->era = caam_get_era(); + ctrlpriv->era = caam_get_era(ctrl); ret = of_platform_populate(nprop, caam_match, NULL, dev); if (ret) { diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h index fee3638..4fb91ba 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h @@ -312,11 +312,17 @@ struct caam_perfmon { /* Component Instantiation Parameters fe0-fff */ u32 rtic_id; /* RVID - RTIC Version ID */ +#define CCBVID_ERA_MASK 0xff000000 +#define CCBVID_ERA_SHIFT 24 u32 ccb_id; /* CCBVID - CCB Version ID */ u32 cha_id_ms; /* CHAVID - CHA Version ID Most Significant*/ u32 cha_id_ls; /* CHAVID - CHA Version ID Least Significant*/ u32 cha_num_ms; /* CHANUM - CHA Number Most Significant */ u32 cha_num_ls; /* CHANUM - CHA Number Least Significant*/ +#define SECVID_MS_IPID_MASK 0xffff0000 +#define SECVID_MS_IPID_SHIFT 16 +#define SECVID_MS_MAJ_REV_MASK 0x0000ff00 +#define SECVID_MS_MAJ_REV_SHIFT 8 u32 caam_id_ms; /* CAAMVID - CAAM Version ID MS */ u32 caam_id_ls; /* CAAMVID - CAAM Version ID LS */ };