WTF: patch "[PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data" was seriously submitted to be applied to the 4.15-stable tree?

WTF: patch "[PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data" was seriously submitted to be applied to the 4.15-stable tree?

[gregkh]

The patch below was submitted to be applied to the 4.15-stable tree.

I fail to see how this patch meets the stable kernel rules as found at
Documentation/process/stable-kernel-rules.rst.

I could be totally wrong, and if so, please respond to 
<stable@vger.kernel.org> and let me know why this patch should be
applied.  Otherwise, it is now dropped from my patch queues, never to be
seen again.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From c382babccba2c82fe57f9e647f290fb7bf4d130d Mon Sep 17 00:00:00 2001
From: Azhar Shaikh <azhar.shaikh@intel.com>
Date: Fri, 22 Dec 2017 12:13:43 -0800
Subject: [PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data

Move static variable ilb_base_addr to tpm_tis_data.

Cc: stable@vger.kernel.org
Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.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>

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index e2d1055fb814..923f8f2cbaca 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -134,33 +134,24 @@ static int check_acpi_tpm2(struct device *dev)
 #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
@@ -173,18 +164,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
@@ -194,16 +185,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
@@ -213,12 +199,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);
 
-	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;
 }
@@ -228,12 +214,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);
 
-	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;
 }
@@ -242,11 +228,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);
 
-	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;
 }
@@ -255,11 +241,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);
 
-	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;
 }
@@ -268,11 +254,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);
 
-	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;
 }
@@ -351,9 +337,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 = {
@@ -400,10 +390,14 @@ 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);
 
 	tpm_chip_unregister(chip);
 	tpm_tis_remove(chip);
 
+	if (is_bsw())
+		iounmap(priv->ilb_base_addr);
+
 	return 0;
 }
 
@@ -461,11 +455,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;
@@ -484,10 +473,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;
 }
@@ -497,10 +482,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);
 }
diff --git a/drivers/char/tpm/tpm_tis_core.c b/drivers/char/tpm/tpm_tis_core.c
index ca6b2b527d52..aff567840e50 100644
--- a/drivers/char/tpm/tpm_tis_core.c
+++ b/drivers/char/tpm/tpm_tis_core.c
@@ -766,6 +766,13 @@ int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 	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;
@@ -856,9 +863,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:
 	tpm_tis_remove(chip);
+	if (is_bsw())
+		iounmap(priv->ilb_base_addr);
+
 	return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_tis_core_init);
