Skip to contentSkip to conversation

Add support for IBM Genesis3

PATCH Superseded Patrick Rudolph 3 participants 8 messages May 23, 2022 – May 24, 2022

Subsystems (3)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v4 cover Add support for IBM Genesis3

v4:
- Rebase on upstream
- Drop defconfig and add it on openbmc instead
- Rename Kconfig for debug uart

v3:
- Drop FIRMWARE_2ND_BOOT patch
- Include reference board DTS instead of copying it
- Rename DTS to ast2500-<boardname>
- Describe defconfig changes in commit message

v2:
- Fix whitespace and compatible in DTS
- Remove board stub
- Improve commit message
- Rewrite FIRMWARE_2ND_BOOT support
- Update defconfig

Patrick Rudolph (2):
arm/dts: Add IBM Genesis3 board
arm/mach-aspeed: Add support for CONFIG_ASPEED_DEBUG_UART_TO_UART1

 arch/arm/dts/Makefile                   |  1 +
 arch/arm/dts/ast2500-genesis3.dts       | 28 +++++++++++++++++++++++++
 arch/arm/mach-aspeed/Kconfig            |  5 +++++
 arch/arm/mach-aspeed/ast2500/platform.S |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/ast2500-genesis3.dts
Signature · 1 line
2.35.3
#1 lore raw

PATCH v4 1/2 arm/dts: Add IBM Genesis3 board

Add devicetree source file. It uses the evb-ast2500 board files.

---
 arch/arm/dts/Makefile             |  1 +
 arch/arm/dts/ast2500-genesis3.dts | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 arch/arm/dts/ast2500-genesis3.dts
arch/arm/dts/Makefile +1 -0
index 3515100c65..ed9714d832 100755
@@ -678,6 +678,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
 	ast2400-evb.dtb \
 	ast2400-ahe-50dc.dtb \
 	ast2500-evb.dtb \
+	ast2500-genesis3.dtb \
 	ast2600a0-evb.dtb \
 	ast2600a1-evb.dtb \
 	ast2600-bletchley.dtb \
arch/arm/dts/ast2500-genesis3.dts new file +28 -0
new file mode 100644
index 0000000000..544758c5b8
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * IBM Genesis3
+ *
+ * Copyright (C) 2022 9elements GmbH
+ */
+
+#include "ast2500-evb.dts"
+
+/ {
+	model = "IBM Genesis3";
+	compatible = "ibm,genesis3-bmc", "aspeed,ast2500";
+};
+
+&spi1 {
+	status = "disabled";
+};
+
+&fmc {
+	flash@0 {
+		compatible = "spansion,s25fl256l", "spi-flash";
+	};
+
+	flash@1 {
+		compatible = "spansion,s25fl256l", "spi-flash";
+	};
+};
+
Signature · 1 line
2.35.3
Reviewed-by on v4 1/2
#2 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc v4 1/2] arm/dts: Add IBM Genesis3 board

Quoted 9 lines · Patrick Rudolph

Add devicetree source file. It uses the evb-ast2500 board files.

---
arch/arm/dts/Makefile | 1 +
arch/arm/dts/ast2500-genesis3.dts | 28 ++++++++++++++++++++++++++++

2 files changed, 29 insertions(+)

create mode 100644 arch/arm/dts/ast2500-genesis3.dts

#3 lore raw

PATCH v4 2/2 arm/mach-aspeed: Add support for CONFIG_ASPEED_DEBUG_UART_TO_UART1

In reply to Patrick Rudolph

Introduce CONFIG_ASPEED_DEBUG_UART_TO_UART1 and reuse existing platform code to route the debug uart to RDX1/TDX1.
This is required on IBM/Genesis3 as it uses RDX1/TDX1 as debug uart.

---
 arch/arm/mach-aspeed/Kconfig            | 5 +++++
 arch/arm/mach-aspeed/ast2500/platform.S | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-aspeed/Kconfig +5 -0
index edb5520aec..a38f070381 100644
@@ -82,6 +82,11 @@ config ASPEED_ENABLE_DEBUG_UART
 	  systems, but may be useful to enable for debugging during
 	  development.
 
+config ASPEED_DEBUG_UART_TO_UART1
+	bool "Route debug UART to UART1"
+	depends on ASPEED_AST2500
+	help
+	  Route debug UART to TXD1/RXD1 pins.
 endif
 
 config ASPEED_PALLADIUM
