summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Ching <chingcodes@google.com>2018-02-06 10:28:49 -0700
committerAaron Durbin <adurbin@chromium.org>2018-02-21 23:36:22 +0000
commit97ab880082505b4aa0d4b2a058e850bd3376d9b8 (patch)
treed099da762a2be578eac58592fdbc1ee5e49e413d
parent2269a3c328c335aa57d7094ca24a9d21ee6ade7d (diff)
downloadcoreboot-97ab880082505b4aa0d4b2a058e850bd3376d9b8.tar.xz
mainboard/google/kahlee: Add tis_plat_irq_status
For variants that have a cr50 tpm, this enables faster polling when interacting with the tpm. BUG=b:72838769 BRANCH=none TEST=verified on grunt that irq is used and not timeouts for tpm Change-Id: I5786d334b6c1cc70f4c7107c75b07a7e27ac4428 Signed-off-by: Chris Ching <chingcodes@chromium.org> Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/23626 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/mainboard/google/kahlee/bootblock/bootblock.c9
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/Makefile.inc6
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/include/baseboard/gpio.h3
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/tpm_tis.c23
-rw-r--r--src/mainboard/google/kahlee/variants/kahlee/include/variant/gpio.h3
5 files changed, 43 insertions, 1 deletions
diff --git a/src/mainboard/google/kahlee/bootblock/bootblock.c b/src/mainboard/google/kahlee/bootblock/bootblock.c
index 244abe051f..4a65d8f4fc 100644
--- a/src/mainboard/google/kahlee/bootblock/bootblock.c
+++ b/src/mainboard/google/kahlee/bootblock/bootblock.c
@@ -15,8 +15,10 @@
#include <baseboard/variants.h>
#include <bootblock_common.h>
+#include <soc/gpio.h>
#include <soc/southbridge.h>
#include <variant/ec.h>
+#include <variant/gpio.h>
void bootblock_mainboard_init(void)
{
@@ -30,4 +32,11 @@ void bootblock_mainboard_init(void)
/* Setup TPM decode before verstage */
sb_tpm_decode_spi();
+
+ /* Configure cr50 interrupt pin for use in polling tpm status */
+ if (IS_ENABLED(CONFIG_MAINBOARD_HAS_TPM_CR50)) {
+ const uint32_t flags = GPIO_EDGEL_TRIG | GPIO_ACTIVE_LOW |
+ GPIO_INT_STATUS_EN;
+ gpio_set_interrupt(H1_PCH_INT, flags);
+ }
}
diff --git a/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc
index fcaf365830..c4c2f9da26 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc
@@ -1,7 +1,7 @@
#
# This file is part of the coreboot project.
#
-# Copyright (C) 2017 Google, Inc.
+# Copyright (C) 2018 Google, LLC.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,7 +16,11 @@
bootblock-y += gpio.c
bootblock-y += OemCustomize.c
+verstage-y += tpm_tis.c
+
romstage-y += gpio.c
romstage-y += memory.c
+romstage-y += tpm_tis.c
ramstage-y += gpio.c
+ramstage-y += tpm_tis.c
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/gpio.h
index e237ce24fe..1e349b7c2e 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/gpio.h
@@ -24,6 +24,9 @@
# define MEM_CONFIG2 GPIO_131
# define MEM_CONFIG3 GPIO_132
+/* CR50 interrupt pin */
+#define H1_PCH_INT GPIO_9
+
/* SPI Write protect */
#define CROS_WP_GPIO GPIO_122
#define GPIO_EC_IN_RW GPIO_15
diff --git a/src/mainboard/google/kahlee/variants/baseboard/tpm_tis.c b/src/mainboard/google/kahlee/variants/baseboard/tpm_tis.c
new file mode 100644
index 0000000000..fe5e42c4ad
--- /dev/null
+++ b/src/mainboard/google/kahlee/variants/baseboard/tpm_tis.c
@@ -0,0 +1,23 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2018 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <security/tpm/tis.h>
+#include <soc/gpio.h>
+#include <variant/gpio.h>
+
+int tis_plat_irq_status(void)
+{
+ return gpio_interrupt_status(H1_PCH_INT);
+}
diff --git a/src/mainboard/google/kahlee/variants/kahlee/include/variant/gpio.h b/src/mainboard/google/kahlee/variants/kahlee/include/variant/gpio.h
index 21b14c58c9..26dd175eda 100644
--- a/src/mainboard/google/kahlee/variants/kahlee/include/variant/gpio.h
+++ b/src/mainboard/google/kahlee/variants/kahlee/include/variant/gpio.h
@@ -28,6 +28,9 @@
#define MEM_CONFIG2 0
#define MEM_CONFIG3 0
+/* CDX03 doesn't have a CR50 interrupt pin */
+#define H1_PCH_INT 0
+
/* SPI Write protect */
#define CROS_WP_GPIO GPIO_142
#define GPIO_EC_IN_RW GPIO_15