diff --git a/drivers/char/tpm/tpm_tis_core.h b/drivers/char/tpm/tpm_tis_core.h
index 6bbac319ff3b..458847f72758 100644
--- a/drivers/char/tpm/tpm_tis_core.h
+++ b/drivers/char/tpm/tpm_tis_core.h
@@ -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(struct tpm_tis_data *data, u32 addr,
 	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);
 int tpm_tis_core_init(struct device *dev, struct tpm_tis_data *priv, int irq,
 		      const struct tpm_tis_phy_ops *phy_ops,

RE: patch "[PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data" was seriously submitted to be applied to the 4.15-stable tree?

[Shaikh, Azhar]

Hi Greg,


[1] is merged on the 4.15 stable tree. But this caused 2 issues:
i. PS/2 keyboard and mouse were broken on an Intel Braswell system. The fix for this is [4].
ii. There were some corner cases where TPM suspend was failing on Braswell systems. The fix  for this is [2] and [3].

The patch pointed out by you is [2].
[3] is dependent on [2]. So to fix the issue on stable tree we will need [2], [3] and [4]. 

[4] is not there yet on Linus's branch. I think it is queued for 4.16.

[5] fixes compile time warning introduced in [3].



[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/drivers/char/tpm/tpm_tis.c?h=linux-4.15.y&id=5e572cab92f0bb56ca1e6e5ee4d807663a7ccbad 
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/char/tpm/tpm_tis.c?id=c382babccba2c82fe57f9e647f290fb7bf4d130d 
[3] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/char/tpm/tpm_tis.c?id=b3e958ce4c585bf666de249dc794971ebc62d2d3 
[4] http://git.infradead.org/users/jjs/linux-tpmdd.git/commitdiff/6c9f0ce0dffe64da2204f38b0fd90f3ae2a8903c  
[5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/char/tpm/tpm_tis.c?id=68021bf4734d15c9a9ed1c1072b9ebcfda3e39cc 

Regards,
Azhar Shaikh

>-----Original Message-----
>From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
>Sent: Thursday, February 1, 2018 4:19 AM
>To: Shaikh, Azhar <azhar.shaikh@intel.com>; jarkko.sakkinen@linux.intel.com
>Cc: stable@vger.kernel.org
>Subject: WTF: patch "[PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data"
>was seriously submitted to be applied to the 4.15-stable tree?
>
>The patch below was submitted to be applied to the 4.15-stable tree.
>
>I fail to see how this patch meets the stable kernel rules as found at
>Documentation/process/stable-kernel-rules.rst.
>
>I could be totally wrong, and if so, please respond to
><stable@vger.kernel.org> and let me know why this patch should be applied.
>Otherwise, it is now dropped from my patch queues, never to be seen again.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>>From c382babccba2c82fe57f9e647f290fb7bf4d130d Mon Sep 17 00:00:00 2001
>From: Azhar Shaikh <azhar.shaikh@intel.com>
>Date: Fri, 22 Dec 2017 12:13:43 -0800
>Subject: [PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data
>
>Move static variable ilb_base_addr to tpm_tis_data.
>
>Cc: stable@vger.kernel.org
>Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.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>
>
>diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index
>e2d1055fb814..923f8f2cbaca 100644
>--- a/drivers/char/tpm/tpm_tis.c
>+++ b/drivers/char/tpm/tpm_tis.c
>@@ -134,33 +134,24 @@ static int check_acpi_tpm2(struct device *dev)
>#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 @@ -
>173,18 +164,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 @@ -
>194,16 +185,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
>@@ -213,12 +199,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);
>
>-	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;
> }
>@@ -228,12 +214,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);
>
>-	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;
> }
>@@ -242,11 +228,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);
>
>-	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;
> }
>@@ -255,11 +241,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);
>
>-	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;
> }
>@@ -268,11 +254,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);
>
>-	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;
> }
>@@ -351,9 +337,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 = { @@ -400,10 +390,14 @@ 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);
>
> 	tpm_chip_unregister(chip);
> 	tpm_tis_remove(chip);
>
>+	if (is_bsw())
>+		iounmap(priv->ilb_base_addr);
>+
> 	return 0;
> }
>
>@@ -461,11 +455,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;
>@@ -484,10 +473,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;
> }
>@@ -497,10 +482,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);
> }
>diff --git a/drivers/char/tpm/tpm_tis_core.c
>b/drivers/char/tpm/tpm_tis_core.c index ca6b2b527d52..aff567840e50
>100644
>--- a/drivers/char/tpm/tpm_tis_core.c
>+++ b/drivers/char/tpm/tpm_tis_core.c
>@@ -766,6 +766,13 @@ int tpm_tis_core_init(struct device *dev, struct
>tpm_tis_data *priv, int irq,
> 	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;
>@@ -856,9 +863,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:
> 	tpm_tis_remove(chip);
>+	if (is_bsw())
>+		iounmap(priv->ilb_base_addr);
>+
> 	return rc;
> }
> EXPORT_SYMBOL_GPL(tpm_tis_core_init);
>diff --git a/drivers/char/tpm/tpm_tis_core.h
>b/drivers/char/tpm/tpm_tis_core.h index 6bbac319ff3b..458847f72758 100644
>--- a/drivers/char/tpm/tpm_tis_core.h
>+++ b/drivers/char/tpm/tpm_tis_core.h
>@@ -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(struct tpm_tis_data *data, u32 addr,
> 	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);  int tpm_tis_core_init(struct
>device *dev, struct tpm_tis_data *priv, int irq,
> 		      const struct tpm_tis_phy_ops *phy_ops,

Re: patch "[PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data" was seriously submitted to be applied to the 4.15-stable tree?

[gregkh]

On Fri, Feb 02, 2018 at 06:24:16PM +0000, Shaikh, Azhar wrote:
> Hi Greg,
> 
> 
> [1] is merged on the 4.15 stable tree. But this caused 2 issues:
> i. PS/2 keyboard and mouse were broken on an Intel Braswell system. The fix for this is [4].
> ii. There were some corner cases where TPM suspend was failing on Braswell systems. The fix  for this is [2] and [3].
> 
> The patch pointed out by you is [2].
> [3] is dependent on [2]. So to fix the issue on stable tree we will need [2], [3] and [4]. 
> 
> [4] is not there yet on Linus's branch. I think it is queued for 4.16.
> 
> [5] fixes compile time warning introduced in [3].

This email was crazy difficult to read and understand :(

Please, footnotes in emails are for things you can go back and look at
later, after reading the body of a message, not to try to understand
exactly what in the world is going on and what I am supposed to do with
something.

In the future, just put the git sha1 in the email text, no need to link
to anything, we all have zillions of copies of the kernel source on our
own machines.  And sometimes we do not have reliable web access (emails
works great as store and forward.)

Just use the format:
	c382babccba2 ("tpm_tis: Move ilb_base_addr to tpm_tis_data")
to describe a commit id, which can be easily obtained by doing:
	git show -s --abbrev-commit --abbrev=12 --pretty=format:"%h (\"%s\")%n"'
(hint, I have an alias for it so I don't have to ever type that again).

So, with all of that, I still have no idea what I am supposed to do
here.  The patch that triggered this email is obviously not a stable
tree patch, as all it does is move code around, right?  Is there
something else I should be doing here?  What action do you want me to
take?

totally confused,

greg k-h

RE: patch "[PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data" was seriously submitted to be applied to the 4.15-stable tree?

[Shaikh, Azhar]

>-----Original Message-----
>From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
>Sent: Friday, February 2, 2018 9:15 PM
>To: Shaikh, Azhar <azhar.shaikh@intel.com>
>Cc: jarkko.sakkinen@linux.intel.com; stable@vger.kernel.org
>Subject: Re: patch "[PATCH] tpm_tis: Move ilb_base_addr to tpm_tis_data"
>was seriously submitted to be applied to the 4.15-stable tree?
>
>On Fri, Feb 02, 2018 at 06:24:16PM +0000, Shaikh, Azhar wrote:
>> Hi Greg,
>>
>>
>> [1] is merged on the 4.15 stable tree. But this caused 2 issues:
>> i. PS/2 keyboard and mouse were broken on an Intel Braswell system. The
>fix for this is [4].
>> ii. There were some corner cases where TPM suspend was failing on
>Braswell systems. The fix  for this is [2] and [3].
>>
>> The patch pointed out by you is [2].
>> [3] is dependent on [2]. So to fix the issue on stable tree we will need [2],
>[3] and [4].
>>
>> [4] is not there yet on Linus's branch. I think it is queued for 4.16.
>>
>> [5] fixes compile time warning introduced in [3].
>
>This email was crazy difficult to read and understand :(
>


Really sorry for all the confusion :(

>Please, footnotes in emails are for things you can go back and look at later,
>after reading the body of a message, not to try to understand exactly what in
>the world is going on and what I am supposed to do with something.
>
>In the future, just put the git sha1 in the email text, no need to link to
>anything, we all have zillions of copies of the kernel source on our own
>machines.  And sometimes we do not have reliable web access (emails works
>great as store and forward.)
>
>Just use the format:
>	c382babccba2 ("tpm_tis: Move ilb_base_addr to tpm_tis_data") to
>describe a commit id, which can be easily obtained by doing:
>	git show -s --abbrev-commit --abbrev=12 --pretty=format:"%h
>(\"%s\")%n"'
>(hint, I have an alias for it so I don't have to ever type that again).
>
>So, with all of that, I still have no idea what I am supposed to do here.  The
>patch that triggered this email is obviously not a stable tree patch, as all it does
>is move code around, right?  Is there something else I should be doing here?
>What action do you want me to take?
>

Yes you are right, the patch pointed out by you, just moves the code around. But this patch, alongwith other patches mentioned below are needed to fix a corner case issue. Also there is a fix for PS/2 keyboard and mouse broken on Intel Braswell systems.

Both the issues were introduced by 
	5e572cab92f0("tpm: Enable CLKRUN protocol for Braswell systems") 	-	Already present on Linux-stable branch

Please pick below commits which are present on Linus's tree to fix corner case issue:

	68021bf4734d("tpm: remove unused variables")
	764325add6c2("tpm: delete the TPM_TIS_CLK_ENABLE flag")
	b3e958ce4c58("tpm: Keep CLKRUN enabled throughout the duration of transmit_cmd()")
	c382babccba2("tpm_tis: Move ilb_base_addr to tpm_tis_data")

Below commit is still not present on Linus's tree but merged on TPM maintainer's (Jarkko Sakkinen) tree to fix PS/2 keyboard and mouse issue. 
	git://git.infradead.org/users/jjs/linux-tpmdd.git master branch
	6c9f0ce0dffe6("tpm: only attempt to disable the LPC CLKRUN if is already enabled")

>totally confused,
>

Sorry again for the confusion and I hope this time it is more clear.

>greg k-h


Regards,
Azhar Shaikh