Patch "tpm_tis: Move ilb_base_addr to tpm_tis_data" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
tpm_tis: Move ilb_base_addr to tpm_tis_data
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tpm_tis-move-ilb_base_addr-to-tpm_tis_data.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c382babccba2c82fe57f9e647f290fb7bf4d130dMon Sep 17 00:00:00 2001
From: Azhar Shaikh <[email protected]>
Date: Fri, 22 Dec 2017 12:13:43 -0800
Subject: tpm_tis: Move ilb_base_addr to tpm_tis_data
From: Azhar Shaikh <[email protected]>
commit c382babccba2c82fe57f9e647f290fb7bf4d130d upstream.
Move static variable ilb_base_addr to tpm_tis_data.
--- drivers/char/tpm/tpm_tis.c | 75 ++++++++++++++-------------------------- drivers/char/tpm/tpm_tis_core.c | 16 ++++++++ drivers/char/tpm/tpm_tis_core.h | 13 ++++++ 3 files changed, 56 insertions(+), 48 deletions(-)
drivers/char/tpm/tpm_tis.c +28 -47
@@ -133,33 +133,24 @@ static int check_acpi_tpm2(struct device#endif #ifdef CONFIG_X86 -#define INTEL_LEGACY_BLK_BASE_ADDR 0xFED08000 -#define ILB_REMAP_SIZE 0x100 -#define LPC_CNTRL_REG_OFFSET 0x84 -#define LPC_CLKRUN_EN (1 << 2) - -static void __iomem *ilb_base_addr; - -static inline bool is_bsw (void ) -{ -return ((boot_cpu_data.x86_model ==INTEL_FAM6_ATOM_AIRMONT ) ?1 :0 ); -} +#define LPC_CNTRL_OFFSET 0x84 +#define LPC_CLKRUN_EN (1 << 2)/** * tpm_platform_begin_xfer() - clear LPC CLKRUN_EN i.e. clocks will be running */ -static void tpm_platform_begin_xfer (void ) +static void tpm_platform_begin_xfer (struct tpm_tis_data *data) {u32 clkrun_val;if (!is_bsw ())return ; - clkrun_val =ioread32 (ilb_base_addr +LPC_CNTRL_REG_OFFSET ); + clkrun_val =ioread32 (data->ilb_base_addr +LPC_CNTRL_OFFSET );/* Disable LPC CLKRUN# */ clkrun_val &= ~LPC_CLKRUN_EN ; -iowrite32 (clkrun_val, ilb_base_addr +LPC_CNTRL_REG_OFFSET ); +iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET );/* * Write any random value on port 0x80 which is on LPC, to make
@@ -172,18 +163,18 @@ static void tpm_platform_begin_xfer(void/** * tpm_platform_end_xfer() - set LPC CLKRUN_EN i.e. clocks can be turned off */ -static void tpm_platform_end_xfer (void ) +static void tpm_platform_end_xfer (struct tpm_tis_data *data) {u32 clkrun_val;if (!is_bsw ())return ; - clkrun_val =ioread32 (ilb_base_addr +LPC_CNTRL_REG_OFFSET ); + clkrun_val =ioread32 (data->ilb_base_addr +LPC_CNTRL_OFFSET );/* Enable LPC CLKRUN# */ clkrun_val |=LPC_CLKRUN_EN ; -iowrite32 (clkrun_val, ilb_base_addr +LPC_CNTRL_REG_OFFSET ); +iowrite32 (clkrun_val, data->ilb_base_addr +LPC_CNTRL_OFFSET );/* * Write any random value on port 0x80 which is on LPC, to make
@@ -193,16 +184,11 @@ static void tpm_platform_end_xfer(void) }#else -static inline bool is_bsw (void ) -{ -return false; -} - -static void tpm_platform_begin_xfer (void ) +static void tpm_platform_begin_xfer (struct tpm_tis_data *data) { } -static void tpm_platform_end_xfer (void ) +static void tpm_platform_end_xfer (struct tpm_tis_data *data) { }#endif
@@ -212,12 +198,12 @@ static int tpm_tcg_read_bytes(struct tpm {struct tpm_tis_tcg_phy *phy =to_tpm_tis_tcg_phy (data); -tpm_platform_begin_xfer (); +tpm_platform_begin_xfer (data);while (len--) *result++ =ioread8 (phy->iobase + addr); -tpm_platform_end_xfer (); +tpm_platform_end_xfer (data);return 0 ; }
@@ -227,12 +213,12 @@ static int tpm_tcg_write_bytes(struct tp {struct tpm_tis_tcg_phy *phy =to_tpm_tis_tcg_phy (data); -tpm_platform_begin_xfer (); +tpm_platform_begin_xfer (data);while (len--)iowrite8 (*value++, phy->iobase + addr); -tpm_platform_end_xfer (); +tpm_platform_end_xfer (data);return 0 ; }
@@ -241,11 +227,11 @@ static int tpm_tcg_read16(struct tpm_tis {struct tpm_tis_tcg_phy *phy =to_tpm_tis_tcg_phy (data); -tpm_platform_begin_xfer (); +tpm_platform_begin_xfer (data); *result =ioread16 (phy->iobase + addr); -tpm_platform_end_xfer (); +tpm_platform_end_xfer (data);return 0 ; }
@@ -254,11 +240,11 @@ static int tpm_tcg_read32(struct tpm_tis {struct tpm_tis_tcg_phy *phy =to_tpm_tis_tcg_phy (data); -tpm_platform_begin_xfer (); +tpm_platform_begin_xfer (data); *result =ioread32 (phy->iobase + addr); -tpm_platform_end_xfer (); +tpm_platform_end_xfer (data);return 0 ; }
@@ -267,11 +253,11 @@ static int tpm_tcg_write32(struct tpm_ti {struct tpm_tis_tcg_phy *phy =to_tpm_tis_tcg_phy (data); -tpm_platform_begin_xfer (); +tpm_platform_begin_xfer (data);iowrite32 (value, phy->iobase + addr); -tpm_platform_end_xfer (); +tpm_platform_end_xfer (data);return 0 ; }
@@ -350,9 +336,13 @@ MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);static void tpm_tis_pnp_remove (struct pnp_dev *dev) {struct tpm_chip *chip =pnp_get_drvdata (dev); +struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);tpm_chip_unregister (chip);tpm_tis_remove (chip); +if (is_bsw ()) +iounmap (priv->ilb_base_addr); + }static struct pnp_driver tis_pnp_driver = {
@@ -399,10 +389,14 @@ static int tpm_tis_plat_probe(struct plastatic int tpm_tis_plat_remove (struct platform_device *pdev) {struct tpm_chip *chip =dev_get_drvdata (&pdev->dev); +struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);tpm_chip_unregister (chip);tpm_tis_remove (chip); +if (is_bsw ()) +iounmap (priv->ilb_base_addr); +return 0 ; }
@@ -460,11 +454,6 @@ static int __init init_tis(void)if (rc) goto err_force; -#ifdef CONFIG_X86 -if (is_bsw ()) - ilb_base_addr =ioremap (INTEL_LEGACY_BLK_BASE_ADDR , -ILB_REMAP_SIZE ); -#endif rc =platform_driver_register (&tis_drv);if (rc) goto err_platform;
@@ -483,10 +472,6 @@ err_pnp: err_platform:if (force_pdev)platform_device_unregister (force_pdev); -#ifdef CONFIG_X86 -if (is_bsw ()) -iounmap (ilb_base_addr); -#endif err_force:return rc; }
@@ -496,10 +481,6 @@ static void __exit cleanup_tis(void)pnp_unregister_driver (&tis_pnp_driver);platform_driver_unregister (&tis_drv); -#ifdef CONFIG_X86 -if (is_bsw ()) -iounmap (ilb_base_addr); -#endif if (force_pdev)platform_device_unregister (force_pdev); }
drivers/char/tpm/tpm_tis_core.c +15 -1
@@ -701,6 +701,13 @@ int tpm_tis_core_init(struct device *dev priv->phy_ops = phy_ops;dev_set_drvdata (&chip->dev, priv); +if (is_bsw ()) { + priv->ilb_base_addr =ioremap (INTEL_LEGACY_BLK_BASE_ADDR , +ILB_REMAP_SIZE ); +if (!priv->ilb_base_addr) +return -ENOMEM ; + } +if (wait_startup (chip,0 ) !=0 ) { rc = -ENODEV ; goto out_err;
@@ -791,9 +798,16 @@ int tpm_tis_core_init(struct device *dev } } -return tpm_chip_register (chip); + rc =tpm_chip_register (chip); +if (rc &&is_bsw ()) +iounmap (priv->ilb_base_addr); + +return rc; out_err:tpm_tis_remove (chip); +if (is_bsw ()) +iounmap (priv->ilb_base_addr); +return rc; }EXPORT_SYMBOL_GPL (tpm_tis_core_init);
drivers/char/tpm/tpm_tis_core.h +13 -0
@@ -79,6 +79,9 @@ enum tis_defaults {#define TPM_DID_VID (l) (0x0F00 | ((l) << 12))#define TPM_RID (l) (0x0F04 | ((l) << 12)) +#define INTEL_LEGACY_BLK_BASE_ADDR 0xFED08000 +#define ILB_REMAP_SIZE 0x100 +enum tpm_tis_flags {TPM_TIS_ITPM_WORKAROUND =BIT (0 ), };
@@ -89,6 +92,7 @@ struct tpm_tis_data {int irq;bool irq_tested;unsigned int flags; +void __iomem *ilb_base_addr;wait_queue_head_t int_queue;wait_queue_head_t read_queue;const struct tpm_tis_phy_ops *phy_ops;
@@ -144,6 +148,15 @@ static inline int tpm_tis_write32(structreturn data->phy_ops->write32 (data, addr, value); } +static inline bool is_bsw (void ) +{ +#ifdef CONFIG_X86 +return ((boot_cpu_data.x86_model ==INTEL_FAM6_ATOM_AIRMONT ) ?1 :0 ); +#else +return false; +#endif +} +void tpm_tis_remove (struct tpm_chip *chip); int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, const struct tpm_tis_phy_ops *phy_ops,
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/tpm_tis-move-ilb_base_addr-to-tpm_tis_data.patch queue-4.14/tpm-keep-clkrun-enabled-throughout-the-duration-of-transmit_cmd.patch