Received: by 2002:ab2:1689:0:b0:1f7:5705:b850 with SMTP id d9csp1962494lqa; Tue, 30 Apr 2024 04:51:42 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV/f9uhNNMmt6H7LgS14GdTGqTJZntfmSwcAhcybvtldIJFpYSR/z/M8ZhbQu4qunFrKgJSBl4EfBj9pvLxkbRsJ/5bY+kLC64UJAd1aw== X-Google-Smtp-Source: AGHT+IHd0sFT+sddBsH0/lmdyQTbZ0qWeCirYoi8d5CUBtGQdk6xYlDppWj3jZfozi0vF+bkTrMf X-Received: by 2002:a05:6214:762:b0:6a0:c990:223e with SMTP id f2-20020a056214076200b006a0c990223emr7925661qvz.23.1714477902208; Tue, 30 Apr 2024 04:51:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714477902; cv=pass; d=google.com; s=arc-20160816; b=GAJ/PzyI3WGd+JRkXhWtYvmIEMf/Lxz4IdUdkHbvb9Gquc9M9XswTsPo40HilJkK13 Iu6sjc936nPE9pnzkssfa9bJppyEoBasNgs6I8Of8Yu+AziJaA4ciCiRPEHZ+eCJ4jW+ ml7AYSgRbAWuGbQEOhjtqNtf+Y/dAq0iWNAzaMECLFYn7wGMKRqYGb1iXOP8H6szrZ5H GMbm6M100aujr78POqN+v87kxieIDXQQOUmlV3RPsN+rZLPQ6HjdD6KDXEyuaWy/sdGi nf2NbhtepKCurAym1cs3fhy2vpN1EulwG/KwuV/MCYtEm9c6tUjQ/nKsDw7oZdiyfZ/P i6/Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=H4PYRJyxCMQ3bg0kI03mbt8t1IY7XFYDsYAn4KuLzB0=; fh=UW7UQTLoDrmyrIq5SoO22MMi/q77AzScSiVSO5ESLWU=; b=0iBxvN6DXbbJPt9RIAs+ARr/tPxLzKkwrwqSPWsoHjh9BOhnKvUsTfYPDnzLDiiP+G jw0p7bs1wy8ca8go3DReZzR6qBy4Q+x1OIKP/R3zKDAsMt1MYj+xNsE8Ydsv7x/vZT3N dlwJKdUbzT8YaP7G0JxnlUSCiukLhlQ+kYZFiAOuC0lYC7QagQ1n9gEvedDdVVWkVPFR CpTyG0sfVIk23RkyEMzTtBqeuYL7O331SfbgM092qGpJZrDf3QHi89AA7O6GYPQST7+d 2x8OKCMUA7/kLwm35P/p3UOsAuftR2wfE9eQ4ZX9p7qafYeO8vTloN48B6Do71arlnKj IRaw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=pOW5YPnY; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-crypto+bounces-3950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-crypto+bounces-3950-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id m11-20020a0ce8cb000000b006a0de15ab57si1259053qvo.111.2024.04.30.04.51.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 04:51:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto+bounces-3950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=pOW5YPnY; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-crypto+bounces-3950-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-crypto+bounces-3950-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id B52BF1C21CBF for ; Tue, 30 Apr 2024 11:51:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AB5F313C9C3; Tue, 30 Apr 2024 11:51:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pOW5YPnY" X-Original-To: linux-crypto@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CD60134402 for ; Tue, 30 Apr 2024 11:51:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714477900; cv=none; b=LvTQR742BsJ5M6BY0Ms4KB8p+VwWxQoH+yh+hoN7YY5auqz6ZZSaZIiZOSX8FVvYvnlQo9ou8TBuYcSBt1w1dDU4pvq3Sntmn8OeI+cWiIsdekwmkFrPSBL3EvQ0n6uABDxaQWgJIbd4GKPxae58ATRBMcdPnQ/8+jg+Ysu39vw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714477900; c=relaxed/simple; bh=YdEb2BqFMuvnnlPHRBBlVg+nhsKgg+HIgVo+h3zmmro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NWoTJa0l7hMwS+dougCUz6u0m/9I/+UKb69f6TDy2IKX9XWd+kVT+8HYVqvAjwSlcCi3mbJU8TbPI/7ogq7mRav0m8BvtnNu2OuOrkdaA5am3A7UbW5wCRl57Fvh2PukdjAoTnnqfKvfAmfdt1PMa5wLl2/3qdT/BFH/Mx1E8Cw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pOW5YPnY; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E97AC2BBFC; Tue, 30 Apr 2024 11:51:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714477900; bh=YdEb2BqFMuvnnlPHRBBlVg+nhsKgg+HIgVo+h3zmmro=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=pOW5YPnYp+PgNFsPI+FMrKib5buyEx6zpURN8gO8Jw7FsS17hTzU/qCiyWJPTrxtH JURiTw5yFtWPfGHYIyOPdssrlaNSe+k7DCW9sSL/AoERYE9ow/0EEGqIbiYa/yhKyw HNGsqWWxP3+3LF+vfnVv7VPBBtnxbsiPY+fQ8VAHMRt/UYONPglS+24K1ZyN8+VIRi CzpK/ARcTXHV0vFbg3RQMKlrosMheItKuTL2h9r3IT2SCVO/5jf4eFgDgoy+1OAuzO j1IQcuetY4HRdxvC7didHhTTn1nog2yVv1kXKZd2G5Vx96nWZL86Kgb+7nVJTMe+nu dSSeFgPPD0s3g== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Gregory CLEMENT , Arnd Bergmann , soc@kernel.org, arm@kernel.org, Andy Shevchenko , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Olivia Mackall , Herbert Xu , Greg Kroah-Hartman , linux-crypto@vger.kernel.org Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH v8 6/9] platform: cznic: turris-omnia-mcu: Add support for MCU provided TRNG Date: Tue, 30 Apr 2024 13:51:08 +0200 Message-ID: <20240430115111.3453-7-kabel@kernel.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240430115111.3453-1-kabel@kernel.org> References: <20240430115111.3453-1-kabel@kernel.org> Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for true random number generator provided by the MCU. New Omnia boards come without the Atmel SHA204-A chip. Instead the crypto functionality is provided by new microcontroller, which has a TRNG peripheral. Signed-off-by: Marek BehĂșn --- drivers/platform/cznic/Kconfig | 2 + drivers/platform/cznic/Makefile | 1 + .../platform/cznic/turris-omnia-mcu-base.c | 6 +- .../platform/cznic/turris-omnia-mcu-gpio.c | 2 +- .../platform/cznic/turris-omnia-mcu-trng.c | 101 ++++++++++++++++++ drivers/platform/cznic/turris-omnia-mcu.h | 8 ++ 6 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 drivers/platform/cznic/turris-omnia-mcu-trng.c diff --git a/drivers/platform/cznic/Kconfig b/drivers/platform/cznic/Kconfig index e2649cdecc38..750d5f47dba8 100644 --- a/drivers/platform/cznic/Kconfig +++ b/drivers/platform/cznic/Kconfig @@ -19,6 +19,7 @@ config TURRIS_OMNIA_MCU depends on I2C select GPIOLIB select GPIOLIB_IRQCHIP + select HW_RANDOM select RTC_CLASS select WATCHDOG_CORE help @@ -28,6 +29,7 @@ config TURRIS_OMNIA_MCU - board poweroff into true low power mode (with voltage regulators disabled) and the ability to configure wake up from this mode (via rtcwake) + - true random number generator (if available on the MCU) - MCU watchdog - GPIO pins - to get front button press events (the front button can be diff --git a/drivers/platform/cznic/Makefile b/drivers/platform/cznic/Makefile index 687f7718c0a1..eae4c6b341ff 100644 --- a/drivers/platform/cznic/Makefile +++ b/drivers/platform/cznic/Makefile @@ -4,4 +4,5 @@ obj-$(CONFIG_TURRIS_OMNIA_MCU) += turris-omnia-mcu.o turris-omnia-mcu-y := turris-omnia-mcu-base.o turris-omnia-mcu-y += turris-omnia-mcu-gpio.o turris-omnia-mcu-y += turris-omnia-mcu-sys-off-wakeup.o +turris-omnia-mcu-y += turris-omnia-mcu-trng.o turris-omnia-mcu-y += turris-omnia-mcu-watchdog.o diff --git a/drivers/platform/cznic/turris-omnia-mcu-base.c b/drivers/platform/cznic/turris-omnia-mcu-base.c index 5f88119d825c..7fe4a3df93a6 100644 --- a/drivers/platform/cznic/turris-omnia-mcu-base.c +++ b/drivers/platform/cznic/turris-omnia-mcu-base.c @@ -369,7 +369,11 @@ static int omnia_mcu_probe(struct i2c_client *client) if (err) return err; - return omnia_mcu_register_gpiochip(mcu); + err = omnia_mcu_register_gpiochip(mcu); + if (err) + return err; + + return omnia_mcu_register_trng(mcu); } static const struct of_device_id of_omnia_mcu_match[] = { diff --git a/drivers/platform/cznic/turris-omnia-mcu-gpio.c b/drivers/platform/cznic/turris-omnia-mcu-gpio.c index bcc12bd1453c..af20f8076857 100644 --- a/drivers/platform/cznic/turris-omnia-mcu-gpio.c +++ b/drivers/platform/cznic/turris-omnia-mcu-gpio.c @@ -163,7 +163,7 @@ static const struct omnia_gpio { }; /* mapping from interrupts to indexes of GPIOs in the omnia_gpios array */ -static const u8 omnia_int_to_gpio_idx[32] = { +const u8 omnia_int_to_gpio_idx[32] = { [__bf_shf(INT_CARD_DET)] = 4, [__bf_shf(INT_MSATA_IND)] = 5, [__bf_shf(INT_USB30_OVC)] = 6, diff --git a/drivers/platform/cznic/turris-omnia-mcu-trng.c b/drivers/platform/cznic/turris-omnia-mcu-trng.c new file mode 100644 index 000000000000..b85550dea4ad --- /dev/null +++ b/drivers/platform/cznic/turris-omnia-mcu-trng.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * CZ.NIC's Turris Omnia MCU TRNG driver + * + * 2024 by Marek BehĂșn + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "turris-omnia-mcu.h" + +#define CMD_TRNG_MAX_ENTROPY_LEN 64 + +static irqreturn_t omnia_trng_irq_handler(int irq, void *dev_id) +{ + struct omnia_mcu *mcu = dev_id; + + complete(&mcu->trng_completion); + + return IRQ_HANDLED; +} + +static int omnia_trng_read(struct hwrng *rng, void *data, size_t max, bool wait) +{ + struct omnia_mcu *mcu = (struct omnia_mcu *)rng->priv; + u8 reply[1 + CMD_TRNG_MAX_ENTROPY_LEN]; + int err, bytes; + + if (!wait && !completion_done(&mcu->trng_completion)) + return 0; + + do { + if (wait_for_completion_interruptible(&mcu->trng_completion)) + return -EINTR; + + err = omnia_cmd_read(mcu->client, CMD_TRNG_COLLECT_ENTROPY, + reply, sizeof(reply)); + if (err) + return err; + + bytes = min3(reply[0], max, CMD_TRNG_MAX_ENTROPY_LEN); + } while (wait && !bytes); + + memcpy(data, &reply[1], bytes); + + return bytes; +} + +int omnia_mcu_register_trng(struct omnia_mcu *mcu) +{ + struct device *dev = &mcu->client->dev; + u8 irq_idx, dummy; + int irq, err; + + if (!(mcu->features & FEAT_TRNG)) + return 0; + + irq_idx = omnia_int_to_gpio_idx[__bf_shf(INT_TRNG)]; + irq = gpiod_to_irq(gpiochip_get_desc(&mcu->gc, irq_idx)); + if (irq < 0) + return dev_err_probe(dev, irq, "Cannot get TRNG IRQ\n"); + + /* + * If someone else cleared the TRNG interrupt but did not read the + * entropy, a new interrupt won't be generated, and entropy collection + * will be stuck. Ensure an interrupt will be generated by executing + * the collect entropy command (and discarding the result). + */ + err = omnia_cmd_read(mcu->client, CMD_TRNG_COLLECT_ENTROPY, &dummy, 1); + if (err) + return err; + + init_completion(&mcu->trng_completion); + + err = devm_request_threaded_irq(dev, irq, NULL, omnia_trng_irq_handler, + IRQF_ONESHOT, "turris-omnia-mcu-trng", + mcu); + if (err) + return dev_err_probe(dev, err, "Cannot request TRNG IRQ\n"); + + mcu->trng.name = "turris-omnia-mcu-trng"; + mcu->trng.read = omnia_trng_read; + mcu->trng.priv = (unsigned long)mcu; + + err = devm_hwrng_register(dev, &mcu->trng); + if (err) + return dev_err_probe(dev, err, "Cannot register TRNG\n"); + + return 0; +} diff --git a/drivers/platform/cznic/turris-omnia-mcu.h b/drivers/platform/cznic/turris-omnia-mcu.h index 1838cb3d636e..e0cf10f8c32e 100644 --- a/drivers/platform/cznic/turris-omnia-mcu.h +++ b/drivers/platform/cznic/turris-omnia-mcu.h @@ -9,7 +9,9 @@ #define __TURRIS_OMNIA_MCU_H #include +#include #include +#include #include #include #include @@ -45,6 +47,10 @@ struct omnia_mcu { /* MCU watchdog */ struct watchdog_device wdt; + + /* true random number generator */ + struct hwrng trng; + struct completion trng_completion; }; int omnia_cmd_write_read(const struct i2c_client *client, @@ -147,11 +153,13 @@ static inline int omnia_cmd_read_u8(const struct i2c_client *client, u8 cmd) return err ?: reply; } +extern const u8 omnia_int_to_gpio_idx[32]; extern const struct attribute_group omnia_mcu_gpio_group; extern const struct attribute_group omnia_mcu_poweroff_group; int omnia_mcu_register_gpiochip(struct omnia_mcu *mcu); int omnia_mcu_register_sys_off_and_wakeup(struct omnia_mcu *mcu); +int omnia_mcu_register_trng(struct omnia_mcu *mcu); int omnia_mcu_register_watchdog(struct omnia_mcu *mcu); #endif /* __TURRIS_OMNIA_MCU_H */ -- 2.43.2