Skip to contentSkip to conversation

Add Intel Agilex SoC support

PATCH Superseded Ley Foon Tan 5 participants 25 messages May 30, 2019 – Jul 4, 2019

Subsystems (5)

v1 of 8 Superseded Latest is v8 →

lore
Share & tools
lore
#0 lore raw

cover Add Intel Agilex SoC support

This is 2nd version of patchset to add Intel Agilex SoC[1] support. This patchset needs to apply after patch in [2] for Designware i2c clock from DM.

Intel Agilex SoC is with a 64-bit quad core ARM Cortex-A53 MPCore hard processor system (HPS). New IPs in Agilex are CCU, clock manager and SDRAM, other IPs have minor changes compared to Stratix 10.

Intel Agilex HPS TRM:
https://www.intel.com/content/dam/www/programmable/us/en/pdfs/literature/hb/agilex/mnl-1100.pdf

v1->v2:
-------
- Change clock driver to DM
- Reuse base_addr_s10.h from S10
- Add system_manager_s10_agilex_common.h
- Update commit message for CCU patch
- Update Linux commit id in dts/dtsi patch

History:
---------
[v1]: https://patchwork.ozlabs.org/cover/1097830/

[1]: https://www.intel.com/content/www/us/en/products/programmable/fpga/agilex.html
[2]: https://patchwork.ozlabs.org/patch/1107608/

Ley Foon Tan (15):
arm: socfpga: agilex: Add base address for Intel Agilex SoC
arm: socfpga: Move firewall code to firewall file
arm: socfpga: Move Stratix10 and Agilex reset manager common code
arm: socfpga: agilex: Add reset manager support
arm: socfpga: Move Stratix10 and Agilex system manager common code
arm: socfpga: agilex: Add system manager support
clk: agilex: Add clock driver for Agilex.
arm: socfpga: agilex: Add clock manager support
arm: socfpga: agilex: Add CCU support for Agilex
ddr: altera: Restructure Stratix 10 SDRAM driver
ddr: altera: agilex: Add SDRAM driver for Agilex
board: intel: agilex: Add socdk board support for Intel Agilex SoC
arm: socfpga: agilex: Add SPL for Agilex SoC
arm: dts: agilex: Add base dtsi and devkit dts
arm: socfpga: agilex: Enable Agilex SoC build

 arch/arm/Kconfig                              |   4 +-
 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/socfpga_agilex.dtsi              | 495 +++++++++++++++
 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi |  71 +++
 arch/arm/dts/socfpga_agilex_socdk.dts         | 136 +++++
 arch/arm/mach-socfpga/Kconfig                 |  15 +
 arch/arm/mach-socfpga/Makefile                |  18 +
 arch/arm/mach-socfpga/ccu_agilex.c            |  99 +++
 arch/arm/mach-socfpga/clock_manager_agilex.c  |  87 +++
 arch/arm/mach-socfpga/firewall.c              |  97 +++
 .../mach-socfpga/include/mach/base_addr_s10.h |   4 +
 .../mach-socfpga/include/mach/ccu_agilex.h    |  67 +++
 .../mach-socfpga/include/mach/clock_manager.h |   2 +
 .../include/mach/clock_manager_agilex.h       | 329 ++++++++++
 .../mach/{firewall_s10.h => firewall.h}       |  10 +-
 .../mach-socfpga/include/mach/reset_manager.h |  29 +
 .../include/mach/reset_manager_agilex.h       |  38 ++
 .../include/mach/reset_manager_s10.h          |  79 ---
 .../include/mach/system_manager.h             |   2 +
 ..._manager_s10.h => system_manager_agilex.h} |  89 +--
 .../include/mach/system_manager_s10.h         |  46 +-
 .../mach/system_manager_s10_agilex_common.h   |  60 ++
 arch/arm/mach-socfpga/reset_manager.c         |   9 +-
 arch/arm/mach-socfpga/spl_agilex.c            | 100 +++
 arch/arm/mach-socfpga/spl_s10.c               |  84 +--
 board/intel/agilex-socdk/MAINTAINERS          |   7 +
 board/intel/agilex-socdk/Makefile             |   7 +
 board/intel/agilex-socdk/socfpga.c            |   7 +
 configs/socfpga_agilex_defconfig              |  57 ++
 drivers/clk/altera/Makefile                   |   1 +
 drivers/clk/altera/clk-agilex.c               | 568 ++++++++++++++++++
 drivers/ddr/altera/Kconfig                    |   6 +-
 drivers/ddr/altera/Makefile                   |   3 +-
 drivers/ddr/altera/sdram_agilex.c             | 158 +++++
 drivers/ddr/altera/sdram_common.c             | 308 ++++++++++
 .../altera/{sdram_s10.h => sdram_common.h}    |  75 +--
 drivers/ddr/altera/sdram_s10.c                | 302 +---------
 drivers/ddr/altera/sdram_s10.h                | 148 -----
 include/configs/socfpga_agilex_socdk.h        | 208 +++++++
 include/dt-bindings/clock/stratix10-clock.h   |  84 +++
 40 files changed, 3140 insertions(+), 770 deletions(-)
 create mode 100644 arch/arm/dts/socfpga_agilex.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex_socdk.dts
 create mode 100644 arch/arm/mach-socfpga/ccu_agilex.c
 create mode 100644 arch/arm/mach-socfpga/clock_manager_agilex.c
 create mode 100644 arch/arm/mach-socfpga/firewall.c
 create mode 100644 arch/arm/mach-socfpga/include/mach/ccu_agilex.h
 create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h
 rename arch/arm/mach-socfpga/include/mach/{firewall_s10.h => firewall.h} (94%)
 create mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_agilex.h
 copy arch/arm/mach-socfpga/include/mach/{system_manager_s10.h => system_manager_agilex.h} (51%)
 create mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_s10_agilex_common.h
 create mode 100644 arch/arm/mach-socfpga/spl_agilex.c
 create mode 100644 board/intel/agilex-socdk/MAINTAINERS
 create mode 100644 board/intel/agilex-socdk/Makefile
 create mode 100644 board/intel/agilex-socdk/socfpga.c
 create mode 100644 configs/socfpga_agilex_defconfig
 create mode 100644 drivers/clk/altera/clk-agilex.c
 create mode 100644 drivers/ddr/altera/sdram_agilex.c
 create mode 100644 drivers/ddr/altera/sdram_common.c
 copy drivers/ddr/altera/{sdram_s10.h => sdram_common.h} (78%)
 create mode 100644 include/configs/socfpga_agilex_socdk.h
 create mode 100644 include/dt-bindings/clock/stratix10-clock.h
Signature · 1 line
2.19.0
#1 lore raw

PATCH 1/15 arm: socfpga: agilex: Add base address for Intel Agilex SoC

Add base address for Intel Agilex SoC.

Reuse base_addr_s10.h for Agilex, only one base address is different from S10.

---
 arch/arm/mach-socfpga/include/mach/base_addr_s10.h | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/mach-socfpga/include/mach/base_addr_s10.h +4 -0
index 1f549d7e70..d3eca65e97 100644
@@ -10,7 +10,11 @@
 #define SOCFPGA_SDR_SCHEDULER_ADDRESS		0xf8000400
 #define SOCFPGA_HMC_MMR_IO48_ADDRESS		0xf8010000
 #define SOCFPGA_SDR_ADDRESS			0xf8011000
