Skip to contentSkip to conversation

arm/dts: Add Genesis3 board

PATCH Superseded Patrick Rudolph 3 participants 11 messages Apr 21, 2022 – Apr 26, 2022

Subsystems (3)

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 arm/dts: Add Genesis3 board

Add IBM Genesis3 board and devicetree source file.

---
 arch/arm/dts/Makefile                |  1 +
 arch/arm/dts/ibm-genesis3.dts        | 83 ++++++++++++++++++++++++++++
 arch/arm/mach-aspeed/ast2500/Kconfig | 11 ++++
 board/ibm/genesis3/Kconfig           | 13 +++++
 board/ibm/genesis3/Makefile          |  1 +
 board/ibm/genesis3/ibm_genesis3.c    |  5 ++
 include/configs/ibm_genesis3.h       | 19 +++++++
 7 files changed, 133 insertions(+)
 create mode 100644 arch/arm/dts/ibm-genesis3.dts
 create mode 100644 board/ibm/genesis3/Kconfig
 create mode 100644 board/ibm/genesis3/Makefile
 create mode 100644 board/ibm/genesis3/ibm_genesis3.c
 create mode 100644 include/configs/ibm_genesis3.h
arch/arm/dts/Makefile +1 -0
index a79f885f54..fae23e6bc1 100755
@@ -677,6 +677,7 @@ dtb-$(CONFIG_ARCH_BCM6858) += \
 dtb-$(CONFIG_ARCH_ASPEED) += \
 	ast2400-evb.dtb \
 	ast2500-evb.dtb \
+	ibm-genesis3.dtb \
 	ast2600a0-evb.dtb \
 	ast2600a1-evb.dtb \
 	ast2600-bletchley.dtb \
arch/arm/dts/ibm-genesis3.dts new file +83 -0

83 lines not on this page · raw message

arch/arm/mach-aspeed/ast2500/Kconfig +11 -0
index 4f992f442d..81c4fd0c2f 100644
@@ -15,8 +15,19 @@ config TARGET_EVB_AST2500
 	  It has 512M of RAM, 32M of SPI flash, two Ethernet ports,
 	  4 Serial ports, 4 USB ports, VGA port, PCIe, SD card slot,
 	  20 pin JTAG, pinouts for 14 I2Cs, 3 SPIs and eSPI, 8 PWMs.
+
+config TARGET_IBM_GENESIS3
+	bool "IBM-Genesis3"
+	help
+	  IBM Genesis3 is an IBM evaluation board for Intel Xeon
+	  and AST2500 BMC. It has 512M of RAM, 32M of SPI flash,
+	  two Ethernet ports, 1 debug uart, 1 USB ports and 1 PCIe
+	  port connected to the PCH.
+	  It has support for JTAG, pinouts for 9 I2Cs and eSPI.
+
 endchoice
 
 source "board/aspeed/evb_ast2500/Kconfig"
+source "board/ibm/genesis3/Kconfig"
 
 endif
board/ibm/genesis3/Kconfig new file +13 -0
new file mode 100644
index 0000000000..09fe60262b
@@ -0,0 +1,13 @@
+if TARGET_IBM_GENESIS3
+
+config SYS_BOARD
+	default "genesis3"
+
+config SYS_VENDOR
+	default "ibm"
+
+config SYS_CONFIG_NAME
+	string "board configuration name"
+	default "ibm_genesis3"
+
+endif
board/ibm/genesis3/Makefile new file +1 -0
new file mode 100644
index 0000000000..2bb8917fab
@@ -0,0 +1 @@
+obj-y += ibm_genesis3.o
board/ibm/genesis3/ibm_genesis3.c new file +5 -0
new file mode 100644
index 0000000000..9de8531806
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2022 9elements GmbH
+ */
+#include <common.h>
include/configs/ibm_genesis3.h new file +19 -0
new file mode 100644
index 0000000000..f40aeed8a9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2022 9elements GmbH.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <configs/aspeed-common.h>
+
+#define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE + 0x300000)
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x5000000)
+
+#define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE
+
+/* Memory Info */
+#define CONFIG_SYS_LOAD_ADDR		0x83000000
+
+#endif	/* __CONFIG_H */
Signature · 1 line
2.35.1
#1 lore raw

PATCH 2/4 arm/mach-aspeed: Add support for CONFIG_DRAM_UART_TO_UART1

Update the Kconfig and allow a board to use CONFIG_DRAM_UART_TO_UART1. This is required on IBM/Genesis3 as it uses RDX1/TDX1 as debug uart.

---
 arch/arm/mach-aspeed/ast2500/Kconfig | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm/mach-aspeed/ast2500/Kconfig +6 -0
index 81c4fd0c2f..232117b43c 100644
@@ -27,6 +27,12 @@ config TARGET_IBM_GENESIS3
 
 endchoice
 
+config DRAM_UART_TO_UART1
+	bool
+	prompt "Route debug UART to UART1"
+	help
+	  Route debug UART to TXD1/RXD1 pins.
+
 source "board/aspeed/evb_ast2500/Kconfig"
 source "board/ibm/genesis3/Kconfig"
 
Signature · 1 line
2.35.1
#2 lore raw

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

Quoted 3 lines · Patrick Rudolph

Update the Kconfig and allow a board to use CONFIG_DRAM_UART_TO_UART1. This is required on IBM/Genesis3 as it uses RDX1/TDX1 as debug uart.

