From: Azhar Shaikh <azhar.shaikh@intel.com>
To: jarkko.sakkinen@linux.intel.com, jgunthorpe@obsidianresearch.com,
tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Cc: linux-security-module@vger.kernel.org, azhar.shaikh@intel.com
Subject: [PATCH] tpm: Enable CLKRUN protocol for Braswell systems
Date: Thu, 1 Jun 2017 12:13:52 -0700 [thread overview]
Message-ID: <1496344432-76640-1-git-send-email-azhar.shaikh@intel.com> (raw)
To overcome a hardware limitation on Intel Braswell systems,
disable CLKRUN protocol during TPM transactions and re-enable
once the transaction is completed.
Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
---
drivers/char/tpm/tpm.h | 20 +++++++++++
drivers/char/tpm/tpm_tis.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 105 insertions(+)
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 4b4c8dee3096..98032a22317e 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -36,6 +36,10 @@
#include <linux/highmem.h>
#include <crypto/hash_info.h>
+#ifdef CONFIG_X86
+#include <asm/intel-family.h>
+#endif
+
enum tpm_const {
TPM_MINOR = 224, /* officially assigned */
TPM_BUFSIZE = 4096,
@@ -436,6 +440,22 @@ struct tpm_buf {
u8 *data;
};
+#define INTEL_LEGACY_BLK_BASE_ADDR 0xFED08000
+#define LPC_CNTRL_REG_OFFSET 0x84
+#define LPC_CLKRUN_EN (1 << 2)
+
+#ifdef CONFIG_X86
+static inline bool is_bsw(void)
+{
+ return ((boot_cpu_data.x86_model == INTEL_FAM6_ATOM_AIRMONT) ? 1 : 0);
+}
+#else
+static inline bool is_bsw(void)
+{
+ return false;
+}
+#endif
+
static inline int tpm_buf_init(struct tpm_buf *buf, u16 tag, u32 ordinal)
{
struct tpm_input_header *head;
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index c7e1384f1b08..25ead56382c0 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -89,13 +89,70 @@ static inline int is_itpm(struct acpi_device *dev)
}
#endif
+/**
+ * disable_lpc_clk_run() - clear LPC CLKRUN_EN i.e. clocks will be free running
+ */
+static void disable_lpc_clk_run(void)
+{
+ u32 clkrun_val;
+ void __iomem *ilb_base_addr = NULL;
+
+ ilb_base_addr = (void __iomem *)
+ kmap_atomic_pfn(INTEL_LEGACY_BLK_BASE_ADDR >> PAGE_SHIFT);
+
+ clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+
+ /* Disable LPC CLKRUN# */
+ clkrun_val &= ~LPC_CLKRUN_EN;
+ iowrite32(clkrun_val, ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+
+ kunmap_atomic(ilb_base_addr);
+ /*
+ * Write any random value on port 0x80 which is on LPC, to make
+ * sure LPC clock is running before sending any TPM command.
+ */
+ outb(0x80, 0xCC);
+}
+
+/**
+ * enable_lpc_clk_run() - set LPC CLKRUN_EN i.e. clocks can be turned off
+ */
+static void enable_lpc_clk_run(void)
+{
+ u32 clkrun_val;
+ void __iomem *ilb_base_addr = NULL;
+
+ ilb_base_addr = (void __iomem *)
+ kmap_atomic_pfn(INTEL_LEGACY_BLK_BASE_ADDR >> PAGE_SHIFT);
+
+ clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+
+ /* Enable LPC CLKRUN# */
+ clkrun_val |= LPC_CLKRUN_EN;
+ iowrite32(clkrun_val, ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+
+ kunmap_atomic(ilb_base_addr);
+ /*
+ * Write any random value on port 0x80 which is on LPC, to make
+ * sure LPC clock is running before sending any TPM command.
+ */
+ outb(0x80, 0xCC);
+}
+
static int tpm_tcg_read_bytes(struct tpm_tis_data *data, u32 addr, u16 len,
u8 *result)
{
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
+ if (is_bsw())
+ disable_lpc_clk_run();
+
while (len--)
*result++ = ioread8(phy->iobase + addr);
+
+ if (is_bsw())
+ enable_lpc_clk_run();
+
return 0;
}
@@ -104,8 +161,15 @@ static int tpm_tcg_write_bytes(struct tpm_tis_data *data, u32 addr, u16 len,
{
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
+ if (is_bsw())
+ disable_lpc_clk_run();
+
while (len--)
iowrite8(*value++, phy->iobase + addr);
+
+ if (is_bsw())
+ enable_lpc_clk_run();
+
return 0;
}
@@ -113,7 +177,14 @@ static int tpm_tcg_read16(struct tpm_tis_data *data, u32 addr, u16 *result)
{
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
+ if (is_bsw())
+ disable_lpc_clk_run();
+
*result = ioread16(phy->iobase + addr);
+
+ if (is_bsw())
+ enable_lpc_clk_run();
+
return 0;
}
@@ -121,7 +192,14 @@ static int tpm_tcg_read32(struct tpm_tis_data *data, u32 addr, u32 *result)
{
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
+ if (is_bsw())
+ disable_lpc_clk_run();
+
*result = ioread32(phy->iobase + addr);
+
+ if (is_bsw())
+ enable_lpc_clk_run();
+
return 0;
}
@@ -129,7 +207,14 @@ static int tpm_tcg_write32(struct tpm_tis_data *data, u32 addr, u32 value)
{
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
+ if (is_bsw())
+ disable_lpc_clk_run();
+
iowrite32(value, phy->iobase + addr);
+
+ if (is_bsw())
+ enable_lpc_clk_run();
+
return 0;
}
--
1.9.1
next reply other threads:[~2017-06-01 19:13 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-01 19:13 Azhar Shaikh [this message]
2017-06-01 23:56 ` [PATCH] tpm: Enable CLKRUN protocol for Braswell systems kbuild test robot
2017-06-02 2:04 ` [PATCH v2] " Azhar Shaikh
[not found] ` <1496369044-38234-1-git-send-email-azhar.shaikh-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2017-06-05 13:32 ` Jarkko Sakkinen
2017-06-05 18:42 ` Shaikh, Azhar
2017-06-06 17:13 ` Jarkko Sakkinen
2017-06-07 21:23 ` [PATCH v3] " Azhar Shaikh
2017-06-07 21:44 ` Alan Cox
2017-06-08 1:11 ` Shaikh, Azhar
2017-06-08 12:38 ` Jarkko Sakkinen
2017-06-08 18:22 ` Alan Cox
2017-06-08 18:39 ` Jason Gunthorpe
2017-06-08 18:50 ` Alan Cox
2017-06-08 19:27 ` Shaikh, Azhar
2017-06-10 11:06 ` Jarkko Sakkinen
2017-06-08 19:02 ` Shaikh, Azhar
2017-06-08 23:46 ` [PATCH v4] " Azhar Shaikh
2017-06-10 11:13 ` Jarkko Sakkinen
2017-06-10 16:35 ` Shaikh, Azhar
2017-06-12 7:50 ` Jarkko Sakkinen
2017-06-14 0:51 ` Shaikh, Azhar
2017-06-14 14:46 ` Jarkko Sakkinen
2017-06-14 17:17 ` Shaikh, Azhar
2017-06-14 19:39 ` Azhar Shaikh
2017-06-18 23:52 ` Jarkko Sakkinen
[not found] ` <1497829956.2552.10.camel-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-06-19 2:12 ` Shaikh, Azhar
2017-06-19 2:17 ` [PATCH v5] " Azhar Shaikh
2017-06-19 14:51 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1496344432-76640-1-git-send-email-azhar.shaikh@intel.com \
--to=azhar.shaikh@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=tpmdd-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).