Skip to contentSkip to conversation

Add new device Agilex7 support

PATCH New [email protected] 1 participant 7 messages Apr 23, 2023

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Add new device Agilex7 support

From: Sin Hui Kho <[email protected]>

*** BLURB HERE ***

Sin Hui Kho (6):
arm: socfpga: agilex7: Enable AGILEX7 SoC build
board: intel: agilex7: Add socdk board support for Intel AGILEX7 SoC
arm: dts: agilex7: Add base dtsi and devkit dts
arm: socfpga: agilex7: Add SPL for AGILEX7 SoC
arm: socfpga: agilex7: Add clock manager support for AGILEX7
arm: socfpga: agilex7: Add base address for AGILEX7

 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/socfpga_agilex7-u-boot.dtsi      |  98 +++
 arch/arm/dts/socfpga_agilex7.dtsi             | 627 ++++++++++++++++++
 .../arm/dts/socfpga_agilex7_socdk-u-boot.dtsi |  59 ++
 arch/arm/dts/socfpga_agilex7_socdk.dts        | 137 ++++
 arch/arm/mach-socfpga/Kconfig                 |  18 +
 arch/arm/mach-socfpga/Makefile                |  18 +-
 .../include/mach/base_addr_soc64.h            |   3 +-
 .../mach-socfpga/include/mach/clock_manager.h |   2 +-
 .../mach-socfpga/include/mach/handoff_soc64.h |   3 +-
 arch/arm/mach-socfpga/misc.c                  |   3 +
 arch/arm/mach-socfpga/spl_agilex7.c           |  87 +++
 board/intel/agilex7-socdk/MAINTAINERS         |   7 +
 board/intel/agilex7-socdk/Makefile            |   7 +
 board/intel/agilex7-socdk/socfpga.c           |   7 +
 configs/socfpga_agilex7_defconfig             |  95 +++
 drivers/clk/altera/Makefile                   |   1 +
 include/configs/socfpga_agilex7_socdk.h       |  12 +
 18 files changed, 1181 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/dts/socfpga_agilex7-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex7.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex7_socdk-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex7_socdk.dts
 create mode 100644 arch/arm/mach-socfpga/spl_agilex7.c
 create mode 100644 board/intel/agilex7-socdk/MAINTAINERS
 create mode 100644 board/intel/agilex7-socdk/Makefile
 create mode 100644 board/intel/agilex7-socdk/socfpga.c
 create mode 100644 configs/socfpga_agilex7_defconfig
 create mode 100644 include/configs/socfpga_agilex7_socdk.h
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/6 arm: socfpga: agilex7: Enable AGILEX7 SoC build

From: Sin Hui Kho <[email protected]>

Add build support for AGILEX7 SoC.

---
 arch/arm/mach-socfpga/Kconfig           | 18 +++++
 arch/arm/mach-socfpga/Makefile          | 14 +++-
 configs/socfpga_agilex7_defconfig       | 95 +++++++++++++++++++++++++
 include/configs/socfpga_agilex7_socdk.h | 12 ++++
 4 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 configs/socfpga_agilex7_defconfig
 create mode 100644 include/configs/socfpga_agilex7_socdk.h
arch/arm/mach-socfpga/Kconfig +18 -0
index 503c82d388..e3d4503168 100644
@@ -55,6 +55,17 @@ config TARGET_SOCFPGA_AGILEX
 	select SPL_CLK if SPL
 	select TARGET_SOCFPGA_SOC64
 
+config TARGET_SOCFPGA_AGILEX7
+	bool
+	select ARMV8_MULTIENTRY
+	select ARMV8_SET_SMPEN
+	select BINMAN if SPL_ATF
+	select CLK
+	select FPGA_INTEL_SDM_MAILBOX
+	select NCORE_CACHE
+	select SPL_CLK if SPL
+	select TARGET_SOCFPGA_SOC64
+
 config TARGET_SOCFPGA_ARRIA5
 	bool
 	select TARGET_SOCFPGA_GEN5
@@ -126,6 +137,10 @@ config TARGET_SOCFPGA_AGILEX_SOCDK
 	bool "Intel SOCFPGA SoCDK (Agilex)"
 	select TARGET_SOCFPGA_AGILEX
 
+config TARGET_SOCFPGA_AGILEX7_SOCDK
+	bool "Intel SOCFPGA SoCDK (Agilex7)"
+	select TARGET_SOCFPGA_AGILEX7
+
 config TARGET_SOCFPGA_ARIES_MCVEVK
 	bool "Aries MCVEVK (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