Since I was a bit confused at first at seeing a new Kconfig symbol with no accompanying code to implement its functionality (until I grepped around a bit and saw why), it might be nice to note in the commit message that the logic to support this already exists in the ast2500 platform code and just didn't have an accompanying Kconfig option until now.

Quoted 25 lines

---
arch/arm/mach-aspeed/ast2500/Kconfig | 6 ++++++

1 file changed, 6 insertions(+)
arch/arm/mach-aspeed/ast2500/Kconfig +0 -0
index 81c4fd0c2f..232117b43c 100644
@@ -27,6 +27,12 @@ config TARGET_IBM_GENESIS3
 

endchoice

arch/arm/mach-aspeed/ast2500/Kconfig +6 -0
+config DRAM_UART_TO_UART1
+	bool
+	prompt "Route debug UART to UART1"
+	help
+	  Route debug UART to TXD1/RXD1 pins.
+

source "board/aspeed/evb_ast2500/Kconfig"
source "board/ibm/genesis3/Kconfig"

Signature · 1 line
2.35.1
#3 lore raw

PATCH 3/4 arm/mach-aspeed: Allow to disable WDT2

In reply to Patrick Rudolph

There's no working code to poke the WDT2 and it takes too long for the kernel to load to poke the watchdog. Selecting this Kconfig disables the WDT2 and prevents 2nd firmware from being launched during normal boot.

---
 arch/arm/mach-aspeed/ast2500/Kconfig    | 6 ++++++
 arch/arm/mach-aspeed/ast2500/platform.S | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)
arch/arm/mach-aspeed/ast2500/Kconfig +6 -0
index 232117b43c..a9d880e557 100644
@@ -33,6 +33,12 @@ config DRAM_UART_TO_UART1
 	help
 	  Route debug UART to TXD1/RXD1 pins.
 
+config FIRMWARE_DISABLE_2ND_BOOT
+	bool
+	prompt "Do not disable WDT2 for 2nd boot function"
+	help
+	  Do not disable WDT2 for 2nd boot function.
+
 source "board/aspeed/evb_ast2500/Kconfig"
 source "board/ibm/genesis3/Kconfig"
 
arch/arm/mach-aspeed/ast2500/platform.S +2 -4
index aef55c4a0a..3eb9ee9419 100644
@@ -95,7 +95,7 @@
  *    CONFIG_DDR3_8GSTACK         // DDR3 8Gbit Stack die
  *    CONFIG_DDR4_4GX8            // DDR4 4Gbit X8 dual part
  * 5. Firmware 2nd boot flash
- *    CONFIG_FIRMWARE_2ND_BOOT (Removed)
+ *    CONFIG_FIRMWARE_DISABLE_2ND_BOOT
  * 6. Enable DRAM extended temperature range mode
  *    CONFIG_DRAM_EXT_TEMP
  * 7. Select WDT_Full mode for power up initial reset
@@ -642,13 +642,11 @@ bypass_USB_init:
 /******************************************************************************
  Disable WDT2 for 2nd boot function
  ******************************************************************************/
-/*
-#ifndef CONFIG_FIRMWARE_2ND_BOOT
+#if CONFIG_FIRMWARE_DISABLE_2ND_BOOT
     ldr   r0, =0x1e78502c
     mov   r1, #0
     str   r1, [r0]
 #endif
-*/
 /******************************************************************************
  Disable WDT3 for SPI Address mode (3 or 4 bytes) detection function
  ******************************************************************************/
Signature · 1 line
2.35.1
#4 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc 3/4] arm/mach-aspeed: Allow to disable WDT2

Quoted 4 lines · Patrick Rudolph

There's no working code to poke the WDT2 and it takes too long for the kernel to load to poke the watchdog. Selecting this Kconfig disables the WDT2 and prevents 2nd firmware from being launched during normal boot.

I seem to recall Lei Yu (CCed) hitting problems with watchdog timeouts a little while back, which I think ended up being due to caches being disabled for some reason...have you done any measurements to try to determine what's causing it to take so long?

Quoted 11 lines

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

2 files changed, 8 insertions(+), 4 deletions(-)
arch/arm/mach-aspeed/ast2500/Kconfig +0 -0
index 232117b43c..a9d880e557 100644

arch/arm/mach-aspeed/ast2500/Kconfig config DRAM_UART_TO_UART1 · line 40

Quoted 8 lines
arch/arm/mach-aspeed/ast2500/Kconfig +5 -0
@@ -33,6 +33,12 @@ config DRAM_UART_TO_UART1
 	help
 	  Route debug UART to TXD1/RXD1 pins.
 
+config FIRMWARE_DISABLE_2ND_BOOT
+	bool
+	prompt "Do not disable WDT2 for 2nd boot function"
+	help
+	  Do not disable WDT2 for 2nd boot function.

This seems a bit confusing -- for one thing, the config symbol name and the prompt/help text sound like opposites (one says "disable", the others say "do not disable"). A slightly more detailed explanation might be good.

Quoted 35 lines
arch/arm/mach-aspeed/ast2500/Kconfig +1 -0
+

source "board/aspeed/evb_ast2500/Kconfig"
source "board/ibm/genesis3/Kconfig"

