From patchwork Mon May 27 08:38:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Liu X-Patchwork-Id: 10962315 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-2.web.codeaurora.org (Postfix) with ESMTP id C7DC576 for ; Mon, 27 May 2019 08:39:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6FE728ACE for ; Mon, 27 May 2019 08:39:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A81CE28AD2; Mon, 27 May 2019 08:39:35 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY 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 50EBB28ACE for ; Mon, 27 May 2019 08:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726501AbfE0Ij3 (ORCPT ); Mon, 27 May 2019 04:39:29 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:33853 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726282AbfE0Ij2 (ORCPT ); Mon, 27 May 2019 04:39:28 -0400 X-UUID: bf1d95354e3543b588a19fde8c97c38b-20190527 X-UUID: bf1d95354e3543b588a19fde8c97c38b-20190527 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1882384691; Mon, 27 May 2019 16:39:09 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 27 May 2019 16:39:08 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 27 May 2019 16:39:08 +0800 From: Neal Liu To: Matt Mackall , Herbert Xu , Rob Herring , Mark Rutland , Matthias Brugger , Sean Wang CC: Neal Liu , , , , , lkml , , Crystal Guo Subject: [PATCH v2 1/3] soc: mediatek: add SMC fid table for SIP interface Date: Mon, 27 May 2019 16:38:44 +0800 Message-ID: <1558946326-13630-2-git-send-email-neal.liu@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1558946326-13630-1-git-send-email-neal.liu@mediatek.com> References: <1558946326-13630-1-git-send-email-neal.liu@mediatek.com> MIME-Version: 1.0 X-MTK: N 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 1. Add a header file to provide SIP interface to ARM Trusted Firmware(ATF) 2. Add hwrng SMC fid Signed-off-by: Neal Liu --- include/linux/soc/mediatek/mtk_sip_svc.h | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 include/linux/soc/mediatek/mtk_sip_svc.h diff --git a/include/linux/soc/mediatek/mtk_sip_svc.h b/include/linux/soc/mediatek/mtk_sip_svc.h new file mode 100644 index 0000000..f65d403 --- /dev/null +++ b/include/linux/soc/mediatek/mtk_sip_svc.h @@ -0,0 +1,51 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2019 MediaTek Inc. + */ + +#ifndef _MTK_SECURE_API_H_ +#define _MTK_SECURE_API_H_ + +#include + +/* Error Code */ +#define SIP_SVC_E_SUCCESS 0 +#define SIP_SVC_E_NOT_SUPPORTED -1 +#define SIP_SVC_E_INVALID_PARAMS -2 +#define SIP_SVC_E_INVALID_RANGE -3 +#define SIP_SVC_E_PERMISSION_DENY -4 + +#ifdef CONFIG_ARM64 +#define MTK_SIP_SMC_AARCH_BIT 0x40000000 +#else +#define MTK_SIP_SMC_AARCH_BIT 0x00000000 +#endif + +/******************************************************************************* + * Defines for Mediatek runtime services func ids + ******************************************************************************/ + +/* Debug feature and ATF related SMC call */ + +/* CPU operations related SMC call */ + +/* SPM related SMC call */ + +/* Low power related SMC call */ + +/* AMMS related SMC call */ + +/* Security related SMC call */ +/* HWRNG */ +#define MTK_SIP_KERNEL_GET_RND \ + (0x82000206 | MTK_SIP_SMC_AARCH_BIT) + +/* Storage Encryption related SMC call */ + +/* Platform related SMC call */ + +/* Pheripheral related SMC call */ + +/* MM related SMC call */ + +#endif /* _MTK_SECURE_API_H_ */ From patchwork Mon May 27 08:38:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Liu X-Patchwork-Id: 10962309 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-2.web.codeaurora.org (Postfix) with ESMTP id EF920112C for ; Mon, 27 May 2019 08:39:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDF4428ACE for ; Mon, 27 May 2019 08:39:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D031C28AD2; Mon, 27 May 2019 08:39:18 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY 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 266A028ACE for ; Mon, 27 May 2019 08:39:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725940AbfE0IjQ (ORCPT ); Mon, 27 May 2019 04:39:16 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:48638 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725869AbfE0IjQ (ORCPT ); Mon, 27 May 2019 04:39:16 -0400 X-UUID: bc8897b2a22f41efb805b7ea54e38a29-20190527 X-UUID: bc8897b2a22f41efb805b7ea54e38a29-20190527 Received: from mtkmrs01.mediatek.inc [(172.21.131.159)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1564028708; Mon, 27 May 2019 16:39:11 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 27 May 2019 16:39:08 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 27 May 2019 16:39:08 +0800 From: Neal Liu To: Matt Mackall , Herbert Xu , Rob Herring , Mark Rutland , Matthias Brugger , Sean Wang CC: Neal Liu , , , , , lkml , , Crystal Guo Subject: [PATCH v2 2/3] dt-bindings: rng: update bindings for MediaTek ARMv8 SoCs Date: Mon, 27 May 2019 16:38:45 +0800 Message-ID: <1558946326-13630-3-git-send-email-neal.liu@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1558946326-13630-1-git-send-email-neal.liu@mediatek.com> References: <1558946326-13630-1-git-send-email-neal.liu@mediatek.com> MIME-Version: 1.0 X-MTK: N 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 Document the binding used by the MediaTek ARMv8 SoCs random number generator with TrustZone enabled. Signed-off-by: Neal Liu --- Documentation/devicetree/bindings/rng/mtk-rng.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/rng/mtk-rng.txt b/Documentation/devicetree/bindings/rng/mtk-rng.txt index 2bc89f1..1fb9b1d 100644 --- a/Documentation/devicetree/bindings/rng/mtk-rng.txt +++ b/Documentation/devicetree/bindings/rng/mtk-rng.txt @@ -3,9 +3,12 @@ found in MediaTek SoC family Required properties: - compatible : Should be - "mediatek,mt7622-rng", "mediatek,mt7623-rng" : for MT7622 - "mediatek,mt7629-rng", "mediatek,mt7623-rng" : for MT7629 - "mediatek,mt7623-rng" : for MT7623 + "mediatek,mt7622-rng", "mediatek,mt7623-rng" for MT7622 + "mediatek,mt7629-rng", "mediatek,mt7623-rng" for MT7629 + "mediatek,mt7623-rng" for MT7623 + "mediatek,mtk-sec-rng" for MediaTek ARMv8 SoCs + +Optional properties: - clocks : list of clock specifiers, corresponding to entries in clock-names property; - clock-names : Should contain "rng" entries; @@ -19,3 +22,7 @@ rng: rng@1020f000 { clocks = <&infracfg CLK_INFRA_TRNG>; clock-names = "rng"; }; + +hwrng: hwrng { + compatible = "mediatek,mtk-sec-rng"; +}; From patchwork Mon May 27 08:38:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neal Liu X-Patchwork-Id: 10962323 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-2.web.codeaurora.org (Postfix) with ESMTP id E1D5B112C for ; Mon, 27 May 2019 08:39:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D27A528ACE for ; Mon, 27 May 2019 08:39:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C688D28AD2; Mon, 27 May 2019 08:39:40 +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=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI,UNPARSEABLE_RELAY 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 4F42428ACE for ; Mon, 27 May 2019 08:39:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726326AbfE0Ij1 (ORCPT ); Mon, 27 May 2019 04:39:27 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:51010 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726225AbfE0Ij0 (ORCPT ); Mon, 27 May 2019 04:39:26 -0400 X-UUID: 4632f2b098114774ae4f8a7d2464d995-20190527 X-UUID: 4632f2b098114774ae4f8a7d2464d995-20190527 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 114662910; Mon, 27 May 2019 16:39:15 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 27 May 2019 16:39:08 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 27 May 2019 16:39:08 +0800 From: Neal Liu To: Matt Mackall , Herbert Xu , Rob Herring , Mark Rutland , Matthias Brugger , Sean Wang CC: Neal Liu , , , , , lkml , , Crystal Guo Subject: [PATCH v2 3/3] hwrng: add mtk-sec-rng driver Date: Mon, 27 May 2019 16:38:46 +0800 Message-ID: <1558946326-13630-4-git-send-email-neal.liu@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1558946326-13630-1-git-send-email-neal.liu@mediatek.com> References: <1558946326-13630-1-git-send-email-neal.liu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: BD4B105A6E092554A06C671E9FEB9F64EE7E7C79F5631132485CF7A2508A38002000:8 X-MTK: N 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 For MediaTek SoCs on ARMv8 with TrustZone enabled, peripherals like entropy sources is not accessible from normal world (linux) and rather accessible from secure world (ATF/TEE) only. This driver aims to provide a generic interface to ATF rng service. Signed-off-by: Neal Liu --- drivers/char/hw_random/Kconfig | 16 ++++++ drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/mtk-sec-rng.c | 97 ++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 drivers/char/hw_random/mtk-sec-rng.c diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig index 25a7d8f..6c82a3b 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -398,6 +398,22 @@ config HW_RANDOM_MTK If unsure, say Y. +config HW_RANDOM_MTK_SEC + tristate "MediaTek Security Random Number Generator support" + depends on HW_RANDOM + depends on ARCH_MEDIATEK || COMPILE_TEST + default HW_RANDOM + help + This driver provides kernel-side support for the Random Number + Generator hardware found on MediaTek SoCs. The difference with + mtk-rng is the Random Number Generator hardware is secure + access only. + + To compile this driver as a module, choose M here. the + module will be called mtk-sec-rng. + + If unsure, say Y. + config HW_RANDOM_S390 tristate "S390 True Random Number Generator support" depends on S390 diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile index 7c9ef4a..0ae4993 100644 --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_HW_RANDOM_PIC32) += pic32-rng.o obj-$(CONFIG_HW_RANDOM_MESON) += meson-rng.o obj-$(CONFIG_HW_RANDOM_CAVIUM) += cavium-rng.o cavium-rng-vf.o obj-$(CONFIG_HW_RANDOM_MTK) += mtk-rng.o +obj-$(CONFIG_HW_RANDOM_MTK_SEC) += mtk-sec-rng.o obj-$(CONFIG_HW_RANDOM_S390) += s390-trng.o obj-$(CONFIG_HW_RANDOM_KEYSTONE) += ks-sa-rng.o obj-$(CONFIG_HW_RANDOM_OPTEE) += optee-rng.o diff --git a/drivers/char/hw_random/mtk-sec-rng.c b/drivers/char/hw_random/mtk-sec-rng.c new file mode 100644 index 0000000..4c6e5bf --- /dev/null +++ b/drivers/char/hw_random/mtk-sec-rng.c @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 MediaTek Inc. + */ + +#include +#include +#include +#include +#include +#include + +#define MT67XX_RNG_MAGIC 0x74726e67 +#define SMC_RET_NUM 4 +#define MTK_SEC_RND_SIZE (sizeof(u32) * SMC_RET_NUM) + +struct mtk_sec_rng_priv { + struct hwrng rng; +}; + +static void mtk_sec_get_rnd(uint32_t *val) +{ + struct arm_smccc_res res; + + arm_smccc_smc(MTK_SIP_KERNEL_GET_RND, + MT67XX_RNG_MAGIC, 0, 0, 0, 0, 0, 0, &res); + + val[0] = res.a0; + val[1] = res.a1; + val[2] = res.a2; + val[3] = res.a3; +} + +static int mtk_sec_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait) +{ + size_t get_rnd_size = MTK_SEC_RND_SIZE; + u32 val[4] = {0}; + int i, retval = 0; + + while (max >= get_rnd_size) { + mtk_sec_get_rnd(val); + + for (i = 0; i < SMC_RET_NUM; i++) { + *(u32 *)buf = val[i]; + buf += sizeof(u32); + } + + retval += get_rnd_size; + max -= get_rnd_size; + } + + return retval; +} + +static int mtk_sec_rng_probe(struct platform_device *pdev) +{ + struct mtk_sec_rng_priv *priv; + int ret; + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->rng.name = pdev->name; + priv->rng.read = mtk_sec_rng_read; + priv->rng.priv = (unsigned long)&pdev->dev; + priv->rng.quality = 900; + + ret = devm_hwrng_register(&pdev->dev, &priv->rng); + if (ret) { + dev_err(&pdev->dev, "failed to register rng device: %d\n", ret); + return ret; + } + + return 0; +} + +static const struct of_device_id mtk_sec_rng_match[] = { + { .compatible = "mediatek,mtk-sec-rng", }, + {} +}; +MODULE_DEVICE_TABLE(of, mtk_sec_rng_match); + +static struct platform_driver mtk_sec_rng_driver = { + .probe = mtk_sec_rng_probe, + .driver = { + .name = KBUILD_MODNAME, + .owner = THIS_MODULE, + .of_match_table = mtk_sec_rng_match, + }, +}; + +module_platform_driver(mtk_sec_rng_driver); + +MODULE_DESCRIPTION("MediaTek Security Random Number Generator Driver"); +MODULE_AUTHOR("Neal Liu "); +MODULE_LICENSE("GPL");