From patchwork Wed Apr 11 01:54:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10334739 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 34452602D8 for ; Wed, 11 Apr 2018 01:54:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 23DA7285E8 for ; Wed, 11 Apr 2018 01:54:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 185E1285FB; Wed, 11 Apr 2018 01:54:21 +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 A88E0285E8 for ; Wed, 11 Apr 2018 01:54:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752295AbeDKByT (ORCPT ); Tue, 10 Apr 2018 21:54:19 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:44667 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752076AbeDKByS (ORCPT ); Tue, 10 Apr 2018 21:54:18 -0400 Received: by mail-qk0-f195.google.com with SMTP id n139so258910qke.11 for ; Tue, 10 Apr 2018 18:54:18 -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=bHRN3ApZtU70m6RjIBP8EWLzvZq/XPk32EkGi5ahGPg=; b=YW9HXl78F5qLxSIboBCPuDIU1MNy7GYhglaDYcShk16dVBqBVEsaQavWUH2V0bYdhe G19LP6kxodQIma/otaRIRw2FtbTfunRnLu2EOeN/sLXO8y2Ouz/D3heUTCYb3piYVIhJ AfcPi42rdl9T5SeqRPNrR4+Xq75xYv6xWwtva/AktzJkVL4s2ylJ6+mGjMOjWwIftj90 d3P4+av2YfKMTvK2fxS008aAOuT5Nn7MtnSN7kjOd7p5uvq/TkTkQBmFDjAQdzazzEr4 +FO29vQCBv7t3JJIFGGRsqfS30b93ylPbM94o7m0DfGxbuKyfR57RrXAp5I4D4ihPXrx 47ZQ== 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=bHRN3ApZtU70m6RjIBP8EWLzvZq/XPk32EkGi5ahGPg=; b=SY0dVmHp8P3NQa3IKghV+bp5TQLHsC6tBJnwviMi1HVr3OG6FbncSKFPMr7nPZEocA Se/ORCSNso8KWtQ24QlIVZ7cfuIct63y6gJoFn9RR7b1YNKoA/pOLPO+JjHwpfFf5rxY 98ZiltYsh2GH0l4gsqRz4cq7Z10XXmUA5gG774ORsgcjm7yNACUPbNtJLYUXwVcp00Op WuHT5X8DI7Bhq5328YkP0u6cvf1c0z70VWNL0aDq4lujuXtTj7NrD9FnDksCXifvvODW ubyB1XClQdW6Cgdqk2IUhaz7cvFdmIc4ZiFAkViDZNFvuxIHLY+P5/XayhAEYhTOeDGj ZuVg== X-Gm-Message-State: ALQs6tAO8SYAe2JhqcFUnJZDXaC/9PHJANNgfi0mpHr3xHpSUBJ1OpZp xdfRlOxN5rt3UzTpWjIcPGE= X-Google-Smtp-Source: AIpwx48cTQNwjZpuMoCUq/K67ZoI5fvmBASRzLReftaWZ9Fxt8xg3ipjkOsDJw8qtgrqT++ek3DIig== X-Received: by 10.55.203.135 with SMTP id u7mr4122556qkl.190.1523411658112; Tue, 10 Apr 2018 18:54:18 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:482:c19:1b:b4:1794:dc96]) by smtp.gmail.com with ESMTPSA id a79sm45783qkg.23.2018.04.10.18.54.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Apr 2018 18:54:17 -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 v2 2/2] crypto: caam - allow retrieving 'era' from register Date: Tue, 10 Apr 2018 22:54:04 -0300 Message-Id: <1523411644-10156-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1523411644-10156-1-git-send-email-festevam@gmail.com> References: <1523411644-10156-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 --- Changes since v1: - None. I previously asked to put the linux-crypto list on Cc drivers/crypto/caam/ctrl.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- drivers/crypto/caam/regs.h | 6 ++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index bee690a..3f10791 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -396,11 +396,47 @@ static void kick_trng(struct platform_device *pdev, int ent_delay) clrsetbits_32(&r4tst->rtmctl, RTMCTL_PRGM, RTMCTL_SAMP_MODE_RAW_ES_SC); } +static u8 caam_get_era_from_hw(struct caam_ctrl __iomem *ctrl) +{ + const struct sec_vid 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}, + }; + int i; + + u32 secvid_ms = rd_reg32(&ctrl->perfmon.caam_id_ms); + u32 ccbvid = rd_reg32(&ctrl->perfmon.ccb_id); + u16 ip_id = (secvid_ms & SECVID_MS_IPID_MASK) >> SECVID_MS_IPID_SHIFT; + u8 maj_rev = (secvid_ms & SECVID_MS_MAJ_REV_MASK) >> + SECVID_MS_MAJ_REV_SHIFT; + u8 era = (ccbvid & CCBVID_ERA_MASK) >> CCBVID_ERA_SHIFT; + + if (era) /* This is '0' prior to CAAM ERA-6 */ + return era; + + for (i = 0; i < ARRAY_SIZE(id); i++) + if (id[i].ip_id == ip_id && id[i].maj_rev == maj_rev) + return id[i].min_rev; + + return 0; +} + /** * 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. **/ -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 +446,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 +661,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..6f96d7b 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h @@ -311,6 +311,12 @@ struct caam_perfmon { u64 rsvd3; /* Component Instantiation Parameters fe0-fff */ +#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 +#define CCBVID_ERA_MASK 0xff000000 +#define CCBVID_ERA_SHIFT 24 u32 rtic_id; /* RVID - RTIC Version ID */ u32 ccb_id; /* CCBVID - CCB Version ID */ u32 cha_id_ms; /* CHAVID - CHA Version ID Most Significant*/