arch/arm/mach-aspeed/ast2500/platform.S +2 -4
index aef55c4a0a..3eb9ee9419 100644
@@ -95,7 +95,7 @@
 *    CONFIG_DDR3_8GSTACK         // DDR3 8Gbit Stack die
 *    CONFIG_DDR4_4GX8            // DDR4 4Gbit X8 dual part
 * 5. Firmware 2nd boot flash
- *    CONFIG_FIRMWARE_2ND_BOOT (Removed)
+ *    CONFIG_FIRMWARE_DISABLE_2ND_BOOT
 * 6. Enable DRAM extended temperature range mode
 *    CONFIG_DRAM_EXT_TEMP
 * 7. Select WDT_Full mode for power up initial reset
@@ -642,13 +642,11 @@ bypass_USB_init:
 /******************************************************************************
 Disable WDT2 for 2nd boot function
 ******************************************************************************/
-/*
-#ifndef CONFIG_FIRMWARE_2ND_BOOT
+#if CONFIG_FIRMWARE_DISABLE_2ND_BOOT
    ldr   r0, =0x1e78502c
    mov   r1, #0
    str   r1, [r0]
 #endif
-*/
 /******************************************************************************
 Disable WDT3 for SPI Address mode (3 or 4 bytes) detection function
 ******************************************************************************/
Signature · 1 line
2.35.1
maintainer
#5 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc 3/4] arm/mach-aspeed: Allow to disable WDT2

Quoted 11 lines · Zev Weiss
Quoted 4 lines · Patrick Rudolph

There's no working code to poke the WDT2 and it takes too long for the kernel to load to poke the watchdog. Selecting this Kconfig disables the WDT2 and prevents 2nd firmware from being launched during normal boot.

I seem to recall Lei Yu (CCed) hitting problems with watchdog timeouts a little while back, which I think ended up being due to caches being disabled for some reason...have you done any measurements to try to determine what's causing it to take so long?

Yes. Some work is required in this area:

- re-enable the dcache for the 2500. It works fine, and speeds up boot.

- pat the watchdog so it doesn't expire when loading, or sitting at
the command prompt

