| From 764325add6c2ad1641199edde7b2995495fc2d7c Mon Sep 17 00:00:00 2001 |
| From: Javier Martinez Canillas <javierm@redhat.com> |
| Date: Mon, 25 Dec 2017 03:22:49 +0100 |
| Subject: tpm: delete the TPM_TIS_CLK_ENABLE flag |
| |
| From: Javier Martinez Canillas <javierm@redhat.com> |
| |
| commit 764325add6c2ad1641199edde7b2995495fc2d7c upstream. |
| |
| 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: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
| Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> |
| Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
| Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
| Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/char/tpm/tpm_tis.c | 15 --------------- |
| drivers/char/tpm/tpm_tis_core.c | 2 -- |
| drivers/char/tpm/tpm_tis_core.h | 1 - |
| 3 files changed, 18 deletions(-) |
| |
| --- a/drivers/char/tpm/tpm_tis.c |
| +++ b/drivers/char/tpm/tpm_tis.c |
| @@ -137,9 +137,6 @@ static int tpm_tcg_read_bytes(struct tpm |
| { |
| 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--) |
| *result++ = ioread8(phy->iobase + addr); |
| |
| @@ -151,9 +148,6 @@ static int tpm_tcg_write_bytes(struct tp |
| { |
| 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--) |
| iowrite8(*value++, phy->iobase + addr); |
| |
| @@ -164,9 +158,6 @@ static int tpm_tcg_read16(struct tpm_tis |
| { |
| 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); |
| |
| return 0; |
| @@ -176,9 +167,6 @@ static int tpm_tcg_read32(struct tpm_tis |
| { |
| 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); |
| |
| return 0; |
| @@ -188,9 +176,6 @@ static int tpm_tcg_write32(struct tpm_ti |
| { |
| 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); |
| |
| return 0; |
| --- a/drivers/char/tpm/tpm_tis_core.c |
| +++ b/drivers/char/tpm/tpm_tis_core.c |
| @@ -698,7 +698,6 @@ static void tpm_tis_clkrun_enable(struct |
| return; |
| |
| if (value) { |
| - data->flags |= TPM_TIS_CLK_ENABLE; |
| data->clkrun_enabled++; |
| if (data->clkrun_enabled > 1) |
| return; |
| @@ -729,7 +728,6 @@ static void tpm_tis_clkrun_enable(struct |
| * sure LPC clock is running before sending any TPM command. |
| */ |
| outb(0xCC, 0x80); |
| - data->flags &= ~TPM_TIS_CLK_ENABLE; |
| } |
| } |
| |
| --- a/drivers/char/tpm/tpm_tis_core.h |
| +++ b/drivers/char/tpm/tpm_tis_core.h |
| @@ -86,7 +86,6 @@ enum tis_defaults { |
| |
| enum tpm_tis_flags { |
| TPM_TIS_ITPM_WORKAROUND = BIT(0), |
| - TPM_TIS_CLK_ENABLE = BIT(1), |
| }; |
| |
| struct tpm_tis_data { |