From patchwork Fri Nov 5 19:05:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilias Apalodimas X-Patchwork-Id: 516825 Delivered-To: patch@linaro.org Received: by 2002:ad5:5208:0:0:0:0:0 with SMTP id p8csp366215iml; Fri, 5 Nov 2021 12:05:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyIqunerGH2hU/dCxcQOdQIY80gz/qc4qFkFA3p56VGycyWCeaOwb0OwCZZl21BjMw1W+y X-Received: by 2002:a50:8e19:: with SMTP id 25mr59753227edw.47.1636139148502; Fri, 05 Nov 2021 12:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636139148; cv=none; d=google.com; s=arc-20160816; b=WGAMMxYgnpvSK910ni97bc8V695LS+Dpx7KlVpayPpYqyDwfeeeeEYdUtOT61holoD O4mwWn94dpNHhvxTgpP8yn9bs/Q5/mtF2udPF5lDWbXh3P2QapH97Zkp8xsaR3JhhmlA GUDR5U7pCDl5BQUDoe0jD+nmrsT24H5H27gBpzVNkF74aYEp4pyZHpKnMVPnZ+nmSNxK iXXkh/ByjpxEik23V7gD1+phVOOVtMIKYW33BWiac8xg/0sL8UtmQOV0xjTTduY8UmYZ S+9h3UZxJ08j5w5HhuF4aNEn+BRvmZwohBbRu0Y/fjO5UURzAxIuzLJMiyGTBqJvAY/J rHeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lDZ0zy1V7KWNHxWx++wyVtVUa/eg65HpknebUk+2Dr8=; b=fTWrtfXccA/7o/Q5vVp5sTnHMUOM80uDoMjqggziSWG2Ex0+U0CSm+RLuQXgg82joM SIni6tJdSt1sgx0AXBnH2xuNvRUDbHs9Zc++MuSzd5GPy61Pa9uo1ajBlNAUMh3ovSj+ OMpK2xv6XQl63Ze7TP87PBUFMNyVbj+jl4N4GQQKuQT+C9k/82BA2WEYPE1k6aYBqQd+ SXH8Asr9GLdqCq2BYKWZYCrHxx9ZXhWLTUnvx/AEP+vhqhBKW8PXV8bNSY8RkPgE+Lsu 25mHwXOpyaaBVQZ+8tovnh2Lx94EGpulHfyCx0ee1fcjxeOeEXqg+eAo3EBcBUjzss1Z g4cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o1UWt67V; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ga1si16832443ejc.20.2021.11.05.12.05.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 12:05:48 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o1UWt67V; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A053783742; Fri, 5 Nov 2021 20:05:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="o1UWt67V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DB4898371D; Fri, 5 Nov 2021 20:05:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 302D083701 for ; Fri, 5 Nov 2021 20:05:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-wm1-x32e.google.com with SMTP id f7-20020a1c1f07000000b0032ee11917ceso7143462wmf.0 for ; Fri, 05 Nov 2021 12:05:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lDZ0zy1V7KWNHxWx++wyVtVUa/eg65HpknebUk+2Dr8=; b=o1UWt67VATVMV7DEIoUVh7/F0WUDQzN+lKBYLIlw7b805JQIVOVxHIC7p5LCXR6sVk PhlpdMY1Nx7jkc5gf6+xhj9ZSSoVz/K4QOUZmGdNz9hwn+2LYAVjjbuqJFGMW53t+Nja hSdQwvGBnAhxcgmusESKaKE0UuSeJeGiiK8MkASuQNxH8qHlngowcDeX6wzb7HuH19dB tqKQbcOCCk6cU4sFQbk8ZYZ6KlfGF9CkNuZd2JXs1ZXpYugsrszTjKrq+2SFwy46vCX2 WFYNlF8JVw8AzDJmRN+k5/FTMURhOncy/jKe0bFBawppxaeGNj0zwTGkvsDDS2CqTP+B 1fAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lDZ0zy1V7KWNHxWx++wyVtVUa/eg65HpknebUk+2Dr8=; b=BI4blJCxG126vQ774MTexPt8R/C7oxeWfo6ghkTSr/SfF9ZKd+EmBiSewS1oye00X/ nojUFThv+6+dNFya42VFG3Lie+kbpg89h0BAhmWzHZGilm4+ToQjUwZaNKPyAIHONP5R 8767kyct2q9WzSfMHiy/3UG7+AOQ/enyyyfnb+QAWT5H/C2JN88FcHL38AHAcYCuCcx6 41j0YBed3ijuJ0IdSdttghl3S0wt0cOzqcuNuRQw9XgIkUCnV5gEwPqzZdU6Ue5D6PaY /5TDnpkJ6b7bQ4YtYy4EG8MlEbFqxoVljr6uMiM+VkU1fXXdCWXWJG1CYmQmJ108Of/J c4eg== X-Gm-Message-State: AOAM530vIQMShtybDTGhcGIlByt/EOU3R8yxbU2BUP4YUWlvurrNX2vw g0Iy20xAQZ42vnh/LeqxCuzvlmRvaNnIcQ== X-Received: by 2002:a1c:7c19:: with SMTP id x25mr33058911wmc.42.1636139124137; Fri, 05 Nov 2021 12:05:24 -0700 (PDT) Received: from apalos.home ([2a02:587:4682:26e0:2e56:dcff:fe9a:8f06]) by smtp.gmail.com with ESMTPSA id m125sm11832350wmm.39.2021.11.05.12.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Nov 2021 12:05:23 -0700 (PDT) From: Ilias Apalodimas To: u-boot@lists.denx.de Cc: trini@konsulko.com, Ilias Apalodimas , Rick Chen , Sean Anderson , Simon Glass , Heinrich Schuchardt , Masahisa Kojima Subject: [PATCH 2/6 v5] tpm2: Add a TPMv2 MMIO TIS driver Date: Fri, 5 Nov 2021 21:05:12 +0200 Message-Id: <20211105190517.233079-3-ilias.apalodimas@linaro.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211105190517.233079-1-ilias.apalodimas@linaro.org> References: <20211105190517.233079-1-ilias.apalodimas@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Add support for devices that expose a TPMv2 though MMIO. Apart from those devices, we can use the driver in our QEMU setups and test TPM related code which is difficult to achieve using the sandbox driver (e.g test the EFI TCG2 protocol). It's worth noting that a previous patch added TPMv2 TIS core functions, which the current driver is consuming. Signed-off-by: Ilias Apalodimas --- drivers/tpm/Kconfig | 9 +++ drivers/tpm/Makefile | 1 + drivers/tpm/tpm2_tis_mmio.c | 152 ++++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 drivers/tpm/tpm2_tis_mmio.c -- 2.33.1 diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig index 9eebab5cfd90..406ee8716e1e 100644 --- a/drivers/tpm/Kconfig +++ b/drivers/tpm/Kconfig @@ -161,6 +161,15 @@ config TPM2_FTPM_TEE help This driver supports firmware TPM running in TEE. +config TPM2_MMIO + bool "MMIO based TPM2 Interface" + depends on TPM_V2 + help + This driver supports firmware TPM2.0 MMIO interface. + The usual TPM operations and the 'tpm' command can be used to talk + to the device using the standard TPM Interface Specification (TIS) + protocol. + endif # TPM_V2 endmenu diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile index c65be5267002..494aa5a46d30 100644 --- a/drivers/tpm/Makefile +++ b/drivers/tpm/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_$(SPL_TPL_)TPM2_CR50_I2C) += cr50_i2c.o obj-$(CONFIG_TPM2_TIS_SANDBOX) += tpm2_tis_sandbox.o sandbox_common.o obj-$(CONFIG_TPM2_TIS_SPI) += tpm2_tis_spi.o obj-$(CONFIG_TPM2_FTPM_TEE) += tpm2_ftpm_tee.o +obj-$(CONFIG_TPM2_MMIO) += tpm2_tis_core.o tpm2_tis_mmio.o diff --git a/drivers/tpm/tpm2_tis_mmio.c b/drivers/tpm/tpm2_tis_mmio.c new file mode 100644 index 000000000000..223000c5cd8d --- /dev/null +++ b/drivers/tpm/tpm2_tis_mmio.c @@ -0,0 +1,152 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * driver for mmio TCG/TIS TPM (trusted platform module). + * + * Specifications at www.trustedcomputinggroup.org + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "tpm_tis.h" +#include "tpm_internal.h" + +/** + * struct tpm_tis_chip_data - Information about an MMIO TPM + * @pcr_count: Number of PCR per bank + * @pcr_select_min: Minimum size in bytes of the pcrSelect array + * @iobase: Base address + */ +struct tpm_tis_chip_data { + unsigned int pcr_count; + unsigned int pcr_select_min; + void __iomem *iobase; +}; + +static int mmio_read_bytes(struct udevice *dev, u32 addr, u16 len, + u8 *result) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev); + + while (len--) + *result++ = ioread8(drv_data->iobase + addr); + return 0; +} + +static int mmio_write_bytes(struct udevice *dev, u32 addr, u16 len, + const u8 *value) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev); + + while (len--) + iowrite8(*value++, drv_data->iobase + addr); + return 0; +} + +static int mmio_read32(struct udevice *dev, u32 addr, u32 *result) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev); + + *result = ioread32(drv_data->iobase + addr); + return 0; +} + +static int mmio_write32(struct udevice *dev, u32 addr, u32 value) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev); + + iowrite32(value, drv_data->iobase + addr); + return 0; +} + +static struct tpm_tis_phy_ops phy_ops = { + .read_bytes = mmio_read_bytes, + .write_bytes = mmio_write_bytes, + .read32 = mmio_read32, + .write32 = mmio_write32, +}; + +static int tpm_tis_probe(struct udevice *dev) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev); + struct tpm_chip_priv *priv = dev_get_uclass_priv(dev); + int ret = 0; + fdt_addr_t ioaddr; + u64 sz; + + ioaddr = dev_read_addr(dev); + if (ioaddr == FDT_ADDR_T_NONE) + return log_msg_ret("ioaddr", -EINVAL); + + ret = dev_read_u64(dev, "reg", &sz); + if (ret) + return -EINVAL; + + drv_data->iobase = ioremap(ioaddr, sz); + log_debug("Remapped TPM2 base: 0x%llx size: 0x%llx\n", ioaddr, sz); + tpm_tis_ops_register(dev, &phy_ops); + ret = tpm_tis_init(dev); + if (ret) + goto iounmap; + + priv->pcr_count = drv_data->pcr_count; + priv->pcr_select_min = drv_data->pcr_select_min; + /* + * Although the driver probably works with a TPMv1 our Kconfig + * limits the driver to TPMv2 only + */ + priv->version = TPM_V2; + + return ret; +iounmap: + iounmap(drv_data->iobase); + return -EINVAL; +} + +static int tpm_tis_remove(struct udevice *dev) +{ + struct tpm_tis_chip_data *drv_data = (void *)dev_get_driver_data(dev); + + iounmap(drv_data->iobase); + return tpm_tis_cleanup(dev); +} + +static const struct tpm_ops tpm_tis_ops = { + .open = tpm_tis_open, + .close = tpm_tis_close, + .get_desc = tpm_tis_get_desc, + .send = tpm_tis_send, + .recv = tpm_tis_recv, + .cleanup = tpm_tis_cleanup, +}; + +static const struct tpm_tis_chip_data tpm_tis_std_chip_data = { + .pcr_count = 24, + .pcr_select_min = 3, +}; + +static const struct udevice_id tpm_tis_ids[] = { + { + .compatible = "tcg,tpm-tis-mmio", + .data = (ulong)&tpm_tis_std_chip_data, + }, + { } +}; + +U_BOOT_DRIVER(tpm_tis_mmio) = { + .name = "tpm_tis_mmio", + .id = UCLASS_TPM, + .of_match = tpm_tis_ids, + .ops = &tpm_tis_ops, + .probe = tpm_tis_probe, + .remove = tpm_tis_remove, + .priv_auto = sizeof(struct tpm_chip), +};