An alternative is to disable the watchdog as we've done here. I'd lean towards leaving it running (as then if there's a hang, the system will reobot and try again).

Quoted 15 lines
Quoted 15 lines

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

2 files changed, 8 insertions(+), 4 deletions(-)
arch/arm/mach-aspeed/ast2500/Kconfig +0 -0
index 232117b43c..a9d880e557 100644
@@ -33,6 +33,12 @@ config DRAM_UART_TO_UART1
      help
        Route debug UART to TXD1/RXD1 pins.
 
Quoted 10 lines

arch/arm/mach-aspeed/ast2500/Kconfig config DRAM_UART_TO_UART1 · line 40

Quoted 5 lines
arch/arm/mach-aspeed/ast2500/Kconfig +5 -0
+config FIRMWARE_DISABLE_2ND_BOOT
+      bool
+      prompt "Do not disable WDT2 for 2nd boot function"
+      help
+        Do not disable WDT2 for 2nd boot function.

This seems a bit confusing -- for one thing, the config symbol name and the prompt/help text sound like opposites (one says "disable", the others say "do not disable"). A slightly more detailed explanation might be good.

+1, can you explain why you renamed the option when adding it to kconfig?

Quoted 36 lines
Quoted 36 lines
arch/arm/mach-aspeed/ast2500/Kconfig +1 -0
+

source "board/aspeed/evb_ast2500/Kconfig"
source "board/ibm/genesis3/Kconfig"

arch/arm/mach-aspeed/ast2500/platform.S +2 -5
index aef55c4a0a..3eb9ee9419 100644
@@ -95,7 +95,7 @@
 *    CONFIG_DDR3_8GSTACK         // DDR3 8Gbit Stack die
 *    CONFIG_DDR4_4GX8            // DDR4 4Gbit X8 dual part
 * 5. Firmware 2nd boot flash
- *    CONFIG_FIRMWARE_2ND_BOOT (Removed)
+ *    CONFIG_FIRMWARE_DISABLE_2ND_BOOT
 * 6. Enable DRAM extended temperature range mode
 *    CONFIG_DRAM_EXT_TEMP
 * 7. Select WDT_Full mode for power up initial reset
@@ -642,13 +642,11 @@ bypass_USB_init:
 /******************************************************************************
 Disable WDT2 for 2nd boot function
 ******************************************************************************/
-/*
-#ifndef CONFIG_FIRMWARE_2ND_BOOT
+#if CONFIG_FIRMWARE_DISABLE_2ND_BOOT
    ldr   r0, =0x1e78502c
    mov   r1, #0
    str   r1, [r0]
 #endif
-*/
 /******************************************************************************
 Disable WDT3 for SPI Address mode (3 or 4 bytes) detection function
 ******************************************************************************/
--

2.35.1

#6 lore raw

Re: [PATCH u-boot v2019.04-aspeed-openbmc 3/4] arm/mach-aspeed: Allow to disable WDT2

Hi,
I enabled the DCACHE which seems to make it boot a bit faster.
As this is a evaluation platform and the successor is not using AST2500 any more so no further investigation had been done.

I've reworked the description and removed the double negation.

Regards,
Patrick Rudolph
B.Sc. Electrical Engineering
System Firmware Developer

9elements GmbH, Kortumstraße 19-21, 44787 Bochum, Germany
Email: [email protected]
Phone: +49 234 68 94 188

Sitz der Gesellschaft: Bochum
Handelsregister: Amtsgericht Bochum, HRB 17519
Geschäftsführung: Sebastian Deutsch, Eray Basar

Datenschutzhinweise nach Art. 13 DSGVO

Quoted 89 lines · Joel Stanley
Quoted 11 lines · Zev Weiss
Quoted 4 lines · Patrick Rudolph

There's no working code to poke the WDT2 and it takes too long for the kernel to load to poke the watchdog. Selecting this Kconfig disables the WDT2 and prevents 2nd firmware from being launched during normal boot.

I seem to recall Lei Yu (CCed) hitting problems with watchdog timeouts a little while back, which I think ended up being due to caches being disabled for some reason...have you done any measurements to try to determine what's causing it to take so long?

Yes. Some work is required in this area:

- re-enable the dcache for the 2500. It works fine, and speeds up boot.

- pat the watchdog so it doesn't expire when loading, or sitting at
the command prompt

An alternative is to disable the watchdog as we've done here. I'd lean towards leaving it running (as then if there's a hang, the system will reobot and try again).

Quoted 15 lines
Quoted 15 lines

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

2 files changed, 8 insertions(+), 4 deletions(-)
arch/arm/mach-aspeed/ast2500/Kconfig +0 -0
index 232117b43c..a9d880e557 100644
@@ -33,6 +33,12 @@ config DRAM_UART_TO_UART1
      help
        Route debug UART to TXD1/RXD1 pins.
 
Quoted 10 lines

arch/arm/mach-aspeed/ast2500/Kconfig config DRAM_UART_TO_UART1 · line 40

Quoted 5 lines
arch/arm/mach-aspeed/ast2500/Kconfig +5 -0
+config FIRMWARE_DISABLE_2ND_BOOT
+      bool
+      prompt "Do not disable WDT2 for 2nd boot function"
+      help
+        Do not disable WDT2 for 2nd boot function.

This seems a bit confusing -- for one thing, the config symbol name and the prompt/help text sound like opposites (one says "disable", the others say "do not disable"). A slightly more detailed explanation might be good.

+1, can you explain why you renamed the option when adding it to kconfig?

Quoted 36 lines
Quoted 36 lines
arch/arm/mach-aspeed/ast2500/Kconfig +1 -0
+

source "board/aspeed/evb_ast2500/Kconfig"
source "board/ibm/genesis3/Kconfig"

arch/arm/mach-aspeed/ast2500/platform.S +2 -5
index aef55c4a0a..3eb9ee9419 100644
@@ -95,7 +95,7 @@
 *    CONFIG_DDR3_8GSTACK         // DDR3 8Gbit Stack die
 *    CONFIG_DDR4_4GX8            // DDR4 4Gbit X8 dual part
 * 5. Firmware 2nd boot flash
- *    CONFIG_FIRMWARE_2ND_BOOT (Removed)
+ *    CONFIG_FIRMWARE_DISABLE_2ND_BOOT
 * 6. Enable DRAM extended temperature range mode
 *    CONFIG_DRAM_EXT_TEMP
 * 7. Select WDT_Full mode for power up initial reset
@@ -642,13 +642,11 @@ bypass_USB_init:
 /******************************************************************************
 Disable WDT2 for 2nd boot function
 ******************************************************************************/
-/*
-#ifndef CONFIG_FIRMWARE_2ND_BOOT
+#if CONFIG_FIRMWARE_DISABLE_2ND_BOOT
    ldr   r0, =0x1e78502c
    mov   r1, #0
    str   r1, [r0]
 #endif
-*/
 /******************************************************************************
 Disable WDT3 for SPI Address mode (3 or 4 bytes) detection function
 ******************************************************************************/
--

2.35.1

#7 lore raw

PATCH 4/4 configs: Add IBM Genesis3 defconfig

In reply to Patrick Rudolph
---
 configs/ibm_genesis3_defconfig | 72 ++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 configs/ibm_genesis3_defconfig
configs/ibm_genesis3_defconfig new file +72 -0
new file mode 100644
index 0000000000..b9520547a0
@@ -0,0 +1,72 @@
+CONFIG_SPI_BOOT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_LOG=y
+CONFIG_BOOTCOMMAND="bootm 20080000"
+CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw earlycon"
+# CONFIG_SYS_I2C_ASPEED is not set
+CONFIG_ASPEED_AHBC=y
+CONFIG_ARM=y
+CONFIG_ARCH_ASPEED=y
+CONFIG_SYS_TEXT_BASE=0x0
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0x60000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_FIT=y
+CONFIG_USE_BOOTARGS=y
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_PRE_CONSOLE_BUFFER=y
+CONFIG_PRE_CON_BUF_ADDR=0x1e720000
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
+CONFIG_HUSH_PARSER=y
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_SYS_PROMPT="ast# "
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_XIMG is not set
+CONFIG_CMD_MEMTEST=y
+CONFIG_SYS_ALT_MEMTEST=y
+CONFIG_CMD_CLK=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_DEFAULT_DEVICE_TREE="ibm-genesis3"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_USE_ENV_SPI_BUS=y
+CONFIG_ENV_SPI_BUS=0
+CONFIG_USE_ENV_SPI_CS=y
+CONFIG_ENV_SPI_CS=0
+CONFIG_USE_ENV_SPI_MAX_HZ=y
+CONFIG_ENV_SPI_MAX_HZ=50000000
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_REGMAP=y
+CONFIG_CLK=y
+CONFIG_DM_GPIO=y
+CONFIG_ASPEED_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_MISC=y
+CONFIG_DM_MMC=y
+# CONFIG_MMC is not set
+# CONFIG_CMD_MMC is not set
+# CONFIG_MMC_SDHCI is not set
+# CONFIG_MMC_SDHCI_ASPEED is not set
+# CONFIG_MMC_HW_PARTITIONING is not set
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_DM_ETH=y
+CONFIG_FTGMAC100=y
+# CONFIG_PHY is not set
+CONFIG_PINCTRL=y
+CONFIG_DM_SERIAL=y
+CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_SYSRESET=y
+CONFIG_TIMER=y
+CONFIG_WDT=y
+# CONFIG_EFI_LOADER is not set
+CONFIG_DRAM_UART_TO_UART1=y
+CONFIG_FIRMWARE_DISABLE_2ND_BOOT=y
+CONFIG_TARGET_IBM_GENESIS3=y
Signature · 1 line
2.35.1
#8 lore raw
In reply to Patrick Rudolph
Quoted 23 lines · Patrick Rudolph

Add IBM Genesis3 board and devicetree source file.

---

arch/arm/dts/Makefile                |  1 +
arch/arm/dts/ibm-genesis3.dts        | 83 ++++++++++++++++++++++++++++
arch/arm/mach-aspeed/ast2500/Kconfig | 11 ++++
board/ibm/genesis3/Kconfig           | 13 +++++
board/ibm/genesis3/Makefile          |  1 +
board/ibm/genesis3/ibm_genesis3.c    |  5 ++
include/configs/ibm_genesis3.h       | 19 +++++++
7 files changed, 133 insertions(+)

create mode 100644 arch/arm/dts/ibm-genesis3.dts create mode 100644 board/ibm/genesis3/Kconfig create mode 100644 board/ibm/genesis3/Makefile create mode 100644 board/ibm/genesis3/ibm_genesis3.c create mode 100644 include/configs/ibm_genesis3.h

arch/arm/dts/Makefile +0 -0
index a79f885f54..fae23e6bc1 100755

arch/arm/dts/Makefile dtb-$(CONFIG_ARCH_BCM6858) += \ · line 680

Quoted 4 lines
arch/arm/dts/Makefile +1 -0
@@ -677,6 +677,7 @@ dtb-$(CONFIG_ARCH_BCM6858) += \
 dtb-$(CONFIG_ARCH_ASPEED) += \
 	ast2400-evb.dtb \
 	ast2500-evb.dtb \
+	ibm-genesis3.dtb \

For consistency with the existing naming convention, maybe ast2500-genesis3 instead of ibm-genesis3?

Quoted 9 lines
arch/arm/dts/Makefile +0 -0
 	ast2600a0-evb.dtb \
 	ast2600a1-evb.dtb \
 	ast2600-bletchley.dtb \
arch/arm/dts/ibm-genesis3.dts new file +0 -0
new file mode 100644
index 0000000000..ba610c9032

arch/arm/dts/ibm-genesis3.dts line 7

Quoted 7 lines
arch/arm/dts/ibm-genesis3.dts new file +7 -0
@@ -0,0 +1,83 @@
+/dts-v1/;
+
+#include "ast2500-u-boot.dtsi"
+
+/ {
+        model = "IBM Genesis3";
+        compatible = "ibm,genesis3", "aspeed,ast2500";

Whitespace looks off on these two lines (spaces instead of tabs). Also, I think most BMC compatible strings have a "-bmc" suffix, FWIW.

Quoted 64 lines
arch/arm/dts/ibm-genesis3.dts new file +64 -0
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x20000000>;
+	};
+
+	chosen {
+		stdout-path = &uart5;
+	};
+
+	aliases {
+		spi0 = &fmc;
+		ethernet0 = &mac0;
+		ethernet1 = &mac1;
+	};
+};
+
+&uart5 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&sdrammc {
+	clock-frequency = <400000000>;
+};
+
+&wdt1 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&wdt2 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&wdt3 {
+	u-boot,dm-pre-reloc;
+	status = "okay";
+};
+
+&mac0 {
+	status = "okay";
+	phy-mode = "rgmii";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_mac1link_default &pinctrl_mdio1_default>;
+};
+
+&mac1 {
+	status = "okay";
+	phy-mode = "rgmii";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_mac2link_default &pinctrl_mdio2_default>;
+};
+
+&fmc {
+	status = "okay";
+	timing-calibration-disabled;
+	flash@0 {
+		compatible = "spi-flash", "spansion,s25fl256l";
+		status = "okay";
+		spi-max-frequency = <50000000>;
+		spi-tx-bus-width = <2>;

arch/arm/dts/ibm-genesis3.dts line 81

Quoted 10 lines
arch/arm/dts/ibm-genesis3.dts new file +10 -0
+		spi-rx-bus-width = <2>;
+	};
+
+	flash@1 {
+                compatible = "spi-flash", "spansion,s25fl256l";
+                status = "okay";
+                spi-max-frequency = <50000000>;
+                spi-tx-bus-width = <2>;
+                spi-rx-bus-width = <2>;
+        };

These lines appear to be space-indented again.

Quoted 9 lines
arch/arm/dts/ibm-genesis3.dts new file +2 -0
+};
+
arch/arm/mach-aspeed/ast2500/Kconfig +0 -0
index 4f992f442d..81c4fd0c2f 100644
@@ -15,8 +15,19 @@ config TARGET_EVB_AST2500
 	  It has 512M of RAM, 32M of SPI flash, two Ethernet ports,
 	  4 Serial ports, 4 USB ports, VGA port, PCIe, SD card slot,

arch/arm/mach-aspeed/ast2500/Kconfig config TARGET_EVB_AST2500 · line 26

Quoted 10 lines
arch/arm/mach-aspeed/ast2500/Kconfig +9 -0
 	  20 pin JTAG, pinouts for 14 I2Cs, 3 SPIs and eSPI, 8 PWMs.
+
+config TARGET_IBM_GENESIS3
+	bool "IBM-Genesis3"
+	help
+	  IBM Genesis3 is an IBM evaluation board for Intel Xeon
+	  and AST2500 BMC. It has 512M of RAM, 32M of SPI flash,
+	  two Ethernet ports, 1 debug uart, 1 USB ports and 1 PCIe
+	  port connected to the PCH.
+	  It has support for JTAG, pinouts for 9 I2Cs and eSPI.

Might as well take out the line-break before the last sentence?

Quoted 72 lines
arch/arm/mach-aspeed/ast2500/Kconfig +1 -0
+

endchoice

source "board/aspeed/evb_ast2500/Kconfig"
+source "board/ibm/genesis3/Kconfig"

endif

board/ibm/genesis3/Kconfig new file +13 -0
new file mode 100644
index 0000000000..09fe60262b
@@ -0,0 +1,13 @@
+if TARGET_IBM_GENESIS3
+
+config SYS_BOARD
+	default "genesis3"
+
+config SYS_VENDOR
+	default "ibm"
+
+config SYS_CONFIG_NAME
+	string "board configuration name"
+	default "ibm_genesis3"
+
+endif
board/ibm/genesis3/Makefile new file +1 -0
new file mode 100644
index 0000000000..2bb8917fab
@@ -0,0 +1 @@
+obj-y += ibm_genesis3.o
board/ibm/genesis3/ibm_genesis3.c new file +5 -0
new file mode 100644
index 0000000000..9de8531806
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2022 9elements GmbH
+ */
+#include <common.h>
include/configs/ibm_genesis3.h new file +19 -0
new file mode 100644
index 0000000000..f40aeed8a9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2022 9elements GmbH.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <configs/aspeed-common.h>
+
+#define CONFIG_SYS_MEMTEST_START	(CONFIG_SYS_SDRAM_BASE + 0x300000)
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x5000000)
+
+#define CONFIG_SYS_UBOOT_BASE		CONFIG_SYS_TEXT_BASE
+
+/* Memory Info */
+#define CONFIG_SYS_LOAD_ADDR		0x83000000
+
+#endif	/* __CONFIG_H */
Signature · 1 line
2.35.1
maintainer
#9 lore raw
In reply to Patrick Rudolph
Quoted 127 lines · Patrick Rudolph

