Skip to contentSkip to conversation

reset: socfpga: release more A10 peripherals out of reset

PATCH New tien.fong.chee at intel.com 4 participants 7 messages May 24, 2019 – Oct 9, 2019 Reset controller framework

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 reset: socfpga: release more A10 peripherals out of reset

From: Tien Fong Chee <[email protected]>

Current implementation almost release all peripherals out of reset for gen5, but A10 has more peripherals than gen5, hence this patch is required to release the rest of peripherals to support old kernels.

---
 drivers/reset/reset-socfpga.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/reset/reset-socfpga.c +3 -0
index cb8312619f..d8b8b25fc3 100644
@@ -127,6 +127,9 @@ static int socfpga_reset_remove(struct udevice *dev)
 	if (socfpga_reset_keep_enabled()) {
 		puts("Deasserting all peripheral resets\n");
 		writel(0, data->modrst_base + 4);
+#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+		writel(0, data->modrst_base + 8);
+#endif
 	}
 
 	return 0;
Signature · 1 line
2.13.0
#1 lore raw

PATCH 1/1 reset: socfpga: release more A10 peripherals out of reset

Quoted 16 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Current implementation almost release all peripherals out of reset for gen5, but A10 has more peripherals than gen5, hence this patch is required to release the rest of peripherals to support old kernels.

---
 drivers/reset/reset-socfpga.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/reset/reset-socfpga.c +0 -0
index cb8312619f..d8b8b25fc3 100644

drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct udevice *dev) · line 131

Quoted 5 lines
drivers/reset/reset-socfpga.c +2 -0
@@ -127,6 +127,9 @@ static int socfpga_reset_remove(struct udevice *dev)
 	if (socfpga_reset_keep_enabled()) {
 		puts("Deasserting all peripheral resets\n");
 		writel(0, data->modrst_base + 4);
+#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+		writel(0, data->modrst_base + 8);

This should be using match on compatible string.
Which register is this modrst_base + 8 ?

Quoted 5 lines
drivers/reset/reset-socfpga.c +1 -0
+#endif
 	}
 
 	return 0;
Signature · 2 lines
Best regards,
Marek Vasut
#2 lore raw

PATCH 1/1 reset: socfpga: release more A10 peripherals out of reset

Quoted 13 lines · Marek Vasut
Quoted 11 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Current implementation almost release all peripherals out of reset for gen5, but A10 has more peripherals than gen5, hence this patch is required to release the rest of peripherals to support old kernels.

---
 drivers/reset/reset-socfpga.c | 3 +++
 1 file changed, 3 insertions(+)
Quoted 13 lines

drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct udevice *dev) · line 131

Quoted 10 lines
drivers/reset/reset-socfpga.c +2 -0
index cb8312619f..d8b8b25fc3 100644
@@ -127,6 +127,9 @@ static int socfpga_reset_remove(struct udevice *dev)
      if (socfpga_reset_keep_enabled()) {
              puts("Deasserting all peripheral resets\n");
              writel(0, data->modrst_base + 4);
+#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+             writel(0, data->modrst_base + 8);

This should be using match on compatible string.
Which register is this modrst_base + 8 ?

Well, even modrst_base + 4 is not really ideal. After all, modrst_base is a dts-given offset into the rstmgr's registers, so there is not really a comptile time known constant to do this.

Maybe it would be better to use an offset to the device's membase. However, as this is a backwards-compatibility workaround, there's no use to add this into the devicetree.

And unfortunately, both gen5 and a10 use the same compatible string, which probably would have to be changed.

Regards,
Simon

Quoted 11 lines

drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct udevice *dev) · line 135

Quoted 6 lines
drivers/reset/reset-socfpga.c +1 -0
+#endif
      }
 
      return 0;

--
Best regards,
Marek Vasut

#3 lore raw

PATCH 1/1 reset: socfpga: release more A10 peripherals out of reset

Quoted 43 lines · Simon Goldschmidt
Quoted 17 lines · Marek Vasut
Quoted 14 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Current implementation almost release all peripherals out of reset for
gen5, but A10 has more peripherals than gen5, hence this patch is required
to release the rest of peripherals to support old kernels.

---
 drivers/reset/reset-socfpga.c | 3 +++

 1 file changed, 3 insertions(+)
Quoted 14 lines

drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct · line 132

Quoted 12 lines
drivers/reset/reset- renamed from drivers/reset/reset-socfpga.c +0 -0

socfpga.c
index cb8312619f..d8b8b25fc3 100644