arch/arm/mach-aspeed/ast2500/platform.S +1 -1
index aef55c4a0a..a97ebebcca 100644
@@ -795,7 +795,7 @@ wait_ddr_reset:
     /* end delay 10ms */
 
 /* Debug - UART console message */
-#ifdef CONFIG_DRAM_UART_TO_UART1
+#ifdef CONFIG_ASPEED_DEBUG_UART_TO_UART1
     ldr   r0, =0x1e78909c                        @ route UART5 to UART Port1, 2016.08.29
     ldr   r1, =0x10000004
     str   r1, [r0]
Signature · 1 line
2.35.3
#4 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc v4 2/2] arm/mach-aspeed: Add support for CONFIG_ASPEED_DEBUG_UART_TO_UART1

Quoted 16 lines · Patrick Rudolph

Introduce CONFIG_ASPEED_DEBUG_UART_TO_UART1 and reuse existing platform code to route the debug uart to RDX1/TDX1.
This is required on IBM/Genesis3 as it uses RDX1/TDX1 as debug uart.

---
arch/arm/mach-aspeed/Kconfig | 5 +++++
arch/arm/mach-aspeed/ast2500/platform.S | 2 +-

2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-aspeed/Kconfig +0 -0
index edb5520aec..a38f070381 100644

arch/arm/mach-aspeed/Kconfig config ASPEED_ENABLE_DEBUG_UART · line 89

Quoted 8 lines
arch/arm/mach-aspeed/Kconfig +5 -0
@@ -82,6 +82,11 @@ config ASPEED_ENABLE_DEBUG_UART
 	  systems, but may be useful to enable for debugging during
 	  development.
 
+config ASPEED_DEBUG_UART_TO_UART1
+	bool "Route debug UART to UART1"
+	depends on ASPEED_AST2500
+	help
+	  Route debug UART to TXD1/RXD1 pins.

Any reason not to put this in 'if ASPEED_ENABLE_DEBUG_UART' as suggested in the previous review? And since that one already has the ASPEED_AST2500 dependency, I think it'd obviate the need to have that specified on ASPEED_DEBUG_UART_TO_UART1.

While we're at it, slightly more detail in the help text would good I think, perhaps just "... instead of the default TXD5/RXD5."

Though actually, looking at the datasheet I'm now not certain if this does exactly what I had been thinking previously -- if I'm understanding it right, it's not so much switching the debug-UART functionality from UART5 to UART1, it's re-routing UART5 itself to the I/Os typically used for UART1? Which seems somewhat different, and I guess would ultimately be independent of the debug-UART itself being enabled or disabled, in which case maybe what I said earlier wasn't entirely appropriate...maybe someone with more expertise on the ast2500 UARTs (e.g. Andrew?) can weigh in?

Quoted 19 lines

endif

config ASPEED_PALLADIUM

arch/arm/mach-aspeed/ast2500/platform.S +1 -1
index aef55c4a0a..a97ebebcca 100644
@@ -795,7 +795,7 @@ wait_ddr_reset:
    /* end delay 10ms */
 
 /* Debug - UART console message */
-#ifdef CONFIG_DRAM_UART_TO_UART1
+#ifdef CONFIG_ASPEED_DEBUG_UART_TO_UART1
    ldr   r0, =0x1e78909c                        @ route UART5 to UART Port1, 2016.08.29
    ldr   r1, =0x10000004
    str   r1, [r0]
Signature · 1 line
2.35.3
#5 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc v4 2/2] arm/mach-aspeed: Add support for CONFIG_ASPEED_DEBUG_UART_TO_UART1

Quoted 44 lines · Zev Weiss
Quoted 16 lines · Patrick Rudolph

Introduce CONFIG_ASPEED_DEBUG_UART_TO_UART1 and reuse existing platform code to route the debug uart to RDX1/TDX1.
This is required on IBM/Genesis3 as it uses RDX1/TDX1 as debug uart.

---
arch/arm/mach-aspeed/Kconfig | 5 +++++
arch/arm/mach-aspeed/ast2500/platform.S | 2 +-

2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-aspeed/Kconfig +0 -0
index edb5520aec..a38f070381 100644

arch/arm/mach-aspeed/Kconfig config ASPEED_ENABLE_DEBUG_UART · line 89