@@ -200,6 +215,7 @@ endchoice
 
 config SYS_BOARD
 	default "agilex-socdk" if TARGET_SOCFPGA_AGILEX_SOCDK
+	default "agilex7-socdk" if TARGET_SOCFPGA_AGILEX7_SOCDK
 	default "arria5-socdk" if TARGET_SOCFPGA_ARRIA5_SOCDK
 	default "arria10-socdk" if TARGET_SOCFPGA_ARRIA10_SOCDK
 	default "chameleonv3" if TARGET_SOCFPGA_CHAMELEONV3
@@ -221,6 +237,7 @@ config SYS_BOARD
 
 config SYS_VENDOR
 	default "intel" if TARGET_SOCFPGA_AGILEX_SOCDK
+	default "intel" if TARGET_SOCFPGA_AGILEX7_SOCDK
 	default "intel" if TARGET_SOCFPGA_N5X_SOCDK
 	default "altera" if TARGET_SOCFPGA_ARRIA5_SOCDK
 	default "altera" if TARGET_SOCFPGA_ARRIA10_SOCDK
@@ -243,6 +260,7 @@ config SYS_SOC
 
 config SYS_CONFIG_NAME
 	default "socfpga_agilex_socdk" if TARGET_SOCFPGA_AGILEX_SOCDK
+	default "socfpga_agilex7_socdk" if TARGET_SOCFPGA_AGILEX7_SOCDK
 	default "socfpga_arria5_secu1" if TARGET_SOCFPGA_ARRIA5_SECU1
 	default "socfpga_arria5_socdk" if TARGET_SOCFPGA_ARRIA5_SOCDK
 	default "socfpga_arria10_socdk" if TARGET_SOCFPGA_ARRIA10_SOCDK
arch/arm/mach-socfpga/Makefile +13 -1
index ec38b64dd4..2b26be3f41 100644
@@ -4,7 +4,7 @@
 # Wolfgang Denk, DENX Software Engineering, [email protected].
 #
 # Copyright (C) 2012-2017 Altera Corporation <www.altera.com>
-# Copyright (C) 2017-2021 Intel Corporation <www.intel.com>
+# Copyright (C) 2017-2023 Intel Corporation <www.intel.com>
 
 obj-y	+= board.o
 obj-y	+= clock_manager.o
@@ -71,6 +71,18 @@ obj-y	+= wrap_handoff_soc64.o
 obj-y	+= wrap_pll_config_soc64.o
 endif
 
+ifdef CONFIG_TARGET_SOCFPGA_AGILEX7
+obj-y	+= lowlevel_init_soc64.o
+obj-y	+= mailbox_s10.o
+obj-y	+= misc_soc64.o
+obj-y	+= mmu-arm64_s10.o
+obj-y	+= reset_manager_s10.o
+obj-y	+= system_manager_soc64.o
+obj-y	+= timer_s10.o
+obj-y	+= wrap_handoff_soc64.o
+obj-y	+= wrap_pll_config_soc64.o
+endif
+
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_TARGET_SOCFPGA_GEN5
 obj-y	+= spl_gen5.o
configs/socfpga_agilex7_defconfig new file +95 -0

95 lines not on this page · raw message

include/configs/socfpga_agilex7_socdk.h new file +12 -0
new file mode 100644
index 0000000000..7fdc0e0449
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * Copyright (C) 2023 Intel Corporation <www.intel.com>
+ *
+ */
+
+#ifndef __CONFIG_SOCFGPA_AGILEX7_H__
+#define __CONFIG_SOCFGPA_AGILEX7_H__
+
+#include <configs/socfpga_soc64_common.h>
+
+#endif	/* __CONFIG_SOCFGPA_AGILEX7_H__ */
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/6 board: intel: agilex7: Add socdk board support for Intel AGILEX7 SoC

In reply to [email protected]

From: Sin Hui Kho <[email protected]>

Add socdk board support for Intel AGILEX7 SoC

---
 board/intel/agilex7-socdk/MAINTAINERS | 7 +++++++
 board/intel/agilex7-socdk/Makefile    | 7 +++++++
 board/intel/agilex7-socdk/socfpga.c   | 7 +++++++
 3 files changed, 21 insertions(+)
 create mode 100644 board/intel/agilex7-socdk/MAINTAINERS
 create mode 100644 board/intel/agilex7-socdk/Makefile
 create mode 100644 board/intel/agilex7-socdk/socfpga.c