drivers/reset/reset-socfpga.c +2 -0
@@ -127,6 +127,9 @@ static int socfpga_reset_remove(struct
 udevice *dev)
       if (socfpga_reset_keep_enabled()) {
               puts("Deasserting all peripheral resets\n");
               writel(0, data->modrst_base + 4);
+#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+             writel(0, data->modrst_base + 8);

This should be using match on compatible string.
Which register is this modrst_base + 8 ?

Well, even modrst_base + 4 is not really ideal. After all, modrst_base is a
dts-given offset into the rstmgr's registers, so there is not really a
comptile time known constant to do this.

Maybe it would be better to use an offset to the device's membase. However, as this is a backwards-compatibility workaround, there's no use to
add this into the devicetree.

Quoted 6 lines

And unfortunately, both gen5 and a10 use the same compatible string, which
probably would have to be changed.

Regards,
Simon

This register is per1modrst, here is the link https://www.intel.com/con
tent/www/us/en/programmable/hps/arria- 10/hps.html#reg_soc_top/sfo1429890576520.html
This whole mechanism should be removed once Dinh has fixed this issue at Linux v4.14-lts or moving to Linux v5.0 onwards.

Quoted 13 lines
Quoted 13 lines
Quoted 9 lines
drivers/reset/reset-socfpga.c +1 -0
+#endif
       }
 

      return 0;

--
Best regards,
Marek Vasut

#4 lore raw

PATCH 1/1 reset: socfpga: release more A10 peripherals out of reset

Quoted 49 lines · Tien Fong
Quoted 47 lines · Simon Goldschmidt
Quoted 17 lines · Marek Vasut
Quoted 14 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Current implementation almost release all peripherals out of reset for
gen5, but A10 has more peripherals than gen5, hence this patch is required
to release the rest of peripherals to support old kernels.

---
 drivers/reset/reset-socfpga.c | 3 +++
 1 file changed, 3 insertions(+)
Quoted 14 lines

drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct · line 132

Quoted 12 lines
drivers/reset/reset- renamed from drivers/reset/reset-socfpga.c +0 -0

socfpga.c
index cb8312619f..d8b8b25fc3 100644

drivers/reset/reset-socfpga.c +2 -0
@@ -127,6 +127,9 @@ static int socfpga_reset_remove(struct
 udevice *dev)
      if (socfpga_reset_keep_enabled()) {
              puts("Deasserting all peripheral resets\n");
              writel(0, data->modrst_base + 4);
+#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+             writel(0, data->modrst_base + 8);

This should be using match on compatible string.
Which register is this modrst_base + 8 ?

Well, even modrst_base + 4 is not really ideal. After all, modrst_base is a
dts-given offset into the rstmgr's registers, so there is not really a
comptile time known constant to do this.

Maybe it would be better to use an offset to the device's membase. However, as this is a backwards-compatibility workaround, there's no use to
add this into the devicetree.

And unfortunately, both gen5 and a10 use the same compatible string, which
probably would have to be changed.

Quoted 8 lines
Quoted 2 lines

Regards,
Simon

This register is per1modrst, here is the link https://www.intel.com/con
tent/www/us/en/programmable/hps/arria- 10/hps.html#reg_soc_top/sfo1429890576520.html
This whole mechanism should be removed once Dinh has fixed this issue at Linux v4.14-lts or moving to Linux v5.0 onwards.

I agree it can be removed in the future, but is it really enough to have this in 4.14-lts? I'm not so sure that we should prevent people from using mainline U-Boot with older kernels...

Regards,
Simon

Quoted 14 lines
Quoted 14 lines
Quoted 14 lines
Quoted 10 lines
drivers/reset/reset-socfpga.c +1 -0
+#endif
      }
 
      return 0;

--
Best regards,
Marek Vasut

#5 lore raw

PATCH 1/1 reset: socfpga: release more A10 peripherals out of reset

Quoted 71 lines · Simon Goldschmidt
Quoted 62 lines · Tien Fong
Quoted 52 lines · Simon Goldschmidt
Quoted 20 lines · Marek Vasut
Quoted 16 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Current implementation almost release all peripherals out of reset for
gen5, but A10 has more peripherals than gen5, hence this patch is
required
to release the rest of peripherals to support old kernels.

---
 drivers/reset/reset-socfpga.c | 3 +++

 1 file changed, 3 insertions(+)
Quoted 15 lines

drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct · line 132

Quoted 13 lines
drivers/reset/reset- renamed from drivers/reset/reset-socfpga.c +0 -0

socfpga.c
index cb8312619f..d8b8b25fc3 100644