Quoted 8 lines
arch/arm/mach-aspeed/Kconfig +5 -0
@@ -82,6 +82,11 @@ config ASPEED_ENABLE_DEBUG_UART
        systems, but may be useful to enable for debugging during
        development.
 
+config ASPEED_DEBUG_UART_TO_UART1
+      bool "Route debug UART to UART1"
+      depends on ASPEED_AST2500
+      help
+        Route debug UART to TXD1/RXD1 pins.

Any reason not to put this in 'if ASPEED_ENABLE_DEBUG_UART' as suggested in the previous review? And since that one already has the ASPEED_AST2500 dependency, I think it'd obviate the need to have that specified on ASPEED_DEBUG_UART_TO_UART1.

While we're at it, slightly more detail in the help text would good I think, perhaps just "... instead of the default TXD5/RXD5."

Though actually, looking at the datasheet I'm now not certain if this does exactly what I had been thinking previously -- if I'm understanding it right, it's not so much switching the debug-UART functionality from UART5 to UART1, it's re-routing UART5 itself to the I/Os typically used for UART1? Which seems somewhat different, and I guess would ultimately be independent of the debug-UART itself being enabled or disabled, in which case maybe what I said earlier wasn't entirely appropriate...maybe someone with more expertise on the ast2500 UARTs (e.g. Andrew?) can weigh in?

Quoted 1 line

As I understand it only re-routes the UART5 to UART1 I/Os. However it

doesn't make any
sense to re-route the UART5 if it's disabled.
I'll push a new patch.

Quoted 21 lines

endif

Review

Quoted 3 lines

config ASPEED_PALLADIUM

(quoted diff) +0 -0

b/arch/arm/mach-aspeed/ast2500/platform.S

arch/arm/mach-aspeed/ast2500/platform.S wait_ddr_reset: · line 799

Quoted 10 lines

index aef55c4a0a..a97ebebcca 100644

arch/arm/mach-aspeed/ast2500/platform.S +1 -1
@@ -795,7 +795,7 @@ wait_ddr_reset:
    /* end delay 10ms */
 
 /* Debug - UART console message */
-#ifdef CONFIG_DRAM_UART_TO_UART1
+#ifdef CONFIG_ASPEED_DEBUG_UART_TO_UART1
    ldr   r0, =0x1e78909c                        @ route UART5 to UART

Port1, 2016.08.29

Quoted 5 lines
arch/arm/mach-aspeed/ast2500/platform.S +0 -1
    ldr   r1, =0x10000004
    str   r1, [r0]
--

2.35.3

#6 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc v4 2/2] arm/mach-aspeed: Add support for CONFIG_ASPEED_DEBUG_UART_TO_UART1

Quoted 46 lines · Patrick Rudolph
Quoted 44 lines · Zev Weiss
Quoted 16 lines · Patrick Rudolph

Introduce CONFIG_ASPEED_DEBUG_UART_TO_UART1 and reuse existing platform code to route the debug uart to RDX1/TDX1.
This is required on IBM/Genesis3 as it uses RDX1/TDX1 as debug uart.

---
arch/arm/mach-aspeed/Kconfig | 5 +++++
arch/arm/mach-aspeed/ast2500/platform.S | 2 +-

2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-aspeed/Kconfig +0 -0
index edb5520aec..a38f070381 100644

arch/arm/mach-aspeed/Kconfig config ASPEED_ENABLE_DEBUG_UART · line 89

Quoted 8 lines
arch/arm/mach-aspeed/Kconfig +5 -0
@@ -82,6 +82,11 @@ config ASPEED_ENABLE_DEBUG_UART
        systems, but may be useful to enable for debugging during
        development.
 
+config ASPEED_DEBUG_UART_TO_UART1
+      bool "Route debug UART to UART1"
+      depends on ASPEED_AST2500
+      help
+        Route debug UART to TXD1/RXD1 pins.

Any reason not to put this in 'if ASPEED_ENABLE_DEBUG_UART' as suggested in the previous review? And since that one already has the ASPEED_AST2500 dependency, I think it'd obviate the need to have that specified on ASPEED_DEBUG_UART_TO_UART1.

While we're at it, slightly more detail in the help text would good I think, perhaps just "... instead of the default TXD5/RXD5."

Though actually, looking at the datasheet I'm now not certain if this does exactly what I had been thinking previously -- if I'm understanding it right, it's not so much switching the debug-UART functionality from UART5 to UART1, it's re-routing UART5 itself to the I/Os typically used for UART1? Which seems somewhat different, and I guess would ultimately be independent of the debug-UART itself being enabled or disabled, in which case maybe what I said earlier wasn't entirely appropriate...maybe someone with more expertise on the ast2500 UARTs (e.g. Andrew?) can weigh in?