Add IBM Genesis3 board and devicetree source file.

---
 arch/arm/dts/Makefile                |  1 +
 arch/arm/dts/ibm-genesis3.dts        | 83 ++++++++++++++++++++++++++++
 arch/arm/mach-aspeed/ast2500/Kconfig | 11 ++++
 board/ibm/genesis3/Kconfig           | 13 +++++
 board/ibm/genesis3/Makefile          |  1 +
 board/ibm/genesis3/ibm_genesis3.c    |  5 ++
 include/configs/ibm_genesis3.h       | 19 +++++++
 7 files changed, 133 insertions(+)
 create mode 100644 arch/arm/dts/ibm-genesis3.dts
 create mode 100644 board/ibm/genesis3/Kconfig
 create mode 100644 board/ibm/genesis3/Makefile
 create mode 100644 board/ibm/genesis3/ibm_genesis3.c
 create mode 100644 include/configs/ibm_genesis3.h
arch/arm/dts/Makefile +1 -0
index a79f885f54..fae23e6bc1 100755
@@ -677,6 +677,7 @@ dtb-$(CONFIG_ARCH_BCM6858) += \
 dtb-$(CONFIG_ARCH_ASPEED) += \
        ast2400-evb.dtb \
        ast2500-evb.dtb \
+       ibm-genesis3.dtb \
        ast2600a0-evb.dtb \
        ast2600a1-evb.dtb \
        ast2600-bletchley.dtb \