drivers/reset/reset-socfpga.c +2 -0
@@ -127,6 +127,9 @@ static int socfpga_reset_remove(struct
 udevice *dev)
       if (socfpga_reset_keep_enabled()) {
               puts("Deasserting all peripheral resets\n");
               writel(0, data->modrst_base + 4);
+#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+             writel(0, data->modrst_base + 8);

This should be using match on compatible string.
Which register is this modrst_base + 8 ?

Well, even modrst_base + 4 is not really ideal. After all, modrst_base is a
dts-given offset into the rstmgr's registers, so there is not really
a
comptile time known constant to do this.

Maybe it would be better to use an offset to the device's membase.
However, as this is a backwards-compatibility workaround, there's no
use to
add this into the devicetree.

Quoted 7 lines

And unfortunately, both gen5 and a10 use the same compatible string,
which
probably would have to be changed.

Regards,
Simon

Quoted 7 lines

This register is per1modrst, here is the link https://www.intel.com
/con
tent/www/us/en/programmable/hps/arria- 10/hps.html#reg_soc_top/sfo1429890576520.html
This whole mechanism should be removed once Dinh has fixed this issue
at Linux v4.14-lts or moving to Linux v5.0 onwards.

Quoted 4 lines

I agree it can be removed in the future, but is it really enough to have this
in 4.14-lts? I'm not so sure that we should prevent people from using mainline U-Boot with older kernels...

I have no strong opinion on this, but how old the kernel U-Boot want to support, subject to the maintainer :) .

Quoted 21 lines

Regards,
Simon

Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 12 lines
drivers/reset/reset-socfpga.c +1 -0
+#endif
       }
 
Quoted 2 lines

      return 0;

--
Best regards,
Marek Vasut

#6 lore raw

PATCH 1/1 reset: socfpga: release more A10 peripherals out of reset

Am 24.05.2019 um 14:16 schrieb Chee, Tien Fong:

Quoted 17 lines · Simon Goldschmidt
Quoted 16 lines
Quoted 14 lines · Tien Fong
Quoted 11 lines · Simon Goldschmidt
Quoted 8 lines · Marek Vasut
Quoted 4 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

Current implementation almost release all peripherals out of reset for
gen5, but A10 has more peripherals than gen5, hence this patch is
required
to release the rest of peripherals to support old kernels.

Even if this is old, I'm ok with it, since it's only "temporary" until the Linux drivers can handle RST, so:

Quoted 76 lines
Quoted 47 lines
Quoted 40 lines
Quoted 33 lines
Quoted 4 lines
Quoted 4 lines
---
  drivers/reset/reset-socfpga.c | 3 +++
  1 file changed, 3 insertions(+)
Quoted 15 lines

drivers/reset/reset-socfpga.c static int socfpga_reset_remove(struct · line 132

Quoted 13 lines
drivers/reset/reset- renamed from drivers/reset/reset-socfpga.c +0 -0

socfpga.c
index cb8312619f..d8b8b25fc3 100644

drivers/reset/reset-socfpga.c +2 -0
@@ -127,6 +127,9 @@ static int socfpga_reset_remove(struct
 udevice *dev)
       if (socfpga_reset_keep_enabled()) {
               puts("Deasserting all peripheral resets\n");
               writel(0, data->modrst_base + 4);
+#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
+             writel(0, data->modrst_base + 8);

This should be using match on compatible string.
Which register is this modrst_base + 8 ?

Well, even modrst_base + 4 is not really ideal. After all, modrst_base is a
dts-given offset into the rstmgr's registers, so there is not really
a
comptile time known constant to do this.

Maybe it would be better to use an offset to the device's membase.
However, as this is a backwards-compatibility workaround, there's no
use to
add this into the devicetree.

Quoted 7 lines

And unfortunately, both gen5 and a10 use the same compatible string,
which
probably would have to be changed.

Regards,
Simon

Quoted 7 lines

This register is per1modrst, here is the link https://www.intel.com
/con
tent/www/us/en/programmable/hps/arria- 10/hps.html#reg_soc_top/sfo1429890576520.html
This whole mechanism should be removed once Dinh has fixed this issue
at Linux v4.14-lts or moving to Linux v5.0 onwards.

Quoted 4 lines

I agree it can be removed in the future, but is it really enough to have this
in 4.14-lts? I'm not so sure that we should prevent people from using mainline U-Boot with older kernels...

I have no strong opinion on this, but how old the kernel U-Boot want to support, subject to the maintainer :) .

Quoted 21 lines

Regards,
Simon

Quoted 17 lines
Quoted 17 lines
Quoted 17 lines
Quoted 12 lines
drivers/reset/reset-socfpga.c +1 -0
+#endif
       }
 
Quoted 2 lines

      return 0;

--
Best regards,
Marek Vasut