Add new DDR driver support for Agilex7
Subsystems (3)
cover Add new DDR driver support for Agilex7
From: Sin Hui Kho <[email protected]>
*** BLURB HERE ***
Sin Hui Kho (5):
ddr: altera: agilex7: Add SDRAM driver for AGILEX7
arm: socfpga: agilex7: Add boot scratch register used for DDR driver
arm: socfpga: soc64: Add F2SDRAM sideband manager base address for
SOC64
arm: socfpga: agilex7: Add DDR handoff data support for AGILEX7
ddr: altera: Add IOSSM mailbox support for DDR driver
.../include/mach/base_addr_soc64.h | 1 + .../mach-socfpga/include/mach/handoff_soc64.h | 11 +- .../include/mach/system_manager_soc64.h | 19 +- arch/arm/mach-socfpga/wrap_handoff_soc64.c | 4 + drivers/ddr/altera/Makefile | 1 + drivers/ddr/altera/iossm_mailbox.c | 847 ++++++++++++++++++ drivers/ddr/altera/iossm_mailbox.h | 142 +++ drivers/ddr/altera/sdram_agilex7.c | 331 +++++++ drivers/ddr/altera/sdram_soc64.c | 15 +- drivers/ddr/altera/sdram_soc64.h | 9 +- 10 files changed, 1373 insertions(+), 7 deletions(-) create mode 100644 drivers/ddr/altera/iossm_mailbox.c create mode 100644 drivers/ddr/altera/iossm_mailbox.h create mode 100644 drivers/ddr/altera/sdram_agilex7.c
Signature · 1 line
2.25.1
PATCH 1/5 ddr: altera: agilex7: Add SDRAM driver for AGILEX7
From: Sin Hui Kho <[email protected]>
Add SDRAM driver for AGILEX7 SoC.
--- drivers/ddr/altera/Makefile | 1 + drivers/ddr/altera/sdram_agilex7.c | 331 +++++++++++++++++++++++++++++ drivers/ddr/altera/sdram_soc64.c | 15 +- drivers/ddr/altera/sdram_soc64.h | 9 +- 4 files changed, 351 insertions(+), 5 deletions(-) create mode 100644 drivers/ddr/altera/sdram_agilex7.c
drivers/ddr/altera/Makefile +1 -0
@@ -12,4 +12,5 @@ obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += sdram_arria10.o obj-$(CONFIG_TARGET_SOCFPGA_STRATIX10) += sdram_soc64.o sdram_s10.o obj-$(CONFIG_TARGET_SOCFPGA_AGILEX) += sdram_soc64.o sdram_agilex.o obj-$(CONFIG_TARGET_SOCFPGA_N5X) += sdram_soc64.o sdram_n5x.o +obj-$(CONFIG_TARGET_SOCFPGA_AGILEX7) += sdram_soc64.o sdram_agilex7.o endif
drivers/ddr/altera/sdram_agilex7.c new file +331 -0
331 lines not on this page · raw message
drivers/ddr/altera/sdram_soc64.c +11 -4
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (C) 2016-2022 Intel Corporation <www.intel.com> +* Copyright (C) 2016-2023 Intel Corporation <www.intel.com> * */
@@ -28,6 +28,7 @@#define PGTABLE_OFF 0x4000 +#if !IS_ENABLED (CONFIG_TARGET_SOCFPGA_AGILEX7 )u32 hmc_readl (struct altera_sdram_plat *plat,u32 reg) {return readl (plat->iomhc + reg);
@@ -99,6 +100,7 @@ int emif_reset(struct altera_sdram_plat *plat)debug ("DDR: %s triggered successly\n" , __func__); return 0; } +#endif #if !IS_ENABLED (CONFIG_TARGET_SOCFPGA_N5X )int poll_hmc_clock_status (void )
@@ -322,8 +324,12 @@ static int altera_sdram_of_to_plat(struct udevice *dev)/* These regs info are part of DDR handoff in bitstream */ #if IS_ENABLED (CONFIG_TARGET_SOCFPGA_N5X )return 0 ; -#endif - +#elif IS_ENABLED (CONFIG_TARGET_SOCFPGA_AGILEX7 ) + addr =dev_read_addr_index (dev,0 ); +if (addr ==FDT_ADDR_T_NONE ) +return -EINVAL ; + plat->mpfe_base_addr = addr; +#else addr =dev_read_addr_index (dev,0 );if (addr ==FDT_ADDR_T_NONE )return -EINVAL ;
@@ -338,7 +344,7 @@ static int altera_sdram_of_to_plat(struct udevice *dev)if (addr ==FDT_ADDR_T_NONE )return -EINVAL ; plat->hmc = (void __iomem *)addr; - +#endif return 0 ; }
@@ -385,6 +391,7 @@ static const struct udevice_id altera_sdram_ids[] = { { .compatible = "altr,sdr-ctl-s10" }, { .compatible = "intel,sdr-ctl-agilex" }, { .compatible = "intel,sdr-ctl-n5x" }, + { .compatible = "intel,sdr-ctl-agilex7" }, {/* sentinel */ } };
drivers/ddr/altera/sdram_soc64.h +8 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (C) 2017-2019 Intel Corporation <www.intel.com> +* Copyright (C) 2017-2023 Intel Corporation <www.intel.com> */ #ifndef _SDRAM_SOC64_H_
@@ -14,11 +14,18 @@ struct altera_sdram_priv {struct reset_ctl_bulk resets; }; +#if IS_ENABLED (CONFIG_TARGET_SOCFPGA_AGILEX7 ) +struct altera_sdram_plat { +fdt_addr_t mpfe_base_addr; +bool multichannel_interleaving; +}; +#else struct altera_sdram_plat {void __iomem *hmc;void __iomem *ddr_sch;void __iomem *iomhc; }; +#endif /* ECC HMC registers */ #define DDRIOCTRL 0x8
Signature · 1 line
2.25.1
PATCH 2/5 arm: socfpga: agilex7: Add boot scratch register used for DDR driver
In reply to [email protected]From: Sin Hui Kho <[email protected]>
Add boot scratch register 8 in system manager used for AGILEX7 DDR driver.
--- .../include/mach/system_manager_soc64.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/include/mach/system_manager_soc64.h +18 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ /* -* Copyright (C) 2019-2021 Intel Corporation <www.intel.com> +* Copyright (C) 2019-2023 Intel Corporation <www.intel.com> */ #ifndef _SYSTEM_MANAGER_SOC64_H_
@@ -102,6 +102,23 @@ void populate_sysmgr_pinmux(void);#define ALT_SYSMGR_SCRATCH_REG_0_DDR_SHA_MASK BIT(30)#define ALT_SYSMGR_SCRATCH_REG_0_DDR_RESET_TYPE_MASK (BIT(29) | BIT(28))#define ALT_SYSMGR_SCRATCH_REG_0_DDR_RESET_TYPE_SHIFT 28 +/* +* Bits for SYSMGR_SOC64_BOOT_SCRATCH_COLD8 +* Bit[31] reserved for FSBL to check DDR DBE is triggered (set by SDM to "1") ? +* +* Bit[30] reserved for FSBL to update the DDR init progress +* 1 - means in progress, 0 - haven't started / DDR is up running. +* +* Bit[29] reserved for FSBL to check OCRAM DBE is triggered (set by SDM to "1") +* +* Bit[17:1] - Setting by Linux EDAC. +* Bit[1](ECC_OCRAM), Bit[16](ECC_DDR0), Bit[17](ECC_DDR1) +*/ +#define ALT_SYSMGR_SCRATCH_REG_8_DDR_DBE_MASK BIT(31) +#define ALT_SYSMGR_SCRATCH_REG_8_DDR_PROGRESS_MASK BIT(30) +#define ALT_SYSMGR_SCRATCH_REG_8_OCRAM_DBE_MASK BIT(29) +#define ALT_SYSMGR_SCRATCH_REG_8_IO96B_HPS_MASK GENMASK(28, 27) +#define ALT_SYSMGR_SCRATCH_REG_8_IO96B_HPS_SHIFT 27#define SYSMGR_SDMMC SYSMGR_SOC64_SDMMC
Signature · 1 line
2.25.1
PATCH 3/5 arm: socfpga: soc64: Add F2SDRAM sideband manager base address for SOC64
In reply to [email protected]From: Sin Hui Kho <[email protected]>
F2SDRAM sideband manager in MPFE is used in DDR driver to configure the data traffic path.
--- arch/arm/mach-socfpga/include/mach/base_addr_soc64.h | 1 + 1 file changed, 1 insertion(+)
arch/arm/mach-socfpga/include/mach/base_addr_soc64.h +1 -0
@@ -17,6 +17,7 @@#else #define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS 0xf8020100#endif +#define SOCFPGA_F2SDRAM_MGR_ADDRESS 0xf8024000#define SOCFPGA_SMMU_ADDRESS 0xfa000000#define SOCFPGA_MAILBOX_ADDRESS 0xffa30000#define SOCFPGA_UART0_ADDRESS 0xffc02000
Signature · 1 line
2.25.1
PATCH 4/5 arm: socfpga: agilex7: Add DDR handoff data support for AGILEX7
In reply to [email protected]From: Sin Hui Kho <[email protected]>
Add AGILEX7 supported DDR handoff data
--- arch/arm/mach-socfpga/include/mach/handoff_soc64.h | 11 ++++++++++- arch/arm/mach-socfpga/wrap_handoff_soc64.c | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/include/mach/handoff_soc64.h +10 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 * -* Copyright (C) 2016-2021 Intel Corporation <www.intel.com> +* Copyright (C) 2016-2023 Intel Corporation <www.intel.com> * */
@@ -27,7 +27,16 @@IS_ENABLED (CONFIG_TARGET_SOCFPGA_AGILEX ) || \ IS_ENABLED(CONFIG_TARGET_SOCFPGA_AGILEX7)#define SOC64_HANDOFF_BASE 0xFFE3F000 +#if IS_ENABLED (CONFIG_TARGET_SOCFPGA_AGILEX7 ) +#define SOC64_HANDOFF_MISC (SOC64_HANDOFF_BASE + 0x628) +/* DDR handoff */ +#define SOC64_HANDOFF_MAGIC_DDR 0x5344524D +#define SOC64_HANDOFF_DDR_BASE (SOC64_HANDOFF_BASE + 0x610) +#define SOC64_HANDOFF_DDR_LEN 2 +#define SOC64_HANDOFF_DDR_INTERLEAVING_MODE_MASK BIT(0) +#else #define SOC64_HANDOFF_MISC (SOC64_HANDOFF_BASE + 0x610) +#endif #elif IS_ENABLED (CONFIG_TARGET_SOCFPGA_N5X )#define SOC64_HANDOFF_BASE 0xFFE5F000#define SOC64_HANDOFF_MISC (SOC64_HANDOFF_BASE + 0x630)
arch/arm/mach-socfpga/wrap_handoff_soc64.c +4 -0
@@ -31,6 +31,10 @@ static enum endianness check_endianness(u32 handoff)case SOC64_HANDOFF_DDR_PHY_INIT_ENGINE_MAGIC :debug ("%s: PHY engine handoff data\n" , __func__);return LITTLE_ENDIAN ; +#elif IS_ENABLED (CONFIG_TARGET_SOCFPGA_AGILEX7 ) +case SOC64_HANDOFF_MAGIC_DDR : +debug ("%s: SOC64_HANDOFF_MAGIC_DDR\n" , __func__); +return BIG_ENDIAN ;#endif default :debug ("%s: Unknown endianness!!\n" , __func__);
Signature · 1 line
2.25.1
PATCH 5/5 ddr: altera: Add IOSSM mailbox support for DDR driver
In reply to [email protected]From: Sin Hui Kho <[email protected]>
Add IOSSM mailbox support for DDR driver to access memory interface implemented on an IO96B instance.
--- drivers/ddr/altera/Makefile | 2 +- drivers/ddr/altera/iossm_mailbox.c | 847 +++++++++++++++++++++++++++++ drivers/ddr/altera/iossm_mailbox.h | 142 +++++ 3 files changed, 990 insertions(+), 1 deletion(-) create mode 100644 drivers/ddr/altera/iossm_mailbox.c create mode 100644 drivers/ddr/altera/iossm_mailbox.h
drivers/ddr/altera/Makefile +1 -1
@@ -12,5 +12,5 @@ obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += sdram_arria10.o obj-$(CONFIG_TARGET_SOCFPGA_STRATIX10) += sdram_soc64.o sdram_s10.o obj-$(CONFIG_TARGET_SOCFPGA_AGILEX) += sdram_soc64.o sdram_agilex.o obj-$(CONFIG_TARGET_SOCFPGA_N5X) += sdram_soc64.o sdram_n5x.o -obj-$(CONFIG_TARGET_SOCFPGA_AGILEX7) += sdram_soc64.o sdram_agilex7.o +obj-$(CONFIG_TARGET_SOCFPGA_AGILEX7) += sdram_soc64.o sdram_agilex7.o iossm_mailbox.o endif
drivers/ddr/altera/iossm_mailbox.c new file +847 -0
847 lines not on this page · raw message
drivers/ddr/altera/iossm_mailbox.h new file +142 -0
142 lines not on this page · raw message
Signature · 1 line
2.25.1