From: Azhar Shaikh <azhar.shaikh@intel.com>
To: jarkko.sakkinen@linux.intel.com, jgunthorpe@obsidianresearch.com,
peterhuewe@gmx.de
Cc: linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org, tpmdd-devel@lists.sourceforge.net,
azhar.shaikh@intel.com
Subject: [PATCH v4 2/2] tpm_tis: Move ilb_base_addr to tpm_tis_tcg_phy
Date: Tue, 21 Nov 2017 14:39:24 -0800 [thread overview]
Message-ID: <1511303964-56294-3-git-send-email-azhar.shaikh@intel.com> (raw)
In-Reply-To: <1511303964-56294-1-git-send-email-azhar.shaikh@intel.com>
Move the static variable ilb_base_addr to tpm_tis_tcg_phy.
Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
---
drivers/char/tpm/tpm_tis.c | 67 ++++++++++++++++++++++++++--------------------
1 file changed, 38 insertions(+), 29 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 76a7b64195c8..d87b37c5404b 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -46,6 +46,7 @@ struct tpm_info {
struct tpm_tis_tcg_phy {
struct tpm_tis_data priv;
void __iomem *iobase;
+ void __iomem *ilb_base_addr;
bool begin_xfer_done;
};
@@ -134,19 +135,22 @@ static int check_acpi_tpm2(struct device *dev)
}
#endif
+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
+}
+
#define INTEL_LEGACY_BLK_BASE_ADDR 0xFED08000
#define ILB_REMAP_SIZE 0x100
+
+#ifdef CONFIG_X86
#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
* @data: struct tpm_tis_data instance
@@ -160,11 +164,11 @@ static void tpm_platform_begin_xfer(struct tpm_tis_data *data)
phy->begin_xfer_done))
return;
- clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+ clkrun_val = ioread32(phy->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);
+ iowrite32(clkrun_val, phy->ilb_base_addr + LPC_CNTRL_REG_OFFSET);
/*
* Write any random value on port 0x80 which is on LPC, to make
@@ -185,15 +189,16 @@ static void tpm_platform_begin_xfer(struct tpm_tis_data *data)
static void tpm_platform_end_xfer(struct tpm_tis_data *data)
{
u32 clkrun_val;
+ struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
if (!is_bsw() || (data->flags & TPM_TIS_CLK_ENABLE))
return;
- clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+ clkrun_val = ioread32(phy->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);
+ iowrite32(clkrun_val, phy->ilb_base_addr + LPC_CNTRL_REG_OFFSET);
/*
* Write any random value on port 0x80 which is on LPC, to make
@@ -204,10 +209,6 @@ static void tpm_platform_end_xfer(struct tpm_tis_data *data)
}
#else
-static inline bool is_bsw(void)
-{
- return false;
-}
static void tpm_platform_begin_xfer(struct tpm_tis_data *data)
{
}
@@ -311,14 +312,25 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info)
if (IS_ERR(phy->iobase))
return PTR_ERR(phy->iobase);
+ if (is_bsw()) {
+ phy->ilb_base_addr = ioremap(INTEL_LEGACY_BLK_BASE_ADDR,
+ ILB_REMAP_SIZE);
+ if (!phy->ilb_base_addr)
+ return -ENOMEM;
+ }
+
if (interrupts)
irq = tpm_info->irq;
if (itpm || is_itpm(ACPI_COMPANION(dev)))
phy->priv.flags |= TPM_TIS_ITPM_WORKAROUND;
- return tpm_tis_core_init(dev, &phy->priv, irq, &tpm_tcg,
+ rc = tpm_tis_core_init(dev, &phy->priv, irq, &tpm_tcg,
ACPI_HANDLE(dev));
+ if (rc && is_bsw())
+ iounmap(phy->ilb_base_addr);
+
+ return rc;
}
static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
@@ -359,9 +371,14 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
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);
+ struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(priv);
tpm_chip_unregister(chip);
tpm_tis_remove(chip);
+
+ if (is_bsw())
+ iounmap(phy->ilb_base_addr);
}
static struct pnp_driver tis_pnp_driver = {
@@ -408,10 +425,15 @@ static int tpm_tis_plat_probe(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_tis_data *priv = dev_get_drvdata(&chip->dev);
+ struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(priv);
tpm_chip_unregister(chip);
tpm_tis_remove(chip);
+ if (is_bsw())
+ iounmap(phy->ilb_base_addr);
+
return 0;
}
@@ -469,11 +491,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;
@@ -492,10 +509,6 @@ static int __init init_tis(void)
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;
}
@@ -505,10 +518,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);
}
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: azhar.shaikh@intel.com (Azhar Shaikh)
To: linux-security-module@vger.kernel.org
Subject: [PATCH v4 2/2] tpm_tis: Move ilb_base_addr to tpm_tis_tcg_phy
Date: Tue, 21 Nov 2017 14:39:24 -0800 [thread overview]
Message-ID: <1511303964-56294-3-git-send-email-azhar.shaikh@intel.com> (raw)
In-Reply-To: <1511303964-56294-1-git-send-email-azhar.shaikh@intel.com>
Move the static variable ilb_base_addr to tpm_tis_tcg_phy.
Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
---
drivers/char/tpm/tpm_tis.c | 67 ++++++++++++++++++++++++++--------------------
1 file changed, 38 insertions(+), 29 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 76a7b64195c8..d87b37c5404b 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -46,6 +46,7 @@ struct tpm_info {
struct tpm_tis_tcg_phy {
struct tpm_tis_data priv;
void __iomem *iobase;
+ void __iomem *ilb_base_addr;
bool begin_xfer_done;
};
@@ -134,19 +135,22 @@ static int check_acpi_tpm2(struct device *dev)
}
#endif
+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
+}
+
#define INTEL_LEGACY_BLK_BASE_ADDR 0xFED08000
#define ILB_REMAP_SIZE 0x100
+
+#ifdef CONFIG_X86
#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
* @data: struct tpm_tis_data instance
@@ -160,11 +164,11 @@ static void tpm_platform_begin_xfer(struct tpm_tis_data *data)
phy->begin_xfer_done))
return;
- clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+ clkrun_val = ioread32(phy->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);
+ iowrite32(clkrun_val, phy->ilb_base_addr + LPC_CNTRL_REG_OFFSET);
/*
* Write any random value on port 0x80 which is on LPC, to make
@@ -185,15 +189,16 @@ static void tpm_platform_begin_xfer(struct tpm_tis_data *data)
static void tpm_platform_end_xfer(struct tpm_tis_data *data)
{
u32 clkrun_val;
+ struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(data);
if (!is_bsw() || (data->flags & TPM_TIS_CLK_ENABLE))
return;
- clkrun_val = ioread32(ilb_base_addr + LPC_CNTRL_REG_OFFSET);
+ clkrun_val = ioread32(phy->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);
+ iowrite32(clkrun_val, phy->ilb_base_addr + LPC_CNTRL_REG_OFFSET);
/*
* Write any random value on port 0x80 which is on LPC, to make
@@ -204,10 +209,6 @@ static void tpm_platform_end_xfer(struct tpm_tis_data *data)
}
#else
-static inline bool is_bsw(void)
-{
- return false;
-}
static void tpm_platform_begin_xfer(struct tpm_tis_data *data)
{
}
@@ -311,14 +312,25 @@ static int tpm_tis_init(struct device *dev, struct tpm_info *tpm_info)
if (IS_ERR(phy->iobase))
return PTR_ERR(phy->iobase);
+ if (is_bsw()) {
+ phy->ilb_base_addr = ioremap(INTEL_LEGACY_BLK_BASE_ADDR,
+ ILB_REMAP_SIZE);
+ if (!phy->ilb_base_addr)
+ return -ENOMEM;
+ }
+
if (interrupts)
irq = tpm_info->irq;
if (itpm || is_itpm(ACPI_COMPANION(dev)))
phy->priv.flags |= TPM_TIS_ITPM_WORKAROUND;
- return tpm_tis_core_init(dev, &phy->priv, irq, &tpm_tcg,
+ rc = tpm_tis_core_init(dev, &phy->priv, irq, &tpm_tcg,
ACPI_HANDLE(dev));
+ if (rc && is_bsw())
+ iounmap(phy->ilb_base_addr);
+
+ return rc;
}
static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);
@@ -359,9 +371,14 @@ static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
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);
+ struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(priv);
tpm_chip_unregister(chip);
tpm_tis_remove(chip);
+
+ if (is_bsw())
+ iounmap(phy->ilb_base_addr);
}
static struct pnp_driver tis_pnp_driver = {
@@ -408,10 +425,15 @@ static int tpm_tis_plat_probe(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_tis_data *priv = dev_get_drvdata(&chip->dev);
+ struct tpm_tis_tcg_phy *phy = to_tpm_tis_tcg_phy(priv);
tpm_chip_unregister(chip);
tpm_tis_remove(chip);
+ if (is_bsw())
+ iounmap(phy->ilb_base_addr);
+
return 0;
}
@@ -469,11 +491,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;
@@ -492,10 +509,6 @@ static int __init init_tis(void)
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;
}
@@ -505,10 +518,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);
}
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-security-module" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2017-11-21 22:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 22:39 [PATCH v4 0/2] ] Fix corner cases with disabling CLKRUN in tpm_tis Azhar Shaikh
2017-11-21 22:39 ` Azhar Shaikh
2017-11-21 22:39 ` [PATCH v4 1/2] tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd() Azhar Shaikh
2017-11-21 22:39 ` Azhar Shaikh
2017-11-22 19:57 ` Shaikh, Azhar
2017-11-22 19:57 ` Shaikh, Azhar
2017-11-22 19:57 ` Shaikh, Azhar
2017-11-21 22:39 ` Azhar Shaikh [this message]
2017-11-21 22:39 ` [PATCH v4 2/2] tpm_tis: Move ilb_base_addr to tpm_tis_tcg_phy Azhar Shaikh
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=1511303964-56294-3-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=peterhuewe@gmx.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.