+#ifdef CONFIG_TARGET_SOCFPGA_AGILEX
+#define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS		0xf8020200
+#else
 #define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS		0xf8020100
+#endif
 #define SOCFPGA_SMMU_ADDRESS			0xfa000000
 #define SOCFPGA_MAILBOX_ADDRESS			0xffa30000
 #define SOCFPGA_UART0_ADDRESS			0xffc02000
Signature · 1 line
2.19.0
#2 lore raw

PATCH 1/15 arm: socfpga: agilex: Add base address for Intel Agilex SoC

Am 30.05.2019 um 11:03 schrieb Ley Foon Tan:

Quoted 7 lines

Add base address for Intel Agilex SoC.

Reuse base_addr_s10.h for Agilex, only one base address is different from S10.

---

Wait, this is v2, right? What hss changed since v1? I notice v2 has 15 patches while v1 had 14.

Have you ever considered using patman and its helper tags? It would greatly reduce the effort for reviewers to keep things consistent and including a list of changes in each patch.

I mean, when reading v2, I want to rely on you saying "patches 1, 3, and 5 of 14 have changed, the rest have not" to speed up my reviewing. Patman really helps you with that, just try it! And if you don't want to, well, look at how other developers send their multi-version patches...

Regards,
Simon

Quoted 20 lines
  arch/arm/mach-socfpga/include/mach/base_addr_s10.h | 4 ++++
  1 file changed, 4 insertions(+)
arch/arm/mach-socfpga/include/mach/base_addr_s10.h +4 -0
index 1f549d7e70..d3eca65e97 100644
@@ -10,7 +10,11 @@
  #define SOCFPGA_SDR_SCHEDULER_ADDRESS		0xf8000400
  #define SOCFPGA_HMC_MMR_IO48_ADDRESS		0xf8010000
  #define SOCFPGA_SDR_ADDRESS			0xf8011000
+#ifdef CONFIG_TARGET_SOCFPGA_AGILEX
+#define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS		0xf8020200
+#else
  #define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS		0xf8020100
+#endif
  #define SOCFPGA_SMMU_ADDRESS			0xfa000000
  #define SOCFPGA_MAILBOX_ADDRESS			0xffa30000
  #define SOCFPGA_UART0_ADDRESS			0xffc02000
#3 lore raw

PATCH 1/15 arm: socfpga: agilex: Add base address for Intel Agilex SoC

Quoted 17 lines · Simon Goldschmidt

Am 30.05.2019 um 11:03 schrieb Ley Foon Tan:

Quoted 7 lines

Add base address for Intel Agilex SoC.

Reuse base_addr_s10.h for Agilex, only one base address is different from S10.

---

Wait, this is v2, right? What hss changed since v1? I notice v2 has 15 patches while v1 had 14.

Have you ever considered using patman and its helper tags? It would greatly reduce the effort for reviewers to keep things consistent and including a list of changes in each patch.

Quoted 8 lines

I mean, when reading v2, I want to rely on you saying "patches 1, 3, and 5 of 14 have changed, the rest have not" to speed up my reviewing. Patman really helps you with that, just try it! And if you don't want to, well, look at how other developers send their multi-version patches...

Regards,
Simon

I will look into Patman for next revision.

Here is summary for this series:

Patch 1, 5, 6, 7, 8, 13, 14, 15 have changed, the rest have not. *Patch 7 is new patch for clock manager driver with DM.

Regards
Ley Foon

maintainer
#4 lore raw

PATCH 1/15 arm: socfpga: agilex: Add base address for Intel Agilex SoC

Quoted 27 lines · Ley Foon Tan
Quoted 17 lines · Simon Goldschmidt

Am 30.05.2019 um 11:03 schrieb Ley Foon Tan:

Quoted 7 lines

Add base address for Intel Agilex SoC.

Reuse base_addr_s10.h for Agilex, only one base address is different from S10.

---

Wait, this is v2, right? What hss changed since v1? I notice v2 has 15 patches while v1 had 14.

Have you ever considered using patman and its helper tags? It would greatly reduce the effort for reviewers to keep things consistent and including a list of changes in each patch.

Quoted 8 lines

I mean, when reading v2, I want to rely on you saying "patches 1, 3, and 5 of 14 have changed, the rest have not" to speed up my reviewing. Patman really helps you with that, just try it! And if you don't want to, well, look at how other developers send their multi-version patches...

Regards,
Simon

Quoted 7 lines

I will look into Patman for next revision.

Here is summary for this series:

Patch 1, 5, 6, 7, 8, 13, 14, 15 have changed, the rest have not. *Patch 7 is new patch for clock manager driver with DM.

Can you just resend the series with the version changes properly stated in each patch? Also, its polite to include people in subsequent versions that have made comments in previous version.

Dinh

#5 lore raw

PATCH 1/15 arm: socfpga: agilex: Add base address for Intel Agilex SoC

Quoted 35 lines · Dinh Nguyen
Quoted 31 lines · Ley Foon Tan
Quoted 17 lines · Simon Goldschmidt

Am 30.05.2019 um 11:03 schrieb Ley Foon Tan:

Quoted 7 lines

Add base address for Intel Agilex SoC.

Reuse base_addr_s10.h for Agilex, only one base address is different from S10.

---

Wait, this is v2, right? What hss changed since v1? I notice v2 has 15 patches while v1 had 14.

Have you ever considered using patman and its helper tags? It would greatly reduce the effort for reviewers to keep things consistent and including a list of changes in each patch.

Quoted 8 lines

I mean, when reading v2, I want to rely on you saying "patches 1, 3, and 5 of 14 have changed, the rest have not" to speed up my reviewing. Patman really helps you with that, just try it! And if you don't want to, well, look at how other developers send their multi-version patches...

Regards,
Simon

I will look into Patman for next revision.

Here is summary for this series:

Quoted 8 lines
Quoted 3 lines

Patch 1, 5, 6, 7, 8, 13, 14, 15 have changed, the rest have not. *Patch 7 is new patch for clock manager driver with DM.

Can you just resend the series with the version changes properly stated in each patch? Also, its polite to include people in subsequent versions that have made comments in previous version.

Okay, will resend again.

Thanks.

Regards
Ley Foon

#6 lore raw

PATCH 2/15 arm: socfpga: Move firewall code to firewall file

In reply to Ley Foon Tan

Move firewall related code to new firewall.c, to share code in Stratix 10 and Agilex.

No functional change.

---
 arch/arm/mach-socfpga/Makefile                |  1 +
 arch/arm/mach-socfpga/firewall.c              | 97 +++++++++++++++++++
 .../mach/{firewall_s10.h => firewall.h}       | 10 +-
 arch/arm/mach-socfpga/spl_s10.c               | 84 +---------------
 drivers/ddr/altera/sdram_s10.c                |  2 +-
 5 files changed, 107 insertions(+), 87 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/firewall.c
 rename arch/arm/mach-socfpga/include/mach/{firewall_s10.h => firewall.h} (94%)
arch/arm/mach-socfpga/Makefile +1 -0
index e66720447f..11370cf4c4 100644
@@ -52,6 +52,7 @@ ifdef CONFIG_TARGET_SOCFPGA_ARRIA10
 obj-y	+= spl_a10.o
 endif
 ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
+obj-y   += firewall.o
 obj-y	+= spl_s10.o
 endif
 endif
arch/arm/mach-socfpga/firewall.c new file +97 -0