arch/arm/dts/ibm-genesis3.dts new file +83 -0
new file mode 100644
index 0000000000..ba610c9032
@@ -0,0 +1,83 @@
+/dts-v1/;
+
+#include "ast2500-u-boot.dtsi"
+
+/ {
+        model = "IBM Genesis3";
+        compatible = "ibm,genesis3", "aspeed,ast2500";
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000>;
+       };
+
+       chosen {
+               stdout-path = &uart5;
+       };
+
+       aliases {
+               spi0 = &fmc;
+               ethernet0 = &mac0;
+               ethernet1 = &mac1;
+       };
+};
+
+&uart5 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&sdrammc {
+       clock-frequency = <400000000>;
+};
+
+&wdt1 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&wdt2 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&wdt3 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&mac0 {
+       status = "okay";
+       phy-mode = "rgmii";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mac1link_default &pinctrl_mdio1_default>;
+};
+
+&mac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mac2link_default &pinctrl_mdio2_default>;
+};
+
+&fmc {
+       status = "okay";
+       timing-calibration-disabled;
+       flash@0 {
+               compatible = "spi-flash", "spansion,s25fl256l";
+               status = "okay";
+               spi-max-frequency = <50000000>;
+               spi-tx-bus-width = <2>;
+               spi-rx-bus-width = <2>;
+       };
+
+       flash@1 {
+                compatible = "spi-flash", "spansion,s25fl256l";
+                status = "okay";
+                spi-max-frequency = <50000000>;
+                spi-tx-bus-width = <2>;
+                spi-rx-bus-width = <2>;
+        };
+};
+
arch/arm/mach-aspeed/ast2500/Kconfig +0 -0
index 4f992f442d..81c4fd0c2f 100644
@@ -15,8 +15,19 @@ config TARGET_EVB_AST2500
          It has 512M of RAM, 32M of SPI flash, two Ethernet ports,
          4 Serial ports, 4 USB ports, VGA port, PCIe, SD card slot,

