Commit 764325ad authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Jarkko Sakkinen

tpm: delete the TPM_TIS_CLK_ENABLE flag

This flag is only used to warn if CLKRUN_EN wasn't disabled on Braswell
systems, but the only way this can happen is if the code is not correct.

So it's an unnecessary check that just makes the code harder to read.
Suggested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent 2463c4d0
...@@ -138,9 +138,6 @@ static int tpm_tcg_read_bytes(struct tpm_tis_data *data, u32 addr, u16 len, ...@@ -138,9 +138,6 @@ static int tpm_tcg_read_bytes(struct tpm_tis_data *data, u32 addr, u16 len,
{ {
struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data); struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
if (is_bsw() && !(data->flags & TPM_TIS_CLK_ENABLE))
WARN(1, "CLKRUN not enabled!\n");
while (len--) while (len--)
*result++ = ioread8(phy->iobase + addr); *result++ = ioread8(phy->iobase + addr);
...@@ -152,9 +149,6 @@ static int tpm_tcg_write_bytes(struct tpm_tis_data *data, u32 addr, u16 len, ...@@ -152,9 +149,6 @@ 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); struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
if (is_bsw() && !(data->flags & TPM_TIS_CLK_ENABLE))
WARN(1, "CLKRUN not enabled!\n");
while (len--) while (len--)
iowrite8(*value++, phy->iobase + addr); iowrite8(*value++, phy->iobase + addr);
...@@ -165,9 +159,6 @@ static int tpm_tcg_read16(struct tpm_tis_data *data, u32 addr, u16 *result) ...@@ -165,9 +159,6 @@ 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); struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
if (is_bsw() && !(data->flags & TPM_TIS_CLK_ENABLE))
WARN(1, "CLKRUN not enabled!\n");
*result = ioread16(phy->iobase + addr); *result = ioread16(phy->iobase + addr);
return 0; return 0;
...@@ -177,9 +168,6 @@ static int tpm_tcg_read32(struct tpm_tis_data *data, u32 addr, u32 *result) ...@@ -177,9 +168,6 @@ 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); struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
if (is_bsw() && !(data->flags & TPM_TIS_CLK_ENABLE))
WARN(1, "CLKRUN not enabled!\n");
*result = ioread32(phy->iobase + addr); *result = ioread32(phy->iobase + addr);
return 0; return 0;
...@@ -189,9 +177,6 @@ static int tpm_tcg_write32(struct tpm_tis_data *data, u32 addr, u32 value) ...@@ -189,9 +177,6 @@ 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); struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
if (is_bsw() && !(data->flags & TPM_TIS_CLK_ENABLE))
WARN(1, "CLKRUN not enabled!\n");
iowrite32(value, phy->iobase + addr); iowrite32(value, phy->iobase + addr);
return 0; return 0;
......
...@@ -763,7 +763,6 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value) ...@@ -763,7 +763,6 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value)
return; return;
if (value) { if (value) {
data->flags |= TPM_TIS_CLK_ENABLE;
data->clkrun_enabled++; data->clkrun_enabled++;
if (data->clkrun_enabled > 1) if (data->clkrun_enabled > 1)
return; return;
...@@ -794,7 +793,6 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value) ...@@ -794,7 +793,6 @@ static void tpm_tis_clkrun_enable(struct tpm_chip *chip, bool value)
* sure LPC clock is running before sending any TPM command. * sure LPC clock is running before sending any TPM command.
*/ */
outb(0xCC, 0x80); outb(0xCC, 0x80);
data->flags &= ~TPM_TIS_CLK_ENABLE;
} }
} }
......
...@@ -86,7 +86,6 @@ enum tis_defaults { ...@@ -86,7 +86,6 @@ enum tis_defaults {
enum tpm_tis_flags { enum tpm_tis_flags {
TPM_TIS_ITPM_WORKAROUND = BIT(0), TPM_TIS_ITPM_WORKAROUND = BIT(0),
TPM_TIS_CLK_ENABLE = BIT(1),
}; };
struct tpm_tis_data { struct tpm_tis_data {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment