Commit f1bb2393 authored by Azhar Shaikh's avatar Azhar Shaikh Committed by Greg Kroah-Hartman

tpm_tis: Move ilb_base_addr to tpm_tis_data

commit c382babc upstream.

Move static variable ilb_base_addr to tpm_tis_data.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarAzhar Shaikh <azhar.shaikh@intel.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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9131a1b3
...@@ -133,33 +133,24 @@ static int check_acpi_tpm2(struct device *dev) ...@@ -133,33 +133,24 @@ static int check_acpi_tpm2(struct device *dev)
#endif #endif
#ifdef CONFIG_X86 #ifdef CONFIG_X86
#define INTEL_LEGACY_BLK_BASE_ADDR 0xFED08000 #define LPC_CNTRL_OFFSET 0x84
#define ILB_REMAP_SIZE 0x100 #define LPC_CLKRUN_EN (1 << 2)
#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);
}
/** /**
* tpm_platform_begin_xfer() - clear LPC CLKRUN_EN i.e. clocks will be running * 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; u32 clkrun_val;
if (!is_bsw()) if (!is_bsw())
return; return;
clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET); clkrun_val = ioread32(data->ilb_base_addr + LPC_CNTRL_OFFSET);
/* Disable LPC CLKRUN# */ /* Disable LPC CLKRUN# */
clkrun_val &= ~LPC_CLKRUN_EN; 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 * Write any random value on port 0x80 which is on LPC, to make
...@@ -172,18 +163,18 @@ static void tpm_platform_begin_xfer(void) ...@@ -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 * 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; u32 clkrun_val;
if (!is_bsw()) if (!is_bsw())
return; return;
clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET); clkrun_val = ioread32(data->ilb_base_addr + LPC_CNTRL_OFFSET);
/* Enable LPC CLKRUN# */ /* Enable LPC CLKRUN# */
clkrun_val |= LPC_CLKRUN_EN; 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 * Write any random value on port 0x80 which is on LPC, to make
...@@ -193,16 +184,11 @@ static void tpm_platform_end_xfer(void) ...@@ -193,16 +184,11 @@ static void tpm_platform_end_xfer(void)
} }
#else #else
static inline bool is_bsw(void) static void tpm_platform_begin_xfer(struct tpm_tis_data *data)
{
return false;
}
static void tpm_platform_begin_xfer(void)
{ {
} }
static void tpm_platform_end_xfer(void) static void tpm_platform_end_xfer(struct tpm_tis_data *data)
{ {
} }
#endif #endif
...@@ -212,12 +198,12 @@ static int tpm_tcg_read_bytes(struct tpm_tis_data *data, u32 addr, u16 len, ...@@ -212,12 +198,12 @@ 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);
tpm_platform_begin_xfer(); tpm_platform_begin_xfer(data);
while (len--) while (len--)
*result++ = ioread8(phy->iobase + addr); *result++ = ioread8(phy->iobase + addr);
tpm_platform_end_xfer(); tpm_platform_end_xfer(data);
return 0; return 0;
} }
...@@ -227,12 +213,12 @@ static int tpm_tcg_write_bytes(struct tpm_tis_data *data, u32 addr, u16 len, ...@@ -227,12 +213,12 @@ 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);
tpm_platform_begin_xfer(); tpm_platform_begin_xfer(data);
while (len--) while (len--)
iowrite8(*value++, phy->iobase + addr); iowrite8(*value++, phy->iobase + addr);
tpm_platform_end_xfer(); tpm_platform_end_xfer(data);
return 0; return 0;
} }
...@@ -241,11 +227,11 @@ static int tpm_tcg_read16(struct tpm_tis_data *data, u32 addr, u16 *result) ...@@ -241,11 +227,11 @@ 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);
tpm_platform_begin_xfer(); tpm_platform_begin_xfer(data);
*result = ioread16(phy->iobase + addr); *result = ioread16(phy->iobase + addr);
tpm_platform_end_xfer(); tpm_platform_end_xfer(data);
return 0; return 0;
} }
...@@ -254,11 +240,11 @@ static int tpm_tcg_read32(struct tpm_tis_data *data, u32 addr, u32 *result) ...@@ -254,11 +240,11 @@ 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);
tpm_platform_begin_xfer(); tpm_platform_begin_xfer(data);
*result = ioread32(phy->iobase + addr); *result = ioread32(phy->iobase + addr);
tpm_platform_end_xfer(); tpm_platform_end_xfer(data);
return 0; return 0;
} }
...@@ -267,11 +253,11 @@ static int tpm_tcg_write32(struct tpm_tis_data *data, u32 addr, u32 value) ...@@ -267,11 +253,11 @@ 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);
tpm_platform_begin_xfer(); tpm_platform_begin_xfer(data);
iowrite32(value, phy->iobase + addr); iowrite32(value, phy->iobase + addr);
tpm_platform_end_xfer(); tpm_platform_end_xfer(data);
return 0; return 0;
} }
...@@ -350,9 +336,13 @@ MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl); ...@@ -350,9 +336,13 @@ MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
static void tpm_tis_pnp_remove(struct pnp_dev *dev) static void tpm_tis_pnp_remove(struct pnp_dev *dev)
{ {
struct tpm_chip *chip = pnp_get_drvdata(dev); struct tpm_chip *chip = pnp_get_drvdata(dev);
struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
tpm_chip_unregister(chip); tpm_chip_unregister(chip);
tpm_tis_remove(chip); tpm_tis_remove(chip);
if (is_bsw())
iounmap(priv->ilb_base_addr);
} }
static struct pnp_driver tis_pnp_driver = { static struct pnp_driver tis_pnp_driver = {
...@@ -399,10 +389,14 @@ static int tpm_tis_plat_probe(struct platform_device *pdev) ...@@ -399,10 +389,14 @@ static int tpm_tis_plat_probe(struct platform_device *pdev)
static int tpm_tis_plat_remove(struct platform_device *pdev) static int tpm_tis_plat_remove(struct platform_device *pdev)
{ {
struct tpm_chip *chip = dev_get_drvdata(&pdev->dev); struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
struct tpm_tis_data *priv = dev_get_drvdata(&chip->dev);
tpm_chip_unregister(chip); tpm_chip_unregister(chip);
tpm_tis_remove(chip); tpm_tis_remove(chip);
if (is_bsw())
iounmap(priv->ilb_base_addr);
return 0; return 0;
} }
...@@ -460,11 +454,6 @@ static int __init init_tis(void) ...@@ -460,11 +454,6 @@ static int __init init_tis(void)
if (rc) if (rc)
goto err_force; 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); rc = platform_driver_register(&tis_drv);
if (rc) if (rc)
goto err_platform; goto err_platform;
...@@ -483,10 +472,6 @@ static int __init init_tis(void) ...@@ -483,10 +472,6 @@ static int __init init_tis(void)
err_platform: err_platform:
if (force_pdev) if (force_pdev)
platform_device_unregister(force_pdev); platform_device_unregister(force_pdev);
#ifdef CONFIG_X86
if (is_bsw())
iounmap(ilb_base_addr);
#endif
err_force: err_force:
return rc; return rc;
} }
...@@ -496,10 +481,6 @@ static void __exit cleanup_tis(void) ...@@ -496,10 +481,6 @@ static void __exit cleanup_tis(void)
pnp_unregister_driver(&tis_pnp_driver); pnp_unregister_driver(&tis_pnp_driver);
platform_driver_unregister(&tis_drv); platform_driver_unregister(&tis_drv);
#ifdef CONFIG_X86
if (is_bsw())
iounmap(ilb_base_addr);
#endif
if (force_pdev) if (force_pdev)
platform_device_unregister(force_pdev); platform_device_unregister(force_pdev);
} }
......
...@@ -701,6 +701,13 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, ...@@ -701,6 +701,13 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
priv->phy_ops = phy_ops; priv->phy_ops = phy_ops;
dev_set_drvdata(&chip->dev, priv); 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) { if (wait_startup(chip, 0) != 0) {
rc = -ENODEV; rc = -ENODEV;
goto out_err; goto out_err;
...@@ -791,9 +798,16 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, ...@@ -791,9 +798,16 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
} }
} }
return tpm_chip_register(chip); rc = tpm_chip_register(chip);
if (rc && is_bsw())
iounmap(priv->ilb_base_addr);
return rc;
out_err: out_err:
tpm_tis_remove(chip); tpm_tis_remove(chip);
if (is_bsw())
iounmap(priv->ilb_base_addr);
return rc; return rc;
} }
EXPORT_SYMBOL_GPL(tpm_tis_core_init); EXPORT_SYMBOL_GPL(tpm_tis_core_init);
......
...@@ -79,6 +79,9 @@ enum tis_defaults { ...@@ -79,6 +79,9 @@ enum tis_defaults {
#define TPM_DID_VID(l) (0x0F00 | ((l) << 12)) #define TPM_DID_VID(l) (0x0F00 | ((l) << 12))
#define TPM_RID(l) (0x0F04 | ((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 { enum tpm_tis_flags {
TPM_TIS_ITPM_WORKAROUND = BIT(0), TPM_TIS_ITPM_WORKAROUND = BIT(0),
}; };
...@@ -89,6 +92,7 @@ struct tpm_tis_data { ...@@ -89,6 +92,7 @@ struct tpm_tis_data {
int irq; int irq;
bool irq_tested; bool irq_tested;
unsigned int flags; unsigned int flags;
void __iomem *ilb_base_addr;
wait_queue_head_t int_queue; wait_queue_head_t int_queue;
wait_queue_head_t read_queue; wait_queue_head_t read_queue;
const struct tpm_tis_phy_ops *phy_ops; const struct tpm_tis_phy_ops *phy_ops;
...@@ -144,6 +148,15 @@ static inline int tpm_tis_write32(struct tpm_tis_data *data, u32 addr, ...@@ -144,6 +148,15 @@ static inline int tpm_tis_write32(struct tpm_tis_data *data, u32 addr,
return data->phy_ops->write32(data, addr, value); return 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); void tpm_tis_remove(struct tpm_chip *chip);
int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq, int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
const struct tpm_tis_phy_ops *phy_ops, const struct tpm_tis_phy_ops *phy_ops,
......
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