97 lines not on this page · raw message

arch/arm/mach-socfpga/include/mach/firewall.h renamed from arch/arm/mach-socfpga/include/mach/firewall_s10.h +6 -4
similarity index 94%
rename from arch/arm/mach-socfpga/include/mach/firewall_s10.h
rename to arch/arm/mach-socfpga/include/mach/firewall.h
index b96f779f14..516bd1c0e1 100644
@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0
  *
- * Copyright (C) 2017-2018 Intel Corporation <www.intel.com>
+ * Copyright (C) 2017-2019 Intel Corporation <www.intel.com>
  *
  */
 
-#ifndef	_FIREWALL_S10_
-#define	_FIREWALL_S10_
+#ifndef	_FIREWALL_H_
+#define	_FIREWALL_H_
 
 struct socfpga_firwall_l4_per {
 	u32	nand;		/* 0x00 */
@@ -117,4 +117,6 @@ struct socfpga_firwall_l4_sys {
 #define FW_MPU_DDR_SCR_WRITEL(data, reg)		\
 	writel(data, SOCFPGA_FW_MPU_DDR_SCR_ADDRESS + (reg))
 
-#endif /* _FIREWALL_S10_ */
+void firewall_setup(void);
+
+#endif /* _FIREWALL_H_ */
arch/arm/mach-socfpga/spl_s10.c +2 -82

102 lines not on this page · raw message

drivers/ddr/altera/sdram_s10.c +1 -1
index 56cbbac9fe..a211635c2b 100644
@@ -13,7 +13,7 @@
 #include <reset.h>
 #include "sdram_s10.h"
 #include <wait_bit.h>
-#include <asm/arch/firewall_s10.h>
+#include <asm/arch/firewall.h>
 #include <asm/arch/system_manager.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/io.h>
Signature · 1 line
2.19.0
#7 lore raw

PATCH 3/15 arm: socfpga: Move Stratix10 and Agilex reset manager common code

In reply to Ley Foon Tan

Move Stratix10 and Agilex reset manager common code to reset_manager.h.

Remove unused RSTMGR_XXX defines.

---
 .../mach-socfpga/include/mach/reset_manager.h | 26 ++++++
 .../include/mach/reset_manager_s10.h          | 79 -------------------
 2 files changed, 26 insertions(+), 79 deletions(-)
arch/arm/mach-socfpga/include/mach/reset_manager.h +26 -0
index 42beaecdd6..e2dce4b4fb 100644
@@ -36,6 +36,32 @@ void socfpga_per_reset_all(void);
 /* Create a human-readable reference to SoCFPGA reset. */
 #define SOCFPGA_RESET(_name)	RSTMGR_##_name
 
+#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+
+void reset_deassert_peripherals_handoff(void);
+int cpu_has_been_warmreset(void);
+void socfpga_bridges_reset(int enable);
+
+#define RSTMGR_MPUMODRST_CORE0		0
+#define RSTMGR_PER0MODRST_OCP_MASK	0x0020bf00
+#define RSTMGR_BRGMODRST_DDRSCH_MASK	0X00000040
+#define RSTMGR_BRGMODRST_FPGA2SOC_MASK	0x00000004
+
+/* Watchdogs and MPU warm reset mask */
+#define RSTMGR_L4WD_MPU_WARMRESET_MASK	0x000F0F00
+
+/*
+ * SocFPGA Stratix10 reset IDs, bank mapping is as follows:
+ * 0 ... mpumodrst
+ * 1 ... per0modrst
+ * 2 ... per1modrst
+ * 3 ... brgmodrst
+ */
+#define RSTMGR_L4WD0		RSTMGR_DEFINE(2, 0)
+#define RSTMGR_OSC1TIMER0	RSTMGR_DEFINE(2, 4)
+#define RSTMGR_UART0		RSTMGR_DEFINE(2, 16)
+#endif
+
 #if defined(CONFIG_TARGET_SOCFPGA_GEN5)
 #include <asm/arch/reset_manager_gen5.h>
 #elif defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +0 -79

89 lines not on this page · raw message

Signature · 1 line
2.19.0
#8 lore raw

PATCH 4/15 arm: socfpga: agilex: Add reset manager support

In reply to Ley Foon Tan

Add reset manager support for Agilex.

---
 .../mach-socfpga/include/mach/reset_manager.h |  5 ++-
 .../include/mach/reset_manager_agilex.h       | 38 +++++++++++++++++++
 arch/arm/mach-socfpga/reset_manager.c         |  9 +++--
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_agilex.h
arch/arm/mach-socfpga/include/mach/reset_manager.h +4 -1
index e2dce4b4fb..f752f7abb8 100644
@@ -36,7 +36,8 @@ void socfpga_per_reset_all(void);
 /* Create a human-readable reference to SoCFPGA reset. */
 #define SOCFPGA_RESET(_name)	RSTMGR_##_name
 
-#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) || \
+	defined(CONFIG_TARGET_SOCFPGA_AGILEX)
 
 void reset_deassert_peripherals_handoff(void);
 int cpu_has_been_warmreset(void);
@@ -68,6 +69,8 @@ void socfpga_bridges_reset(int enable);
 #include <asm/arch/reset_manager_arria10.h>
 #elif defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
 #include <asm/arch/reset_manager_s10.h>
+#elif defined(CONFIG_TARGET_SOCFPGA_AGILEX)
+#include <asm/arch/reset_manager_agilex.h>
 #endif
 
 #endif /* _RESET_MANAGER_H_ */
arch/arm/mach-socfpga/include/mach/reset_manager_agilex.h new file +38 -0
new file mode 100644
index 0000000000..c209fb439b
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2019 Intel Corporation <www.intel.com>
+ */
+
+#ifndef	_RESET_MANAGER_AGILEX_
+#define	_RESET_MANAGER_AGILEX_
+
+struct socfpga_reset_manager {
+	u32	status;
+	u32	mpu_rst_stat;
+	u32	misc_stat;
+	u32	padding1;
+	u32	hdsk_en;
+	u32	hdsk_req;
+	u32	hdsk_ack;
+	u32	hdsk_stall;
+	u32	mpumodrst;
+	u32	per0modrst;
+	u32	per1modrst;
+	u32	brgmodrst;
+	u32	padding2;
+	u32	cold_mod_reset;
+	u32	padding3;
+	u32	dbg_mod_reset;
+	u32	padding4;
+	u32	padding5;
+	u32	padding6;
+	u32	brg_warm_mask;
+	u32	padding7[3];
+	u32	tst_stat;
+	u32	padding8;
+	u32	hdsk_timeout;
+	u32	mpul2flushtimeout;
+	u32	dbghdsktimeout;
+};
+
+#endif /* _RESET_MANAGER_AGILEX_ */
arch/arm/mach-socfpga/reset_manager.c +6 -3
index e0a01ed07a..5dfe303940 100644
@@ -8,13 +8,15 @@
 #include <asm/io.h>
 #include <asm/arch/reset_manager.h>
 
-#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) || \
+	defined(CONFIG_TARGET_SOCFPGA_AGILEX)
 #include <asm/arch/mailbox_s10.h>
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if !defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+#if !defined(CONFIG_TARGET_SOCFPGA_STRATIX10) && \
+	!defined(CONFIG_TARGET_SOCFPGA_AGILEX)
 static const struct socfpga_reset_manager *reset_manager_base =
 		(void *)SOCFPGA_RSTMGR_ADDRESS;
 #endif
@@ -25,7 +27,8 @@ static const struct socfpga_reset_manager *reset_manager_base =
 void reset_cpu(ulong addr)
 {
 	/* request a warm reset */
-#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) || \
+	defined(CONFIG_TARGET_SOCFPGA_AGILEX)
 	puts("Mailbox: Issuing mailbox cmd REBOOT_HPS\n");
 	mbox_reset_cold();
 #else
Signature · 1 line
2.19.0
#9 lore raw

PATCH 5/15 arm: socfpga: Move Stratix10 and Agilex system manager common code

In reply to Ley Foon Tan

Move Stratix10 and Agilex system manager common code new header file.

---
 .../include/mach/system_manager_s10.h         | 46 +--------------
 .../mach/system_manager_s10_agilex_common.h   | 59 +++++++++++++++++++
 2 files changed, 60 insertions(+), 45 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_s10_agilex_common.h
arch/arm/mach-socfpga/include/mach/system_manager_s10.h +1 -45
index 297f9e1999..af8cfc9f05 100644
@@ -7,14 +7,6 @@
 #ifndef	_SYSTEM_MANAGER_S10_
 #define	_SYSTEM_MANAGER_S10_
 
-void sysmgr_pinmux_init(void);
-void populate_sysmgr_fpgaintf_module(void);
-void populate_sysmgr_pinmux(void);
-void sysmgr_pinmux_table_sel(const u32 **table, unsigned int *table_len);
-void sysmgr_pinmux_table_ctrl(const u32 **table, unsigned int *table_len);
-void sysmgr_pinmux_table_fpga(const u32 **table, unsigned int *table_len);
-void sysmgr_pinmux_table_delay(const u32 **table, unsigned int *table_len);
-
 struct socfpga_system_manager {
 	/* System Manager Module */
 	u32	siliconid1;			/* 0x00 */
@@ -135,42 +127,6 @@ struct socfpga_system_manager {
 
 };
 
-#define SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGPINMUX	BIT(0)
-#define SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGIO	BIT(1)
-#define SYSMGR_ECC_OCRAM_EN	BIT(0)
-#define SYSMGR_ECC_OCRAM_SERR	BIT(3)
-#define SYSMGR_ECC_OCRAM_DERR	BIT(4)
-#define SYSMGR_FPGAINTF_USEFPGA	0x1
-
-#define SYSMGR_FPGAINTF_NAND	BIT(4)
-#define SYSMGR_FPGAINTF_SDMMC	BIT(8)
-#define SYSMGR_FPGAINTF_SPIM0	BIT(16)
-#define SYSMGR_FPGAINTF_SPIM1	BIT(24)
-#define SYSMGR_FPGAINTF_EMAC0	BIT(0)
-#define SYSMGR_FPGAINTF_EMAC1	BIT(8)
-#define SYSMGR_FPGAINTF_EMAC2	BIT(16)
-
-#define SYSMGR_SDMMC_SMPLSEL_SHIFT	4
-#define SYSMGR_SDMMC_DRVSEL_SHIFT	0
-
-/* EMAC Group Bit definitions */
-#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_GMII_MII	0x0
-#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RGMII		0x1
-#define SYSMGR_EMACGRP_CTRL_PHYSEL_ENUM_RMII		0x2
-
-#define SYSMGR_EMACGRP_CTRL_PHYSEL0_LSB			0
-#define SYSMGR_EMACGRP_CTRL_PHYSEL1_LSB			2
-#define SYSMGR_EMACGRP_CTRL_PHYSEL_MASK			0x3
-
-#define SYSMGR_NOC_H2F_MSK		0x00000001
-#define SYSMGR_NOC_LWH2F_MSK		0x00000010
-#define SYSMGR_HMC_CLK_STATUS_MSK	0x00000001
-
-#define SYSMGR_DMA_IRQ_NS		0xFF000000
-#define SYSMGR_DMA_MGR_NS		0x00010000
-
-#define SYSMGR_DMAPERIPH_ALL_NS		0xFFFFFFFF
-
-#define SYSMGR_WDDBG_PAUSE_ALL_CPU	0x0F0F0F0F
+#include <asm/arch/system_manager_s10_agilex_common.h>
 
 #endif /* _SYSTEM_MANAGER_S10_ */
arch/arm/mach-socfpga/include/mach/system_manager_s10_agilex_common.h new file +59 -0

59 lines not on this page · raw message

Signature · 1 line
2.19.0
#10 lore raw

PATCH 6/15 arm: socfpga: agilex: Add system manager support

In reply to Ley Foon Tan

Add system manager support for Agilex.

---
 .../include/mach/system_manager.h             |   2 +
 .../include/mach/system_manager_agilex.h      | 129 ++++++++++++++++++
 .../mach/system_manager_s10_agilex_common.h   |   3 +-
 3 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_agilex.h
arch/arm/mach-socfpga/include/mach/system_manager.h +2 -0
index 7e76df74b7..79e3777e39 100644
@@ -8,6 +8,8 @@
 
 #if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
 #include <asm/arch/system_manager_s10.h>
+#elif defined(CONFIG_TARGET_SOCFPGA_AGILEX)
+#include <asm/arch/system_manager_agilex.h>
 #else
 #define SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGPINMUX	BIT(0)
 #define SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGIO	BIT(1)
arch/arm/mach-socfpga/include/mach/system_manager_agilex.h new file +129 -0

129 lines not on this page · raw message

arch/arm/mach-socfpga/include/mach/system_manager_s10_agilex_common.h +2 -1
index fe8ddce548..7e323eb050 100644
@@ -6,7 +6,8 @@
 #ifndef _SYSTEM_MANAGER_S10_AGILEX_COMMON_H_
 #define _SYSTEM_MANAGER_S10_AGILEX_COMMON_H_
 
-#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10)
+#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) || \
+	defined(CONFIG_TARGET_SOCFPGA_AGILEX)
 
 void sysmgr_pinmux_init(void);
 void populate_sysmgr_fpgaintf_module(void);
Signature · 1 line
2.19.0
#11 lore raw

PATCH 7/15 clk: agilex: Add clock driver for Agilex.

In reply to Ley Foon Tan

Add clock manager driver for Agilex. Provides clock initialization and get_rate functions.

stratix10-clock.h is from Linux commit ID 89727949ea1e.

---
 .../mach-socfpga/include/mach/clock_manager.h |   2 +
 .../include/mach/clock_manager_agilex.h       | 327 ++++++++++
 drivers/clk/altera/Makefile                   |   1 +
 drivers/clk/altera/clk-agilex.c               | 568 ++++++++++++++++++
 include/dt-bindings/clock/stratix10-clock.h   |  84 +++
 5 files changed, 982 insertions(+)
 create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h
 create mode 100644 drivers/clk/altera/clk-agilex.c
 create mode 100644 include/dt-bindings/clock/stratix10-clock.h
arch/arm/mach-socfpga/include/mach/clock_manager.h +2 -0
index dd80e3a767..a3d5de59d2 100644
@@ -18,6 +18,8 @@ void cm_print_clock_quick_summary(void);
 #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)
+#include <asm/arch/clock_manager_agilex.h>
 #endif
 
 #endif /* _CLOCK_MANAGER_H_ */
arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h new file +327 -0

327 lines not on this page · raw message

drivers/clk/altera/Makefile +1 -0
index a3ae8b24b0..96215ad5c4 100644
@@ -3,4 +3,5 @@
 # Copyright (C) 2018 Marek Vasut <[email protected]>
 #
 
+obj-$(CONFIG_TARGET_SOCFPGA_AGILEX) += clk-agilex.o
 obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += clk-arria10.o
drivers/clk/altera/clk-agilex.c new file +568 -0

568 lines not on this page · raw message

include/dt-bindings/clock/stratix10-clock.h new file +84 -0

84 lines not on this page · raw message

Signature · 1 line
2.19.0
#12 lore raw

PATCH 8/15 arm: socfpga: agilex: Add clock manager support

In reply to Ley Foon Tan

Add clock manager support for Agilex.

---
 arch/arm/mach-socfpga/Makefile                |  4 +
 arch/arm/mach-socfpga/clock_manager_agilex.c  | 87 +++++++++++++++++++
 .../include/mach/clock_manager_agilex.h       |  2 +
 3 files changed, 93 insertions(+)
 create mode 100644 arch/arm/mach-socfpga/clock_manager_agilex.c
arch/arm/mach-socfpga/Makefile +4 -0
index 11370cf4c4..5bb36d07df 100644
@@ -40,6 +40,10 @@ obj-y	+= wrap_pinmux_config_s10.o
 obj-y	+= wrap_pll_config_s10.o
 endif
 
+ifdef CONFIG_TARGET_SOCFPGA_AGILEX
+obj-y	+= clock_manager_agilex.o
+endif
+
 ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_TARGET_SOCFPGA_GEN5
 obj-y	+= spl_gen5.o
arch/arm/mach-socfpga/clock_manager_agilex.c new file +87 -0

87 lines not on this page · raw message

arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h +2 -0
index bf5e7c8775..c4d27bad72 100644
@@ -25,6 +25,8 @@ const unsigned int cm_get_osc_clk_hz(void);
 const unsigned int cm_get_intosc_clk_hz(void);
 const unsigned int cm_get_fpga_clk_hz(void);
 
+unsigned long cm_get_mpu_clk_hz(void);
+
 #define CLKMGR_EOSC1_HZ		25000000
 #define CLKMGR_INTOSC_HZ	400000000
 #define CLKMGR_FPGA_CLK_HZ	50000000
Signature · 1 line
2.19.0
#13 lore raw

PATCH 9/15 arm: socfpga: agilex: Add CCU support for Agilex

In reply to Ley Foon Tan

Add Cache Coherency Unit (CCU) support for Agilex.
CCU is to ensures consistency of shared data between multi masters in the system.

Software need to initialize CCU's directories and coherency agent interfaces in CCU IP.

---
 arch/arm/mach-socfpga/Makefile                |  3 +
 arch/arm/mach-socfpga/ccu_agilex.c            | 99 +++++++++++++++++++
 .../mach-socfpga/include/mach/ccu_agilex.h    | 67 +++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 arch/arm/mach-socfpga/ccu_agilex.c
 create mode 100644 arch/arm/mach-socfpga/include/mach/ccu_agilex.h
arch/arm/mach-socfpga/Makefile +3 -0
index 5bb36d07df..51355ad070 100644
@@ -59,6 +59,9 @@ ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
 obj-y   += firewall.o
 obj-y	+= spl_s10.o
 endif
+ifdef CONFIG_TARGET_SOCFPGA_AGILEX
+obj-y   += ccu_agilex.o
+endif
 endif
 
 ifdef CONFIG_TARGET_SOCFPGA_GEN5
arch/arm/mach-socfpga/ccu_agilex.c new file +99 -0

99 lines not on this page · raw message

arch/arm/mach-socfpga/include/mach/ccu_agilex.h new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
2.19.0
#14 lore raw

PATCH 10/15 ddr: altera: Restructure Stratix 10 SDRAM driver

In reply to Ley Foon Tan

Restructure Stratix 10 SDRAM driver. Move common code to separate file, in preparation to support SDRAM driver for Agilex.

---
 drivers/ddr/altera/Makefile                   |   2 +-
 drivers/ddr/altera/sdram_common.c             | 307 ++++++++++++++++++
 .../altera/{sdram_s10.h => sdram_common.h}    |  74 +++--
 drivers/ddr/altera/sdram_s10.c                | 300 +----------------
 drivers/ddr/altera/sdram_s10.h                | 148 ---------
 5 files changed, 348 insertions(+), 483 deletions(-)
 create mode 100644 drivers/ddr/altera/sdram_common.c
 copy drivers/ddr/altera/{sdram_s10.h => sdram_common.h} (79%)
drivers/ddr/altera/Makefile +1 -1
index 341ac0d73b..09454461a9 100644
@@ -9,5 +9,5 @@
 ifdef CONFIG_$(SPL_)ALTERA_SDRAM
 obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += sdram_gen5.o sequencer.o
 obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += sdram_arria10.o
-obj-$(CONFIG_TARGET_SOCFPGA_STRATIX10) += sdram_s10.o
+obj-$(CONFIG_TARGET_SOCFPGA_STRATIX10) += sdram_common.o sdram_s10.o
 endif
drivers/ddr/altera/sdram_common.c new file +307 -0

307 lines not on this page · raw message

drivers/ddr/altera/sdram_common.h renamed from drivers/ddr/altera/sdram_s10.h +38 -36

89 lines not on this page · raw message

drivers/ddr/altera/sdram_s10.c +2 -298

336 lines not on this page · raw message

drivers/ddr/altera/sdram_s10.h +0 -148

158 lines not on this page · raw message

Signature · 1 line
2.19.0
#15 lore raw

PATCH 11/15 ddr: altera: agilex: Add SDRAM driver for Agilex

In reply to Ley Foon Tan

Add SDRAM driver for Agilex SoC.

---
 drivers/ddr/altera/Kconfig        |   6 +-
 drivers/ddr/altera/Makefile       |   1 +
 drivers/ddr/altera/sdram_agilex.c | 158 ++++++++++++++++++++++++++++++
 drivers/ddr/altera/sdram_common.c |   1 +
 drivers/ddr/altera/sdram_common.h |   1 +
 5 files changed, 164 insertions(+), 3 deletions(-)
 create mode 100644 drivers/ddr/altera/sdram_agilex.c
drivers/ddr/altera/Kconfig +3 -3
index 2b1c1be3b5..8f590dc5f6 100644
@@ -1,8 +1,8 @@
 config SPL_ALTERA_SDRAM
 	bool "SoCFPGA DDR SDRAM driver in SPL"
 	depends on SPL
-	depends on TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 || TARGET_SOCFPGA_STRATIX10
-	select RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_STRATIX10
-	select SPL_RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_STRATIX10
+	depends on TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10 || TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
+	select RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
+	select SPL_RAM if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
 	help
 	  Enable DDR SDRAM controller for the SoCFPGA devices.
drivers/ddr/altera/Makefile +1 -0
index 09454461a9..b3b48948bf 100644
@@ -10,4 +10,5 @@ ifdef CONFIG_$(SPL_)ALTERA_SDRAM
 obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += sdram_gen5.o sequencer.o
 obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += sdram_arria10.o
 obj-$(CONFIG_TARGET_SOCFPGA_STRATIX10) += sdram_common.o sdram_s10.o
+obj-$(CONFIG_TARGET_SOCFPGA_AGILEX) += sdram_common.o sdram_agilex.o
 endif
drivers/ddr/altera/sdram_agilex.c new file +158 -0

158 lines not on this page · raw message

drivers/ddr/altera/sdram_common.c +1 -0
index 24ab5f932b..d3a45c0ae7 100644
@@ -292,6 +292,7 @@ static struct ram_ops altera_sdram_ops = {
 
 static const struct udevice_id altera_sdram_ids[] = {
 	{ .compatible = "altr,sdr-ctl-s10" },
+	{ .compatible = "altr,sdr-ctl-agilex" },
 	{ /* sentinel */ }
 };
 
drivers/ddr/altera/sdram_common.h +1 -0
index 814ab52be3..89cea3d003 100644
@@ -69,6 +69,7 @@ struct altera_sdram_platdata {
 /* HMC MMR IO48 registers */
 #define CTRLCFG0			0x28
 #define CTRLCFG1			0x2c
+#define CTRLCFG3                        0x34
 #define DRAMTIMING0			0x50
 #define CALTIMING0			0x7c
 #define CALTIMING1			0x80
Signature · 1 line
2.19.0
#16 lore raw

PATCH 12/15 board: intel: agilex: Add socdk board support for Intel Agilex SoC

In reply to Ley Foon Tan

Add socdk board support for Intel Agilex SoC

---
 board/intel/agilex-socdk/MAINTAINERS | 7 +++++++
 board/intel/agilex-socdk/Makefile    | 7 +++++++
 board/intel/agilex-socdk/socfpga.c   | 7 +++++++
 3 files changed, 21 insertions(+)
 create mode 100644 board/intel/agilex-socdk/MAINTAINERS
 create mode 100644 board/intel/agilex-socdk/Makefile
 create mode 100644 board/intel/agilex-socdk/socfpga.c
board/intel/agilex-socdk/MAINTAINERS new file +7 -0
new file mode 100644
index 0000000000..b8e28f0b24
@@ -0,0 +1,7 @@
+SOCFPGA BOARD
+M:	Ley Foon Tan <[email protected]>
+M:	Chee Hong Ang <[email protected]>
+S:	Maintained
+F:	board/intel/agilex-socdk/
+F:	include/configs/socfpga_agilex_socdk.h
+F:	configs/socfpga_agilex_defconfig
board/intel/agilex-socdk/Makefile new file +7 -0
new file mode 100644
index 0000000000..b86223a571
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2019 Intel Corporation <www.intel.com>
+#
+# SPDX-License-Identifier:	GPL-2.0
+#
+
+obj-y	:= socfpga.o
board/intel/agilex-socdk/socfpga.c new file +7 -0
new file mode 100644
index 0000000000..72a3e0836d
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 Intel Corporation <www.intel.com>
+ *
+ */
+
+#include <common.h>
Signature · 1 line
2.19.0
#17 lore raw

PATCH 13/15 arm: socfpga: agilex: Add SPL for Agilex SoC

In reply to Ley Foon Tan

Add SPL support for Agilex SoC.

---
 arch/arm/mach-socfpga/Makefile     |   1 +
 arch/arm/mach-socfpga/spl_agilex.c | 100 +++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 arch/arm/mach-socfpga/spl_agilex.c
arch/arm/mach-socfpga/Makefile +1 -0
index 51355ad070..476dcaefff 100644
@@ -61,6 +61,7 @@ obj-y	+= spl_s10.o
 endif
 ifdef CONFIG_TARGET_SOCFPGA_AGILEX
 obj-y   += ccu_agilex.o
+obj-y	+= spl_agilex.o
 endif
 endif
 
arch/arm/mach-socfpga/spl_agilex.c new file +100 -0

100 lines not on this page · raw message

Signature · 1 line
2.19.0
#18 lore raw

PATCH 14/15 arm: dts: agilex: Add base dtsi and devkit dts

In reply to Ley Foon Tan

Add device tree files for Agilex SoC platform.

Based on Linux Commit ID 4b36daf9ada30.

---
 arch/arm/dts/Makefile                         |   1 +
 arch/arm/dts/socfpga_agilex.dtsi              | 495 ++++++++++++++++++
 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi |  71 +++
 arch/arm/dts/socfpga_agilex_socdk.dts         | 136 +++++
 4 files changed, 703 insertions(+)
 create mode 100644 arch/arm/dts/socfpga_agilex.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
 create mode 100644 arch/arm/dts/socfpga_agilex_socdk.dts
arch/arm/dts/Makefile +1 -0
index 31ef2b66a3..1f1be102b1 100644
@@ -294,6 +294,7 @@ dtb-$(CONFIG_TI816X) += dm8168-evm.dtb
 dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb
 
 dtb-$(CONFIG_ARCH_SOCFPGA) +=				\
+	socfpga_agilex_socdk.dtb			\
 	socfpga_arria5_socdk.dtb			\
 	socfpga_arria10_socdk_sdmmc.dtb			\
 	socfpga_cyclone5_mcvevk.dtb			\
arch/arm/dts/socfpga_agilex.dtsi new file +495 -0

495 lines not on this page · raw message

arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi new file +71 -0

71 lines not on this page · raw message

arch/arm/dts/socfpga_agilex_socdk.dts new file +136 -0

136 lines not on this page · raw message

Signature · 1 line
2.19.0
#19 lore raw

PATCH 15/15 arm: socfpga: agilex: Enable Agilex SoC build

In reply to Ley Foon Tan

Add build support for Agilex SoC.

---
 arch/arm/Kconfig                       |   4 +-
 arch/arm/mach-socfpga/Kconfig          |  15 ++
 arch/arm/mach-socfpga/Makefile         |   9 ++
 configs/socfpga_agilex_defconfig       |  57 +++++++
 include/configs/socfpga_agilex_socdk.h | 208 +++++++++++++++++++++++++
 5 files changed, 291 insertions(+), 2 deletions(-)
 create mode 100644 configs/socfpga_agilex_defconfig
 create mode 100644 include/configs/socfpga_agilex_socdk.h
arch/arm/Kconfig +2 -2
index 01ff57cf1b..213c37cd7e 100644
@@ -870,7 +870,7 @@ config ARCH_SOCFPGA
 	bool "Altera SOCFPGA family"
 	select ARCH_EARLY_INIT_R
 	select ARCH_MISC_INIT if !TARGET_SOCFPGA_ARRIA10
-	select ARM64 if TARGET_SOCFPGA_STRATIX10
+	select ARM64 if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
 	select CPU_V7A if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
 	select DM
 	select DM_SERIAL
@@ -882,7 +882,7 @@ config ARCH_SOCFPGA
 	select SPL_LIBGENERIC_SUPPORT
 	select SPL_NAND_SUPPORT if SPL_NAND_DENALI
 	select SPL_OF_CONTROL
-	select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10
+	select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10 || TARGET_SOCFPGA_AGILEX
 	select SPL_SERIAL_SUPPORT
 	select SPL_WATCHDOG_SUPPORT
 	select SUPPORT_SPL
arch/arm/mach-socfpga/Kconfig +15 -0
index 48f02f08d4..b850a8ab1f 100644
@@ -20,6 +20,14 @@ config SYS_TEXT_BASE
 	default 0x01000040 if TARGET_SOCFPGA_ARRIA10
 	default 0x01000040 if TARGET_SOCFPGA_GEN5
 
+config TARGET_SOCFPGA_AGILEX
+	bool
+	select ARMV8_MULTIENTRY
+	select ARMV8_SET_SMPEN
+	select ARMV8_SPIN_TABLE
+	select CLK
+	select SPL_CLK if SPL
+
 config TARGET_SOCFPGA_ARRIA5
 	bool
 	select TARGET_SOCFPGA_GEN5
@@ -64,6 +72,10 @@ choice
 	prompt "Altera SOCFPGA board select"
 	optional
 
+config TARGET_SOCFPGA_AGILEX_SOCDK
+	bool "Intel SOCFPGA SoCDK (Agilex)"
+	select TARGET_SOCFPGA_AGILEX
+
 config TARGET_SOCFPGA_ARIES_MCVEVK
 	bool "Aries MCVEVK (Cyclone V)"
 	select TARGET_SOCFPGA_CYCLONE5
@@ -124,6 +136,7 @@ config TARGET_SOCFPGA_TERASIC_SOCKIT
 endchoice
 
 config SYS_BOARD
+	default "agilex-socdk" if TARGET_SOCFPGA_AGILEX_SOCDK
 	default "arria5-socdk" if TARGET_SOCFPGA_ARRIA5_SOCDK
 	default "arria10-socdk" if TARGET_SOCFPGA_ARRIA10_SOCDK
 	default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
@@ -140,6 +153,7 @@ config SYS_BOARD
 	default "vining_fpga" if TARGET_SOCFPGA_SAMTEC_VINING_FPGA
 
 config SYS_VENDOR
+	default "intel" if TARGET_SOCFPGA_AGILEX_SOCDK
 	default "altera" if TARGET_SOCFPGA_ARRIA5_SOCDK
 	default "altera" if TARGET_SOCFPGA_ARRIA10_SOCDK
 	default "altera" if TARGET_SOCFPGA_CYCLONE5_SOCDK
@@ -157,6 +171,7 @@ config SYS_SOC
 	default "socfpga"
 
 config SYS_CONFIG_NAME
+	default "socfpga_agilex_socdk" if TARGET_SOCFPGA_AGILEX_SOCDK
 	default "socfpga_arria5_socdk" if TARGET_SOCFPGA_ARRIA5_SOCDK
 	default "socfpga_arria10_socdk" if TARGET_SOCFPGA_ARRIA10_SOCDK
 	default "socfpga_cyclone5_socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
arch/arm/mach-socfpga/Makefile +9 -0
index 476dcaefff..774d3571ef 100644
@@ -42,6 +42,14 @@ endif
 
 ifdef CONFIG_TARGET_SOCFPGA_AGILEX
 obj-y	+= clock_manager_agilex.o
+obj-y	+= mailbox_s10.o
+obj-y	+= misc_s10.o
+obj-y	+= mmu-arm64_s10.o
+obj-y	+= reset_manager_s10.o
+obj-y	+= system_manager_s10.o
+obj-y	+= timer_s10.o
+obj-y	+= wrap_pinmux_config_s10.o
+obj-y	+= wrap_pll_config_s10.o
 endif
 
 ifdef CONFIG_SPL_BUILD
@@ -61,6 +69,7 @@ obj-y	+= spl_s10.o
 endif
 ifdef CONFIG_TARGET_SOCFPGA_AGILEX
 obj-y   += ccu_agilex.o
+obj-y   += firewall.o
 obj-y	+= spl_agilex.o
 endif
 endif
configs/socfpga_agilex_defconfig new file +57 -0

57 lines not on this page · raw message

include/configs/socfpga_agilex_socdk.h new file +208 -0

208 lines not on this page · raw message

Signature · 1 line
2.19.0
#20 lore raw

cover Add Intel Agilex SoC support

In reply to Ley Foon Tan
Quoted 11 lines · Ley Foon Tan

This is 2nd version of patchset to add Intel Agilex SoC[1] support. This patchset needs to apply after patch in [2] for Designware i2c clock from DM.

Intel Agilex SoC is with a 64-bit quad core ARM Cortex-A53 MPCore hard processor system (HPS). New IPs in Agilex are CCU, clock manager and SDRAM, other IPs have minor changes compared to Stratix 10.

Intel Agilex HPS TRM:
https://www.intel.com/content/dam/www/programmable/us/en/pdfs/literature/hb/agilex/mnl-1100.pdf

Quoted 7 lines

v1->v2:
-------
- Change clock driver to DM
- Reuse base_addr_s10.h from S10
- Add system_manager_s10_agilex_common.h
- Update commit message for CCU patch
- Update Linux commit id in dts/dtsi patch

Any comment on this v2 patch series?

Thanks.

Regards
Ley Foon

#21 lore raw

cover Add Intel Agilex SoC support

Quoted 20 lines · Ley Foon Tan
Quoted 11 lines · Ley Foon Tan

This is 2nd version of patchset to add Intel Agilex SoC[1] support. This patchset needs to apply after patch in [2] for Designware i2c clock from DM.

Intel Agilex SoC is with a 64-bit quad core ARM Cortex-A53 MPCore hard processor system (HPS). New IPs in Agilex are CCU, clock manager and SDRAM, other IPs have minor changes compared to Stratix 10.

Intel Agilex HPS TRM:
https://www.intel.com/content/dam/www/programmable/us/en/pdfs/literature/hb/agilex/mnl-1100.pdf

Quoted 7 lines

v1->v2:
-------
- Change clock driver to DM
- Reuse base_addr_s10.h from S10
- Add system_manager_s10_agilex_common.h
- Update commit message for CCU patch
- Update Linux commit id in dts/dtsi patch

Quoted 1 line

Any comment on this v2 patch series?

I'd like to see a review from Dinh or Simon.

Signature · 2 lines
Best regards,
Marek Vasut
#22 lore raw

cover Add Intel Agilex SoC support

Marek Vasut <[email protected]> schrieb am Di., 11. Juni 2019, 16:01:

Quoted 25 lines · Ley Foon Tan
Quoted 1 line

On Thu, May 30, 2019 at 5:03 PM Ley Foon Tan <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines

This is 2nd version of patchset to add Intel Agilex SoC[1] support. This patchset needs to apply after patch in [2] for Designware i2c

clock from DM.

Quoted 3 lines
Quoted 3 lines

Intel Agilex SoC is with a 64-bit quad core ARM Cortex-A53 MPCore hard processor system (HPS). New IPs in Agilex are CCU, clock manager

and SDRAM,

Quoted 4 lines
Quoted 4 lines

other IPs have minor changes compared to Stratix 10.

Intel Agilex HPS TRM:

https://www.intel.com/content/dam/www/programmable/us/en/pdfs/literature/hb/agilex/mnl-1100.pdf

Quoted 9 lines
Quoted 8 lines

v1->v2:
-------
- Change clock driver to DM
- Reuse base_addr_s10.h from S10
- Add system_manager_s10_agilex_common.h
- Update commit message for CCU patch
- Update Linux commit id in dts/dtsi patch

Quoted 4 lines
Quoted 1 line

Any comment on this v2 patch series?

I'd like to see a review from Dinh or Simon.

That's on my list. Sorry, but I'm really really short on time for U-Boot, lately :-(

I'll see what I can do to review it soon.

Regards,
Simon

Quoted 1 line
#23 lore raw

cover Add Intel Agilex SoC support

In reply to Ley Foon Tan

Am 30.05.2019 um 11:03 schrieb Ley Foon Tan:

Quoted 1 line

This is 2nd version of patchset to add Intel Agilex SoC[1] support.

If this is v2, why doesn't the subject say so?

Quoted 17 lines

This patchset needs to apply after patch in [2] for Designware i2c clock from DM.

Intel Agilex SoC is with a 64-bit quad core ARM Cortex-A53 MPCore hard processor system (HPS). New IPs in Agilex are CCU, clock manager and SDRAM, other IPs have minor changes compared to Stratix 10.

Intel Agilex HPS TRM:
https://www.intel.com/content/dam/www/programmable/us/en/pdfs/literature/hb/agilex/mnl-1100.pdf

v1->v2:
-------
- Change clock driver to DM
- Reuse base_addr_s10.h from S10
- Add system_manager_s10_agilex_common.h
- Update commit message for CCU patch
- Update Linux commit id in dts/dtsi patch

Quoted 6 lines

History:
---------
[v1]: https://patchwork.ozlabs.org/cover/1097830/

[1]: https://www.intel.com/content/www/us/en/products/programmable/fpga/agilex.html
[2]: https://patchwork.ozlabs.org/patch/1107608/

This has changed to v2 by now (just for the record):
https://patchwork.ozlabs.org/patch/1114251/

Regards,
Simon

Quoted 83 lines

Ley Foon Tan (15):
arm: socfpga: agilex: Add base address for Intel Agilex SoC
arm: socfpga: Move firewall code to firewall file
arm: socfpga: Move Stratix10 and Agilex reset manager common code
arm: socfpga: agilex: Add reset manager support
arm: socfpga: Move Stratix10 and Agilex system manager common code
arm: socfpga: agilex: Add system manager support
clk: agilex: Add clock driver for Agilex.
arm: socfpga: agilex: Add clock manager support
arm: socfpga: agilex: Add CCU support for Agilex
ddr: altera: Restructure Stratix 10 SDRAM driver
ddr: altera: agilex: Add SDRAM driver for Agilex
board: intel: agilex: Add socdk board support for Intel Agilex SoC
arm: socfpga: agilex: Add SPL for Agilex SoC
arm: dts: agilex: Add base dtsi and devkit dts
arm: socfpga: agilex: Enable Agilex SoC build

  arch/arm/Kconfig                              |   4 +-
  arch/arm/dts/Makefile                         |   1 +
  arch/arm/dts/socfpga_agilex.dtsi              | 495 +++++++++++++++
  arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi |  71 +++
  arch/arm/dts/socfpga_agilex_socdk.dts         | 136 +++++
  arch/arm/mach-socfpga/Kconfig                 |  15 +
  arch/arm/mach-socfpga/Makefile                |  18 +
  arch/arm/mach-socfpga/ccu_agilex.c            |  99 +++
  arch/arm/mach-socfpga/clock_manager_agilex.c  |  87 +++
  arch/arm/mach-socfpga/firewall.c              |  97 +++
  .../mach-socfpga/include/mach/base_addr_s10.h |   4 +
  .../mach-socfpga/include/mach/ccu_agilex.h    |  67 +++
  .../mach-socfpga/include/mach/clock_manager.h |   2 +
  .../include/mach/clock_manager_agilex.h       | 329 ++++++++++
  .../mach/{firewall_s10.h => firewall.h}       |  10 +-
  .../mach-socfpga/include/mach/reset_manager.h |  29 +
  .../include/mach/reset_manager_agilex.h       |  38 ++
  .../include/mach/reset_manager_s10.h          |  79 ---
  .../include/mach/system_manager.h             |   2 +
  ..._manager_s10.h => system_manager_agilex.h} |  89 +--
  .../include/mach/system_manager_s10.h         |  46 +-
  .../mach/system_manager_s10_agilex_common.h   |  60 ++
  arch/arm/mach-socfpga/reset_manager.c         |   9 +-
  arch/arm/mach-socfpga/spl_agilex.c            | 100 +++
  arch/arm/mach-socfpga/spl_s10.c               |  84 +--
  board/intel/agilex-socdk/MAINTAINERS          |   7 +
  board/intel/agilex-socdk/Makefile             |   7 +
  board/intel/agilex-socdk/socfpga.c            |   7 +
  configs/socfpga_agilex_defconfig              |  57 ++
  drivers/clk/altera/Makefile                   |   1 +
  drivers/clk/altera/clk-agilex.c               | 568 ++++++++++++++++++
  drivers/ddr/altera/Kconfig                    |   6 +-
  drivers/ddr/altera/Makefile                   |   3 +-
  drivers/ddr/altera/sdram_agilex.c             | 158 +++++
  drivers/ddr/altera/sdram_common.c             | 308 ++++++++++
  .../altera/{sdram_s10.h => sdram_common.h}    |  75 +--
  drivers/ddr/altera/sdram_s10.c                | 302 +---------
  drivers/ddr/altera/sdram_s10.h                | 148 -----
  include/configs/socfpga_agilex_socdk.h        | 208 +++++++
  include/dt-bindings/clock/stratix10-clock.h   |  84 +++
  40 files changed, 3140 insertions(+), 770 deletions(-)

create mode 100644 arch/arm/dts/socfpga_agilex.dtsi
create mode 100644 arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi
create mode 100644 arch/arm/dts/socfpga_agilex_socdk.dts
create mode 100644 arch/arm/mach-socfpga/ccu_agilex.c
create mode 100644 arch/arm/mach-socfpga/clock_manager_agilex.c
create mode 100644 arch/arm/mach-socfpga/firewall.c
create mode 100644 arch/arm/mach-socfpga/include/mach/ccu_agilex.h
create mode 100644 arch/arm/mach-socfpga/include/mach/clock_manager_agilex.h rename arch/arm/mach-socfpga/include/mach/{firewall_s10.h => firewall.h} (94%) create mode 100644 arch/arm/mach-socfpga/include/mach/reset_manager_agilex.h copy arch/arm/mach-socfpga/include/mach/{system_manager_s10.h => system_manager_agilex.h} (51%) create mode 100644 arch/arm/mach-socfpga/include/mach/system_manager_s10_agilex_common.h create mode 100644 arch/arm/mach-socfpga/spl_agilex.c
create mode 100644 board/intel/agilex-socdk/MAINTAINERS
create mode 100644 board/intel/agilex-socdk/Makefile
create mode 100644 board/intel/agilex-socdk/socfpga.c
create mode 100644 configs/socfpga_agilex_defconfig
create mode 100644 drivers/clk/altera/clk-agilex.c
create mode 100644 drivers/ddr/altera/sdram_agilex.c
create mode 100644 drivers/ddr/altera/sdram_common.c
copy drivers/ddr/altera/{sdram_s10.h => sdram_common.h} (78%)
create mode 100644 include/configs/socfpga_agilex_socdk.h
create mode 100644 include/dt-bindings/clock/stratix10-clock.h

#24 lore raw

cover Add Intel Agilex SoC support

Quoted 5 lines · Simon Goldschmidt

Am 30.05.2019 um 11:03 schrieb Ley Foon Tan:

Quoted 1 line

This is 2nd version of patchset to add Intel Agilex SoC[1] support.

If this is v2, why doesn't the subject say so?

This is v2.
Forgot change the subject to v2 after sent the patches. Sorry about that.

Regards
Ley Foon