Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Revamp the TPM driver
details: https://anonhg.NetBSD.org/src/rev/46acd198f49c
branches: trunk
changeset: 452215:46acd198f49c
user: maxv <maxv%NetBSD.org@localhost>
date: Sat Jun 22 12:57:40 2019 +0000
description:
Revamp the TPM driver
* Fix several bugs, and clean up.
* Drop the "legacy" interface, it relied on an undocumented global
variable that was never initialized. It likely had never been tested
either, so good riddance.
* Add support for TPM 2.0 chips via ACPI. For these we use the TIS1.2
interface, same as TPM 1.2.
* Provide an ioctl to fetch TPM information from the driver.
Tested on a Lenovo desktop with ACPI-TPM2.0, an HP laptop ACPI-TPM2.0, a
Dell laptop with ISA-TPM1.2.
diffstat:
sys/dev/acpi/tpm_acpi.c | 143 ++---
sys/dev/ic/tpm.c | 1079 +++++++++++++++-------------------------------
sys/dev/ic/tpmreg.h | 164 +++---
sys/dev/ic/tpmvar.h | 88 ++-
sys/dev/isa/tpm_isa.c | 53 +-
5 files changed, 583 insertions(+), 944 deletions(-)
diffs (truncated from 2096 to 300 lines):
diff -r d0453e26a390 -r 46acd198f49c sys/dev/acpi/tpm_acpi.c
--- a/sys/dev/acpi/tpm_acpi.c Sat Jun 22 12:45:55 2019 +0000
+++ b/sys/dev/acpi/tpm_acpi.c Sat Jun 22 12:57:40 2019 +0000
@@ -1,11 +1,11 @@
-/* $NetBSD: tpm_acpi.c,v 1.7 2018/12/09 11:12:58 jdolecek Exp $ */
+/* $NetBSD: tpm_acpi.c,v 1.8 2019/06/22 12:57:40 maxv Exp $ */
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
+/*
+ * Copyright (c) 2012, 2019 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
+ * by Christos Zoulas and Maxime Villard.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -28,31 +28,9 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
- * Copyright (c) 2008, 2009 Michael Shalayeff
- * Copyright (c) 2009, 2010 Hans-Jörg Höxer
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * ACPI attachment for the Infineon SLD 9630 TT 1.1 and SLB 9635 TT 1.2
- * trusted platform module. See www.trustedcomputinggroup.org
- */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.7 2018/12/09 11:12:58 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.8 2019/06/22 12:57:40 maxv Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -71,44 +49,48 @@
#include "ioconf.h"
-#define _COMPONENT ACPI_RESOURCE_COMPONENT
-ACPI_MODULE_NAME ("tpm_acpi")
+#define _COMPONENT ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME ("tpm_acpi")
static int tpm_acpi_match(device_t, cfdata_t, void *);
static void tpm_acpi_attach(device_t, device_t, void *);
-
CFATTACH_DECL_NEW(tpm_acpi, sizeof(struct tpm_softc), tpm_acpi_match,
tpm_acpi_attach, NULL, NULL);
/*
- * Supported device IDs
+ * Supported TPM 2.0 devices.
*/
-
-#ifdef notyet
-static const char * const tpm_acpi_ids[] = {
- "IFX0101",
- "IFX0102",
+static const char * const tpm2_acpi_ids[] = {
+ "MSFT0101",
NULL
};
-#endif
static int
tpm_acpi_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
+ ACPI_TABLE_TPM2 *tpm2;
+ ACPI_STATUS rv;
if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
return 0;
- /* There can be only one. */
+ /* We support only one TPM. */
if (tpm_cd.cd_devs && tpm_cd.cd_devs[0])
return 0;
-#ifdef notyet
- return acpi_match_hid(aa->aa_node->ad_devinfo, tpm_acpi_ids);
-#else
- return 0;
-#endif
+
+ if (!acpi_match_hid(aa->aa_node->ad_devinfo, tpm2_acpi_ids))
+ return 0;
+
+ /* Make sure it uses TIS, and not CRB. */
+ rv = AcpiGetTable(ACPI_SIG_TPM2, 1, (ACPI_TABLE_HEADER **)&tpm2);
+ if (ACPI_FAILURE(rv))
+ return 0;
+ if (tpm2->StartMethod != ACPI_TPM2_MEMORY_MAPPED)
+ return 0;
+
+ return 1;
}
static void
@@ -117,7 +99,6 @@
struct tpm_softc *sc = device_private(self);
struct acpi_attach_args *aa = aux;
struct acpi_resources res;
- struct acpi_io *io;
struct acpi_mem *mem;
struct acpi_irq *irq;
bus_addr_t base;
@@ -125,59 +106,43 @@
int rv, inum;
sc->sc_dev = self;
+ sc->sc_ver = TPM_2_0;
- /* Parse our resources */
- rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS", &res,
- &acpi_resource_parse_ops_default);
-
- if (ACPI_FAILURE(rv)) {
+ rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS", &res,
+ &acpi_resource_parse_ops_default);
+ if (ACPI_FAILURE(rv)) {
aprint_error_dev(sc->sc_dev, "cannot parse resources %d\n", rv);
- return;
+ return;
}
- io = acpi_res_io(&res, 0);
- if (io && tpm_legacy_probe(aa->aa_iot, io->ar_base)) {
- sc->sc_bt = aa->aa_iot;
- base = io->ar_base;
- size = io->ar_length;
- sc->sc_batm = aa->aa_iot;
- sc->sc_init = tpm_legacy_init;
- sc->sc_start = tpm_legacy_start;
- sc->sc_read = tpm_legacy_read;
- sc->sc_write = tpm_legacy_write;
- sc->sc_end = tpm_legacy_end;
- mem = NULL;
- } else {
- mem = acpi_res_mem(&res, 0);
- if (mem == NULL) {
- aprint_error_dev(sc->sc_dev, "cannot find mem\n");
- goto out;
- }
+ mem = acpi_res_mem(&res, 0);
+ if (mem == NULL) {
+ aprint_error_dev(sc->sc_dev, "cannot find mem\n");
+ goto out;
+ }
+ if (mem->ar_length != TPM_SPACE_SIZE) {
+ aprint_error_dev(sc->sc_dev,
+ "wrong size mem %"PRIu64" != %u\n",
+ (uint64_t)mem->ar_length, TPM_SPACE_SIZE);
+ goto out;
+ }
- if (mem->ar_length != TPM_SIZE) {
- aprint_error_dev(sc->sc_dev,
- "wrong size mem %"PRIu64" != %u\n",
- (uint64_t)mem->ar_length, TPM_SIZE);
- goto out;
- }
-
- base = mem->ar_base;
- size = mem->ar_length;
- sc->sc_bt = aa->aa_memt;
- sc->sc_init = tpm_tis12_init;
- sc->sc_start = tpm_tis12_start;
- sc->sc_read = tpm_tis12_read;
- sc->sc_write = tpm_tis12_write;
- sc->sc_end = tpm_tis12_end;
- }
+ base = mem->ar_base;
+ size = mem->ar_length;
+ sc->sc_bt = aa->aa_memt;
+ sc->sc_init = tpm_tis12_init;
+ sc->sc_start = tpm_tis12_start;
+ sc->sc_read = tpm_tis12_read;
+ sc->sc_write = tpm_tis12_write;
+ sc->sc_end = tpm_tis12_end;
if (bus_space_map(sc->sc_bt, base, size, 0, &sc->sc_bh)) {
aprint_error_dev(sc->sc_dev, "cannot map registers\n");
goto out;
}
- if (mem && !tpm_tis12_probe(sc->sc_bt, sc->sc_bh)) {
- aprint_error_dev(sc->sc_dev, "1.2 probe failed\n");
+ if (!tpm_tis12_probe(sc->sc_bt, sc->sc_bh)) {
+ aprint_error_dev(sc->sc_dev, "TIS1.2 probe failed\n");
goto out1;
}
@@ -187,7 +152,7 @@
else
inum = irq->ar_irq;
- if ((rv = (*sc->sc_init)(sc, inum, device_xname(sc->sc_dev))) != 0) {
+ if ((rv = (*sc->sc_init)(sc, inum)) != 0) {
aprint_error_dev(sc->sc_dev, "cannot init device %d\n", rv);
goto out1;
}
@@ -199,9 +164,9 @@
goto out1;
}
- if (!pmf_device_register(sc->sc_dev, tpm_suspend, tpm_resume))
- aprint_error_dev(sc->sc_dev, "Cannot set power mgmt handler\n");
+ acpi_resource_cleanup(&res);
return;
+
out1:
bus_space_unmap(sc->sc_bt, sc->sc_bh, size);
out:
diff -r d0453e26a390 -r 46acd198f49c sys/dev/ic/tpm.c
--- a/sys/dev/ic/tpm.c Sat Jun 22 12:45:55 2019 +0000
+++ b/sys/dev/ic/tpm.c Sat Jun 22 12:57:40 2019 +0000
@@ -1,7 +1,37 @@
-/* $NetBSD: tpm.c,v 1.12 2017/10/28 04:53:55 riastradh Exp $ */
+/* $NetBSD: tpm.c,v 1.13 2019/06/22 12:57:41 maxv Exp $ */
+
+/*
+ * Copyright (c) 2019 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Maxime Villard.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
/*
* Copyright (c) 2008, 2009 Michael Shalayeff
- * Copyright (c) 2009, 2010 Hans-Jörg Höxer
+ * Copyright (c) 2009, 2010 Hans-Joerg Hoexer
* All rights reserved.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -18,12 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.12 2017/10/28 04:53:55 riastradh Exp $");
-
-#if 0
-#define TPM_DEBUG
-#define aprint_debug_dev aprint_error_dev
-#endif
+__KERNEL_RCSID(0, "$NetBSD: tpm.c,v 1.13 2019/06/22 12:57:41 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,12 +65,23 @@
#include "ioconf.h"
-/* Set when enabling legacy interface in host bridge. */
-int tpm_enabled;
+#define TPM_BUFSIZ 1024
+#define TPM_HDRSIZE 10
+#define TPM_PARAM_SIZE 0x0001 /* that's a flag */
-const struct {
Home |
Main Index |
Thread Index |
Old Index