Quoted 5 lines
Quoted 1 line

As I understand it only re-routes the UART5 to UART1 I/Os. However it

doesn't make any
sense to re-route the UART5 if it's disabled.
I'll push a new patch.

Bear in mind that there's a difference between UART5 and the debug-UART feature that can be enabled -- UART5 is a UART pretty much like all the others, but it happens to be the one on which the debug feature operates by default (listening for a secret password and providing access to various special operations via a simple command-line interface). Even with CONFIG_ASPEED_ENABLE_DEBUG_UART=n, UART5 is still available for use as a normal UART, it just doesn't have that magic debug capability turned on.

Zev

#7 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc v4 2/2] arm/mach-aspeed: Add support for CONFIG_ASPEED_DEBUG_UART_TO_UART1

Quoted 67 lines · Zev Weiss
Quoted 7 lines · Patrick Rudolph
Quoted 5 lines · Zev Weiss
Quoted 4 lines · Patrick Rudolph

Introduce CONFIG_ASPEED_DEBUG_UART_TO_UART1 and reuse existing platform code to route the debug uart to RDX1/TDX1.
This is required on IBM/Genesis3 as it uses RDX1/TDX1 as debug uart.

Quoted 8 lines
Quoted 8 lines

Review

Quoted 8 lines

---
arch/arm/mach-aspeed/Kconfig | 5 +++++
arch/arm/mach-aspeed/ast2500/platform.S | 2 +-

2 files changed, 6 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm/mach-aspeed/Kconfig

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

index edb5520aec..a38f070381 100644

arch/arm/mach-aspeed/Kconfig +0 -0
@@ -82,6 +82,11 @@ config ASPEED_ENABLE_DEBUG_UART
        systems, but may be useful to enable for debugging during
        development.
 
Quoted 7 lines
Quoted 7 lines

arch/arm/mach-aspeed/Kconfig config ASPEED_ENABLE_DEBUG_UART · line 89

Quoted 5 lines
arch/arm/mach-aspeed/Kconfig +5 -0
+config ASPEED_DEBUG_UART_TO_UART1
+      bool "Route debug UART to UART1"
+      depends on ASPEED_AST2500
+      help
+        Route debug UART to TXD1/RXD1 pins.

Any reason not to put this in 'if ASPEED_ENABLE_DEBUG_UART' as

suggested

Quoted 9 lines
Quoted 9 lines

in the previous review? And since that one already has the ASPEED_AST2500 dependency, I think it'd obviate the need to have that specified on ASPEED_DEBUG_UART_TO_UART1.

While we're at it, slightly more detail in the help text would good I think, perhaps just "... instead of the default TXD5/RXD5."

Though actually, looking at the datasheet I'm now not certain if this does exactly what I had been thinking previously -- if I'm

understanding

Quoted 3 lines
Quoted 3 lines

it right, it's not so much switching the debug-UART functionality from UART5 to UART1, it's re-routing UART5 itself to the I/Os typically used for UART1? Which seems somewhat different, and I guess would

ultimately

Quoted 2 lines
Quoted 2 lines

be independent of the debug-UART itself being enabled or disabled, in which case maybe what I said earlier wasn't entirely

appropriate...maybe

Quoted 8 lines
Quoted 4 lines

someone with more expertise on the ast2500 UARTs (e.g. Andrew?) can weigh in?

As I understand it only re-routes the UART5 to UART1 I/Os. However it

doesn't make any
sense to re-route the UART5 if it's disabled.
I'll push a new patch.

Bear in mind that there's a difference between UART5 and the debug-UART feature that can be enabled -- UART5 is a UART pretty much like all the others, but it happens to be the one on which the debug feature operates by default (listening for a secret password and providing access to various special operations via a simple command-line interface). Even with CONFIG_ASPEED_ENABLE_DEBUG_UART=n, UART5 is still available for use as a normal UART, it just doesn't have that magic debug capability turned on.

Quoted 1 line

Oh, I didn't know that. With that knowledge there should be no need to

depend on the
CONFIG_ASPEED_ENABLE_DEBUG_UART when re-routing uart5. I'll try another aproach.

Quoted 4 lines

Zev