Skip to contentSkip to conversation

soc: fsl: handle RCPM errata A-008646 on SoC LS1021A

PATCH Applied Ran Wang 3 participants 6 messages Nov 2, 2020 – Nov 30, 2020

Subsystems (2)
lore
Share & tools
lore

Ran Wang

author
#0 lore raw

PATCH v4 1/3 soc: fsl: handle RCPM errata A-008646 on SoC LS1021A

From: Biwen Li <[email protected]>

Hardware issue:
- Reading register RCPM_IPPDEXPCR1 always return zero, this causes system firmware could not get correct information and wrongly do clock gating for all wakeup source IP during system suspend. Then those IPs will never get chance to wake system.

Workaround:
- Copy register RCPM_IPPDEXPCR1's setting to register SCFG_SPARECR8 to allow system firmware's psci method read it and do things accordingly.

---
Change in v4:
- Replace property 'fsl,ippdexpcr1-alt-reg' with compatible checking as the workaround trigger condition.

Change in v3:
- Add copy_ippdexpcr1_setting(), simplize workaournd's implementation according to binding update.
- Minor update on commit message.

Change in v2:
- Update commit message to be more clear.
- Replace device_property_read_u32_array() with syscon_regmap_lookup_by_phandle_args() to make code simpler.

 drivers/soc/fsl/rcpm.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)
drivers/soc/fsl/rcpm.c +34 -1
index a093dbe..4ace28c 100644
@@ -2,7 +2,7 @@
 //
 // rcpm.c - Freescale QorIQ RCPM driver
 //
-// Copyright 2019 NXP
+// Copyright 2019-2020 NXP
 //
 // Author: Ran Wang <[email protected]>
 
@@ -22,6 +22,28 @@ struct rcpm {
 	bool		little_endian;
 };
 
+#define  SCFG_SPARECR8	0x051c
+
+static void copy_ippdexpcr1_setting(u32 val)
+{
+	struct device_node *np;
+	void __iomem *regs;
+	u32 reg_val;
+
+	np = of_find_compatible_node(NULL, NULL, "fsl,ls1021a-scfg");
+	if (!np)
+		return;
+
+	regs = of_iomap(np, 0);
+	if (!regs)
+		return;
+
+	reg_val = ioread32be(regs + SCFG_SPARECR8);
+	iowrite32be(val | reg_val, regs + SCFG_SPARECR8);
+
+	iounmap(regs);
+}
+
 /**
  * rcpm_pm_prepare - performs device-level tasks associated with power
  * management, such as programming related to the wakeup source control.
@@ -90,6 +112,17 @@ static int rcpm_pm_prepare(struct device *dev)
 			tmp |= ioread32be(address);
 			iowrite32be(tmp, address);
 		}
+		/*
+		 * Workaround of errata A-008646 on SoC LS1021A:
+		 * There is a bug of register ippdexpcr1.
+		 * Reading configuration register RCPM_IPPDEXPCR1
+		 * always return zero. So save ippdexpcr1's value
+		 * to register SCFG_SPARECR8.And the value of
+		 * ippdexpcr1 will be read from SCFG_SPARECR8.
+		 */
+		if (dev_of_node(dev) && (i == 1))
+			if (of_device_is_compatible(np, "fsl,ls1021a-rcpm"))
+				copy_ippdexpcr1_setting(tmp);
 	}
 
 	return 0;
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v4 2/3 arm: dts: ls1021a: fix flextimer failed to wake system

The data of property 'fsl,rcpm-wakeup' is not corrcet, which causing RCPM driver incorrectly program register IPPDEXPCR1, then flextimer is wrongly clock gated during system suspend, can't send interrupt to wake.

---
Change in v4:
- None

Change in v3:
- None

Change in v2:
- None

 arch/arm/boot/dts/ls1021a.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/ls1021a.dtsi +1 -1
index 827373e..e12809d6 100644
@@ -1013,7 +1013,7 @@
 			compatible = "fsl,ls1021a-ftm-alarm";
 			reg = <0x0 0x29d0000 0x0 0x10000>;
 			reg-names = "ftm";
-			fsl,rcpm-wakeup = <&rcpm 0x20000 0x0>;
+			fsl,rcpm-wakeup = <&rcpm 0x0 0x20000000>;
 			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
 			big-endian;
 		};
Signature · 1 line
2.7.4
Applied
#2 lore raw

Re: [PATCH v4 2/3] arm: dts: ls1021a: fix flextimer failed to wake system

Quoted 7 lines · Ran Wang

