Re: [PATCH 1/2] Revert "arm64: Layerscape: Survive LPI one-way reset workaround"

[Tom Rini]

On Wed, Oct 27, 2021 at 06:54:53PM +0200, Michael Walle wrote:

> From: Tom Rini 
> 
> Ad-hoc bindings that are not part of the upstream device tree / bindings
> are not allowed in-tree.  Only bindings that are in-progress with
> upstream and then re-synced once agreed upon are.
> 
> This reverts commit af288cb291da3abef6be0875527729296f7de7a0.
> 
> Cc: Hou Zhiqiang 
> Cc: Priyanka Jain 
> Reported-by: Michael Walle 
> Signed-off-by: Tom Rini 
> Acked-by: Marc Zyngier 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature

Re: [PATCH 1/2] Revert "arm64: Layerscape: Survive LPI one-way reset workaround"

[Marc Zyngier]

On Wed, 27 Oct 2021 17:54:53 +0100,
Michael Walle  wrote:
> 
> From: Tom Rini 
> 
> Ad-hoc bindings that are not part of the upstream device tree / bindings
> are not allowed in-tree.  Only bindings that are in-progress with
> upstream and then re-synced once agreed upon are.
> 
> This reverts commit af288cb291da3abef6be0875527729296f7de7a0.
> 
> Cc: Hou Zhiqiang 
> Cc: Priyanka Jain 
> Reported-by: Michael Walle 
> Signed-off-by: Tom Rini 
> ---
>  arch/arm/cpu/armv8/fsl-layerscape/soc.c | 18 +-
>  arch/arm/dts/fsl-ls1028a.dtsi   |  6 --
>  arch/arm/dts/fsl-ls1088a.dtsi   |  6 --
>  arch/arm/dts/fsl-ls2080a.dtsi   |  6 --
>  arch/arm/dts/fsl-lx2160a.dtsi   |  6 --
>  5 files changed, 1 insertion(+), 41 deletions(-)

Acked-by: Marc Zyngier 

I have a number of comments on the second patch, but getting rid of
this gunk is a good start.

Thanks,

M.

-- 
Without deviation from the norm, progress is not possible.

[PATCH 1/2] Revert "arm64: Layerscape: Survive LPI one-way reset workaround"

[Michael Walle]

From: Tom Rini 

Ad-hoc bindings that are not part of the upstream device tree / bindings
are not allowed in-tree.  Only bindings that are in-progress with
upstream and then re-synced once agreed upon are.

This reverts commit af288cb291da3abef6be0875527729296f7de7a0.

Cc: Hou Zhiqiang 
Cc: Priyanka Jain 
Reported-by: Michael Walle 
Signed-off-by: Tom Rini 
---
 arch/arm/cpu/armv8/fsl-layerscape/soc.c | 18 +-
 arch/arm/dts/fsl-ls1028a.dtsi   |  6 --
 arch/arm/dts/fsl-ls1088a.dtsi   |  6 --
 arch/arm/dts/fsl-ls2080a.dtsi   |  6 --
 arch/arm/dts/fsl-lx2160a.dtsi   |  6 --
 5 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c 
b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
index 9820d3290e..c0e100d21c 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c
@@ -43,23 +43,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #ifdef CONFIG_GIC_V3_ITS
 int ls_gic_rd_tables_init(void *blob)
 {
-   struct fdt_memory lpi_base;
-   fdt_addr_t addr;
-   fdt_size_t size;
-   int offset, ret;
-
-   offset = fdt_path_offset(gd->fdt_blob, "/syscon@0x8000");
-   addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, offset, "reg",
- 0, , false);
-
-   lpi_base.start = addr;
-   lpi_base.end = addr + size - 1;
-   ret = fdtdec_add_reserved_memory(blob, "lpi_rd_table", _base, NULL,
-0, NULL, 0);
-   if (ret) {
-   debug("%s: failed to add reserved memory\n", __func__);
-   return ret;
-   }
+   int ret;
 
ret = gic_lpi_tables_init();
if (ret)
diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi
index 50f9b527cd..53b052ed32 100644
--- a/arch/arm/dts/fsl-ls1028a.dtsi
+++ b/arch/arm/dts/fsl-ls1028a.dtsi
@@ -44,12 +44,6 @@
 IRQ_TYPE_LEVEL_LOW)>;
};
 
-   gic_lpi_base: syscon@0x8000 {
-   compatible = "gic-lpi-base";
-   reg = <0x0 0x8000 0x0 0x10>;
-   max-gic-redistributors = <2>;
-   };
-
timer {
compatible = "arm,armv8-timer";
interrupts = ;
};
 
-   gic_lpi_base: syscon@0x8000 {
-   compatible = "gic-lpi-base";
-   reg = <0x0 0x8000 0x0 0x10>;
-   max-gic-redistributors = <8>;
-   };
-
timer {
compatible = "arm,armv8-timer";
interrupts = <1 13 0x8>, /* Physical Secure PPI, active-low */
diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi
index 7374d580e0..278daeeb6e 100644
--- a/arch/arm/dts/fsl-ls2080a.dtsi
+++ b/arch/arm/dts/fsl-ls2080a.dtsi
@@ -27,12 +27,6 @@
interrupts = <1 9 0x4>;
};
 
-   gic_lpi_base: syscon@0x8000 {
-   compatible = "gic-lpi-base";
-   reg = <0x0 0x8000 0x0 0x10>;
-   max-gic-redistributors = <8>;
-   };
-
timer {
compatible = "arm,armv8-timer";
interrupts = <1 13 0x8>, /* Physical Secure PPI, active-low */
diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi
index a6f0e9bc56..3b5f0d119e 100644
--- a/arch/arm/dts/fsl-lx2160a.dtsi
+++ b/arch/arm/dts/fsl-lx2160a.dtsi
@@ -43,12 +43,6 @@
interrupts = <1 9 0x4>;
};
 
-   gic_lpi_base: syscon@0x8000 {
-   compatible = "gic-lpi-base";
-   reg = <0x0 0x8000 0x0 0x20>;
-   max-gic-redistributors = <16>;
-   };
-
timer {
compatible = "arm,armv8-timer";
interrupts = <1 13 0x8>, /* Physical Secure PPI, active-low */
-- 
2.30.2