board/intel/agilex7-socdk/MAINTAINERS new file +7 -0
new file mode 100644
index 0000000000..8a9d178c3e
@@ -0,0 +1,7 @@
+SOCFPGA BOARD
+M:	Tien Fong Chee <[email protected]>
+M:	Sin Hui Kho <[email protected]>
+S:	Maintained
+F:	board/intel/agilex7-socdk/
+F:	include/configs/socfpga_agilex7_socdk.h
+F:	configs/socfpga_agilex7_defconfig
board/intel/agilex7-socdk/Makefile new file +7 -0
new file mode 100644
index 0000000000..abbcbc6e2d
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2023 Intel Corporation <www.intel.com>
+#
+# SPDX-License-Identifier:	GPL-2.0
+#
+
+obj-y	:= socfpga.o
board/intel/agilex7-socdk/socfpga.c new file +7 -0
new file mode 100644
index 0000000000..df6a34109d
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2023 Intel Corporation <www.intel.com>
+ *
+ */
+
+#include <common.h>
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/6 arm: dts: agilex7: Add base dtsi and devkit dts

In reply to [email protected]

From: Sin Hui Kho <[email protected]>

Add device tree files for AGILEX7 SoC platform.
All clock setting is reuse from Agilex.

---
 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/socfpga_agilex7-u-boot.dtsi      |  98 +++
 arch/arm/dts/socfpga_agilex7.dtsi             | 627 ++++++++++++++++++
 .../arm/dts/socfpga_agilex7_socdk-u-boot.dtsi |  59 ++
 arch/arm/dts/socfpga_agilex7_socdk.dts        | 137 ++++
 5 files changed, 922 insertions(+)
 create mode 100644 arch/arm/dts/socfpga_agilex7-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex7.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex7_socdk-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex7_socdk.dts
arch/arm/dts/Makefile +1 -0
index c160e884bf..00cfd2566a 100644
@@ -446,6 +446,7 @@ dtb-$(CONFIG_TARGET_THUNDERX_88XX) += thunderx-88xx.dtb
 
 dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
 	socfpga_agilex_socdk.dtb			\
+	socfpga_agilex7_socdk.dtb			\
 	socfpga_arria5_secu1.dtb			\
 	socfpga_arria5_socdk.dtb			\
 	socfpga_arria10_chameleonv3_270_2.dtb		\
arch/arm/dts/socfpga_agilex7-u-boot.dtsi new file +98 -0

98 lines not on this page · raw message

arch/arm/dts/socfpga_agilex7.dtsi new file +627 -0

627 lines not on this page · raw message

arch/arm/dts/socfpga_agilex7_socdk-u-boot.dtsi new file +59 -0

59 lines not on this page · raw message

arch/arm/dts/socfpga_agilex7_socdk.dts new file +137 -0

137 lines not on this page · raw message

Signature · 1 line
2.25.1
#4 lore raw

PATCH 4/6 arm: socfpga: agilex7: Add SPL for AGILEX7 SoC

In reply to [email protected]

From: Sin Hui Kho <[email protected]>

Add SPL support for AGILEX7 SoC.

---
 arch/arm/mach-socfpga/Makefile      |  3 +
 arch/arm/mach-socfpga/spl_agilex7.c | 87 +++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 arch/arm/mach-socfpga/spl_agilex7.c
arch/arm/mach-socfpga/Makefile +3 -0
index 2b26be3f41..224ed02865 100644
@@ -107,6 +107,9 @@ endif
 ifdef CONFIG_TARGET_SOCFPGA_N5X
 obj-y	+= spl_n5x.o
 endif
+ifdef CONFIG_TARGET_SOCFPGA_AGILEX7
+obj-y	+= spl_agilex7.o
+endif
 else
 obj-$(CONFIG_SPL_ATF) += secure_reg_helper.o
 obj-$(CONFIG_SPL_ATF) += smc_api.o
arch/arm/mach-socfpga/spl_agilex7.c new file +87 -0

87 lines not on this page · raw message

Signature · 1 line
2.25.1
#5 lore raw

PATCH 5/6 arm: socfpga: agilex7: Add clock manager support for AGILEX7

In reply to [email protected]

From: Sin Hui Kho <[email protected]>

Add clock manager driver support for AGILEX7 by reuse Agilex clock manager.

---
 arch/arm/mach-socfpga/Makefile                     | 1 +
 arch/arm/mach-socfpga/include/mach/clock_manager.h | 2 +-
 arch/arm/mach-socfpga/misc.c                       | 3 +++
 drivers/clk/altera/Makefile                        | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/Makefile +1 -0