The data of property 'fsl,rcpm-wakeup' is not corrcet, which causing RCPM driver incorrectly program register IPPDEXPCR1, then flextimer is wrongly clock gated during system suspend, can't send interrupt to wake.

Applied, thanks.

author
#3 lore raw

PATCH v4 3/3 arm: dts: ls1021a: fix rcpm failed to claim resource

In reply to Ran Wang

The range of dcfg reg is wrong, which overlap with other device, such as rcpm. This issue causing rcpm driver failed to claim reg resource when calling devm_ioremap_resource().

---
Change in v4:
- None

Change in v3:
- None

Change in v2:
- None

 arch/arm/boot/dts/ls1021a.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/ls1021a.dtsi +1 -1
index e12809d6..16744f64 100644
@@ -173,7 +173,7 @@
 
 		dcfg: dcfg@1ee0000 {
 			compatible = "fsl,ls1021a-dcfg", "syscon";
-			reg = <0x0 0x1ee0000 0x0 0x10000>;
+			reg = <0x0 0x1ee0000 0x0 0x1000>;
 			big-endian;
 		};
 
Signature · 1 line
2.7.4
Applied
#4 lore raw

Re: [PATCH v4 3/3] arm: dts: ls1021a: fix rcpm failed to claim resource

Quoted 6 lines · Ran Wang

The range of dcfg reg is wrong, which overlap with other device, such as rcpm. This issue causing rcpm driver failed to claim reg resource when calling devm_ioremap_resource().

Applied, thanks.

#5 lore raw
In reply to Ran Wang
Quoted 9 lines · Ran Wang

From: Biwen Li <[email protected]>

Hardware issue:
- Reading register RCPM_IPPDEXPCR1 always return zero, this causes system firmware could not get correct information and wrongly do clock gating for all wakeup source IP during system suspend. Then those IPs will never get chance to wake system.

Quoted 6 lines

Workaround:
- Copy register RCPM_IPPDEXPCR1's setting to register SCFG_SPARECR8 to allow system firmware's psci method read it and do things accordingly.

Applied for next. Thanks.

Quoted 81 lines

---
Change in v4:
- Replace property 'fsl,ippdexpcr1-alt-reg' with compatible checking as the workaround trigger condition.

Change in v3:
- Add copy_ippdexpcr1_setting(), simplize workaournd's implementation according to binding update.
- Minor update on commit message.

Change in v2:
- Update commit message to be more clear.
- Replace device_property_read_u32_array() with syscon_regmap_lookup_by_phandle_args() to make code simpler.

 drivers/soc/fsl/rcpm.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)
drivers/soc/fsl/rcpm.c +34 -2
index a093dbe..4ace28c 100644
@@ -2,7 +2,7 @@
 //
 // rcpm.c - Freescale QorIQ RCPM driver
 //
-// Copyright 2019 NXP
+// Copyright 2019-2020 NXP
 //
 // Author: Ran Wang <[email protected]>
 
@@ -22,6 +22,28 @@ struct rcpm {
        bool            little_endian;
 };
 
+#define  SCFG_SPARECR8 0x051c
+
+static void copy_ippdexpcr1_setting(u32 val)
+{
+       struct device_node *np;
+       void __iomem *regs;
+       u32 reg_val;
+
+       np = of_find_compatible_node(NULL, NULL, "fsl,ls1021a-scfg");
+       if (!np)
+               return;
+
+       regs = of_iomap(np, 0);
+       if (!regs)
+               return;
+
+       reg_val = ioread32be(regs + SCFG_SPARECR8);
+       iowrite32be(val | reg_val, regs + SCFG_SPARECR8);
+
+       iounmap(regs);
+}
+
 /**
  * rcpm_pm_prepare - performs device-level tasks associated with power
  * management, such as programming related to the wakeup source control.
@@ -90,6 +112,17 @@ static int rcpm_pm_prepare(struct device *dev)
                        tmp |= ioread32be(address);
                        iowrite32be(tmp, address);
                }
+               /*
+                * Workaround of errata A-008646 on SoC LS1021A:
+                * There is a bug of register ippdexpcr1.
+                * Reading configuration register RCPM_IPPDEXPCR1
+                * always return zero. So save ippdexpcr1's value
+                * to register SCFG_SPARECR8.And the value of
+                * ippdexpcr1 will be read from SCFG_SPARECR8.
+                */
+               if (dev_of_node(dev) && (i == 1))
+                       if (of_device_is_compatible(np, "fsl,ls1021a-rcpm"))
+                               copy_ippdexpcr1_setting(tmp);
        }
 
        return 0;
--

2.7.4