arch/arm/mach-aspeed/ast2500/Kconfig config TARGET_EVB_AST2500 · line 26

Quoted 10 lines
arch/arm/mach-aspeed/ast2500/Kconfig +9 -0
          20 pin JTAG, pinouts for 14 I2Cs, 3 SPIs and eSPI, 8 PWMs.
+
+config TARGET_IBM_GENESIS3
+       bool "IBM-Genesis3"
+       help
+         IBM Genesis3 is an IBM evaluation board for Intel Xeon
+         and AST2500 BMC. It has 512M of RAM, 32M of SPI flash,
+         two Ethernet ports, 1 debug uart, 1 USB ports and 1 PCIe
+         port connected to the PCH.
+         It has support for JTAG, pinouts for 9 I2Cs and eSPI.

Given this is another aspeed system, would it make sense to group it the same way we've grouped the existing boards under an "aspeed" prefix? (The rainier system is an IBM system, FWIW).

The board file looks to be similar enough to the existing evb-ast2500. Can you make a case for maintaining another one, or should we re-use what's there like the other platforms have done?

Quoted 72 lines
arch/arm/mach-aspeed/ast2500/Kconfig +2 -0
+
 endchoice
 
 source "board/aspeed/evb_ast2500/Kconfig"
+source "board/ibm/genesis3/Kconfig"
 
 endif
board/ibm/genesis3/Kconfig new file +13 -0
new file mode 100644
index 0000000000..09fe60262b
@@ -0,0 +1,13 @@
+if TARGET_IBM_GENESIS3
+
+config SYS_BOARD
+       default "genesis3"
+
+config SYS_VENDOR
+       default "ibm"
+
+config SYS_CONFIG_NAME
+       string "board configuration name"
+       default "ibm_genesis3"
+
+endif
board/ibm/genesis3/Makefile new file +1 -0
new file mode 100644
index 0000000000..2bb8917fab
@@ -0,0 +1 @@
+obj-y += ibm_genesis3.o
board/ibm/genesis3/ibm_genesis3.c new file +5 -0
new file mode 100644
index 0000000000..9de8531806
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2022 9elements GmbH
+ */
+#include <common.h>
include/configs/ibm_genesis3.h new file +19 -1
new file mode 100644
index 0000000000..f40aeed8a9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2022 9elements GmbH.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <configs/aspeed-common.h>
+
+#define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE + 0x300000)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x5000000)
+
+#define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
+
+/* Memory Info */
+#define CONFIG_SYS_LOAD_ADDR           0x83000000
+
+#endif /* __CONFIG_H */
--

2.35.1

#10 lore raw

Hi,
Thanks for the feedback. I fixed the DTS issues and dropped the mainboard stub.

Regards,
Patrick Rudolph
B.Sc. Electrical Engineering
System Firmware Developer

9elements GmbH, Kortumstraße 19-21, 44787 Bochum, Germany
Email: [email protected]
Phone: +49 234 68 94 188

Sitz der Gesellschaft: Bochum
Handelsregister: Amtsgericht Bochum, HRB 17519
Geschäftsführung: Sebastian Deutsch, Eray Basar

Datenschutzhinweise nach Art. 13 DSGVO

Quoted 221 lines · Joel Stanley
Quoted 127 lines · Patrick Rudolph

Add IBM Genesis3 board and devicetree source file.

---
 arch/arm/dts/Makefile                |  1 +
 arch/arm/dts/ibm-genesis3.dts        | 83 ++++++++++++++++++++++++++++
 arch/arm/mach-aspeed/ast2500/Kconfig | 11 ++++
 board/ibm/genesis3/Kconfig           | 13 +++++
 board/ibm/genesis3/Makefile          |  1 +
 board/ibm/genesis3/ibm_genesis3.c    |  5 ++
 include/configs/ibm_genesis3.h       | 19 +++++++
 7 files changed, 133 insertions(+)
 create mode 100644 arch/arm/dts/ibm-genesis3.dts
 create mode 100644 board/ibm/genesis3/Kconfig
 create mode 100644 board/ibm/genesis3/Makefile
 create mode 100644 board/ibm/genesis3/ibm_genesis3.c
 create mode 100644 include/configs/ibm_genesis3.h