index 224ed02865..39b1168821 100644
@@ -72,6 +72,7 @@ obj-y	+= wrap_pll_config_soc64.o
 endif
 
 ifdef CONFIG_TARGET_SOCFPGA_AGILEX7
+obj-y	+= clock_manager_agilex.o
 obj-y	+= lowlevel_init_soc64.o
 obj-y	+= mailbox_s10.o
 obj-y	+= misc_soc64.o
arch/arm/mach-socfpga/include/mach/clock_manager.h +1 -1
index a8cb07a1c4..252db8204e 100644
@@ -26,7 +26,7 @@ int cm_set_qspi_controller_clk_hz(u32 clk_hz);
 #include <asm/arch/clock_manager_arria10.h>
 #elif defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
 #include <asm/arch/clock_manager_s10.h>
-#elif defined(CONFIG_TARGET_SOCFPGA_AGILEX)
+#elif defined(CONFIG_TARGET_SOCFPGA_AGILEX) || defined(CONFIG_TARGET_SOCFPGA_AGILEX7)
 #include <asm/arch/clock_manager_agilex.h>
 #elif IS_ENABLED(CONFIG_TARGET_SOCFPGA_N5X)
 #include <asm/arch/clock_manager_n5x.h>
arch/arm/mach-socfpga/misc.c +3 -0
index 5b5a81a255..fe3cb1ec01 100644
@@ -257,6 +257,9 @@ void socfpga_get_managers_addr(void)
 #elif IS_ENABLED(CONFIG_TARGET_SOCFPGA_N5X)
 	ret = socfpga_get_base_addr("intel,n5x-clkmgr",
 				    &socfpga_clkmgr_base);
+#elif IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX7)
+	ret = socfpga_get_base_addr("intel,agilex-clkmgr",
+				    &socfpga_clkmgr_base);
 #else
 	ret = socfpga_get_base_addr("altr,clk-mgr", &socfpga_clkmgr_base);
 #endif
drivers/clk/altera/Makefile +1 -0
index 33db092918..247a44b093 100644
@@ -4,6 +4,7 @@
 #
 
 obj-$(CONFIG_TARGET_SOCFPGA_AGILEX) += clk-agilex.o
+obj-$(CONFIG_TARGET_SOCFPGA_AGILEX7) += clk-agilex.o
 obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += clk-arria10.o
 obj-$(CONFIG_TARGET_SOCFPGA_N5X) += clk-n5x.o
 obj-$(CONFIG_TARGET_SOCFPGA_N5X) += clk-mem-n5x.o
Signature · 1 line
2.25.1
#6 lore raw

PATCH 6/6 arm: socfpga: agilex7: Add base address for AGILEX7

In reply to [email protected]

From: Sin Hui Kho <[email protected]>

Add base address support for AGILEX7. Reuse same base as Agilex.

---
 arch/arm/mach-socfpga/include/mach/base_addr_soc64.h | 3 ++-
 arch/arm/mach-socfpga/include/mach/handoff_soc64.h   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm/mach-socfpga/include/mach/base_addr_soc64.h +2 -1
index 3f899fcfa3..eecbb037f5 100644
@@ -11,7 +11,8 @@
 #define SOCFPGA_HMC_MMR_IO48_ADDRESS		0xf8010000
 #define SOCFPGA_SDR_ADDRESS			0xf8011000
 #if IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX) || \
-	IS_ENABLED(CONFIG_TARGET_SOCFPGA_N5X)
+	IS_ENABLED(CONFIG_TARGET_SOCFPGA_N5X) || \
+	IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX7)
 #define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS		0xf8020200
 #else
 #define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS		0xf8020100
arch/arm/mach-socfpga/include/mach/handoff_soc64.h +2 -1
index 902fc6bfb5..b0134dd9bd 100644
@@ -24,7 +24,8 @@
 #define SOC64_HANDOFF_SIZE		4096
 
 #if IS_ENABLED(CONFIG_TARGET_SOCFPGA_STRATIX10) || \
-	IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX)
+	IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX) || \
+	IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX7)
 #define SOC64_HANDOFF_BASE		0xFFE3F000
 #define SOC64_HANDOFF_MISC		(SOC64_HANDOFF_BASE + 0x610)
 #elif IS_ENABLED(CONFIG_TARGET_SOCFPGA_N5X)
Signature · 1 line
2.25.1