arch/arm/dts/Makefile +1 -0
index a79f885f54..fae23e6bc1 100755
@@ -677,6 +677,7 @@ dtb-$(CONFIG_ARCH_BCM6858) += \
 dtb-$(CONFIG_ARCH_ASPEED) += \
        ast2400-evb.dtb \
        ast2500-evb.dtb \
+       ibm-genesis3.dtb \
        ast2600a0-evb.dtb \
        ast2600a1-evb.dtb \
        ast2600-bletchley.dtb \
arch/arm/dts/ibm-genesis3.dts new file +83 -0
new file mode 100644
index 0000000000..ba610c9032
@@ -0,0 +1,83 @@
+/dts-v1/;
+
+#include "ast2500-u-boot.dtsi"
+
+/ {
+        model = "IBM Genesis3";
+        compatible = "ibm,genesis3", "aspeed,ast2500";
+
+       memory {
+               device_type = "memory";
+               reg = <0x80000000 0x20000000>;
+       };
+
+       chosen {
+               stdout-path = &uart5;
+       };
+
+       aliases {
+               spi0 = &fmc;
+               ethernet0 = &mac0;
+               ethernet1 = &mac1;
+       };
+};
+
+&uart5 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&sdrammc {
+       clock-frequency = <400000000>;
+};
+
+&wdt1 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&wdt2 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&wdt3 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&mac0 {
+       status = "okay";
+       phy-mode = "rgmii";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mac1link_default &pinctrl_mdio1_default>;
+};
+
+&mac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mac2link_default &pinctrl_mdio2_default>;
+};
+
+&fmc {
+       status = "okay";
+       timing-calibration-disabled;
+       flash@0 {
+               compatible = "spi-flash", "spansion,s25fl256l";
+               status = "okay";
+               spi-max-frequency = <50000000>;
+               spi-tx-bus-width = <2>;
+               spi-rx-bus-width = <2>;
+       };
+
+       flash@1 {
+                compatible = "spi-flash", "spansion,s25fl256l";
+                status = "okay";
+                spi-max-frequency = <50000000>;
+                spi-tx-bus-width = <2>;
+                spi-rx-bus-width = <2>;
+        };
+};
+
arch/arm/mach-aspeed/ast2500/Kconfig +0 -0
index 4f992f442d..81c4fd0c2f 100644
@@ -15,8 +15,19 @@ config TARGET_EVB_AST2500
          It has 512M of RAM, 32M of SPI flash, two Ethernet ports,
          4 Serial ports, 4 USB ports, VGA port, PCIe, SD card slot,

arch/arm/mach-aspeed/ast2500/Kconfig config TARGET_EVB_AST2500 · line 26

Quoted 10 lines
arch/arm/mach-aspeed/ast2500/Kconfig +9 -0
          20 pin JTAG, pinouts for 14 I2Cs, 3 SPIs and eSPI, 8 PWMs.
+
+config TARGET_IBM_GENESIS3
+       bool "IBM-Genesis3"
+       help
+         IBM Genesis3 is an IBM evaluation board for Intel Xeon
+         and AST2500 BMC. It has 512M of RAM, 32M of SPI flash,
+         two Ethernet ports, 1 debug uart, 1 USB ports and 1 PCIe
+         port connected to the PCH.
+         It has support for JTAG, pinouts for 9 I2Cs and eSPI.

Given this is another aspeed system, would it make sense to group it the same way we've grouped the existing boards under an "aspeed" prefix? (The rainier system is an IBM system, FWIW).

The board file looks to be similar enough to the existing evb-ast2500. Can you make a case for maintaining another one, or should we re-use what's there like the other platforms have done?

Quoted 72 lines
arch/arm/mach-aspeed/ast2500/Kconfig +2 -0
+
 endchoice
 
 source "board/aspeed/evb_ast2500/Kconfig"
+source "board/ibm/genesis3/Kconfig"
 
 endif
board/ibm/genesis3/Kconfig new file +13 -0
new file mode 100644
index 0000000000..09fe60262b
@@ -0,0 +1,13 @@
+if TARGET_IBM_GENESIS3
+
+config SYS_BOARD
+       default "genesis3"
+
+config SYS_VENDOR
+       default "ibm"
+
+config SYS_CONFIG_NAME
+       string "board configuration name"
+       default "ibm_genesis3"
+
+endif
board/ibm/genesis3/Makefile new file +1 -0
new file mode 100644
index 0000000000..2bb8917fab
@@ -0,0 +1 @@
+obj-y += ibm_genesis3.o
board/ibm/genesis3/ibm_genesis3.c new file +5 -0
new file mode 100644
index 0000000000..9de8531806
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright (c) 2022 9elements GmbH
+ */
+#include <common.h>
include/configs/ibm_genesis3.h new file +19 -1
new file mode 100644
index 0000000000..f40aeed8a9
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2022 9elements GmbH.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <configs/aspeed-common.h>
+
+#define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE + 0x300000)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 0x5000000)
+
+#define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
+
+/* Memory Info */
+#define CONFIG_SYS_LOAD_ADDR           0x83000000
+
+#endif /* __CONFIG_H */
--

2.35.1