Intel Stratix10/Agilex Additions
Subsystems (3)
v2 cover Intel Stratix10/Agilex Additions
From: Thor Thayer <[email protected]>
This patchset is rebased on top of [1] and adds SMMU support for Stratix10 and fixes an ECC access issue with Stratix10 and Agilex.
[1] [U-Boot,v8,00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/
Thor Thayer (2):
arm: socfpga: stratix10: Enable SMMU access
ddr: socfpga: Enable ARM64 Non-Secure SDRAM ECC Access
arch/arm/mach-socfpga/include/mach/firewall.h | 7 +++++++ drivers/ddr/altera/sdram_agilex.c | 6 +++--- drivers/ddr/altera/sdram_s10.c | 20 +++++++++++++++++--- 3 files changed, 27 insertions(+), 6 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/2 arm: socfpga: stratix10: Enable SMMU access
From: Thor Thayer <[email protected]>
Enable TCU access through the Stratix10 CCU so that the SMMU can access the SDRAM.
---
v2 Rebase patch on top of pending patchset
[PATCH v8 00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/
--- arch/arm/mach-socfpga/include/mach/firewall.h | 7 +++++++ drivers/ddr/altera/sdram_s10.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+)
arch/arm/mach-socfpga/include/mach/firewall.h +7 -0
@@ -95,6 +95,13 @@ struct socfpga_firwall_l4_sys {#define CCU_IOM_MPRT_ADMASK_MEM_RAM0 0x18628 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE0 0x2c520 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1A 0x2c540 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1B 0x2c560 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1C 0x2c580 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1D 0x2c5a0 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1E 0x2c5c0 +#define CCU_ADMASK_P_MASK BIT(0)#define CCU_ADMASK_NS_MASK BIT(1)
drivers/ddr/altera/sdram_s10.c +14 -0
@@ -104,6 +104,20 @@ int sdram_mmr_init_full(struct udevice *dev)clrbits_le32 (CCU_REG_ADDR (CCU_IOM_MPRT_ADBASE_MEMSPACE1E ),CCU_ADBASE_DI_MASK ); +/* Enable access to DDR from TCU */ +clrbits_le32 (CCU_REG_ADDR (CCU_TCU_MPRT_ADBASE_MEMSPACE0 ), +CCU_ADBASE_DI_MASK ); +clrbits_le32 (CCU_REG_ADDR (CCU_TCU_MPRT_ADBASE_MEMSPACE1A ), +CCU_ADBASE_DI_MASK ); +clrbits_le32 (CCU_REG_ADDR (CCU_TCU_MPRT_ADBASE_MEMSPACE1B ), +CCU_ADBASE_DI_MASK ); +clrbits_le32 (CCU_REG_ADDR (CCU_TCU_MPRT_ADBASE_MEMSPACE1C ), +CCU_ADBASE_DI_MASK ); +clrbits_le32 (CCU_REG_ADDR (CCU_TCU_MPRT_ADBASE_MEMSPACE1D ), +CCU_ADBASE_DI_MASK ); +clrbits_le32 (CCU_REG_ADDR (CCU_TCU_MPRT_ADBASE_MEMSPACE1E ), +CCU_ADBASE_DI_MASK ); +/* this enables nonsecure access to DDR */ /* mpuregion0addr_limit */ FW_MPU_DDR_SCR_WRITEL (0xFFFF0000 ,FW_MPU_DDR_SCR_MPUREGION0ADDR_LIMIT );
Signature · 1 line
2.7.4
Tan
PATCH v2 1/2 arm: socfpga: stratix10: Enable SMMU access
Quoted 12 lines
-----Original Message-----
From: thor.thayer at linux.intel.com <[email protected]>
Sent: Saturday, December 7, 2019 3:48 AM
To: marex at denx.de; simon.k.r.goldschmidt at gmail.com; Tan, Ley Foon <[email protected]>
Cc: albert.u.boot at aribaud.net; Ang, Chee Hong <[email protected]>; Chee, Tien Fong <[email protected]>; u-boot at lists.denx.de; Thor Thayer <[email protected]>
Subject: [PATCHv2 1/2] arm: socfpga: stratix10: Enable SMMU access
Quoted 6 lines
From: Thor Thayer <[email protected]>
Enable TCU access through the Stratix10 CCU so that the SMMU can access the SDRAM.
Signed-off-by Thor Thayer <[email protected]>
Quoted 70 lines
---
v2 Rebase patch on top of pending patchset
[PATCH v8 00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/--- arch/arm/mach-socfpga/include/mach/firewall.h | 7 +++++++ drivers/ddr/altera/sdram_s10.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+)arch/arm/mach-socfpga/include/mach/firewall.h +7
-0@@ -95,6 +95,13 @@ struct socfpga_firwall_l4_sys {#define CCU_IOM_MPRT_ADMASK_MEM_RAM0 0x18628 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE0 0x2c520 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1A 0x2c540 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1B 0x2c560 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1C 0x2c580 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1D 0x2c5a0 +#define CCU_TCU_MPRT_ADBASE_MEMSPACE1E 0x2c5c0 +#define CCU_ADMASK_P_MASK BIT(0)#define CCU_ADMASK_NS_MASK BIT(1)drivers/ddr/altera/sdram_s10.c +2
-0@@ -104,6 +104,20 @@ int sdram_mmr_init_full(struct udevice *dev) clrbits_le32(CCU_REG_ADDR(CCU_IOM_MPRT_ADBASE_MEMSPACE 1E),CCU_ADBASE_DI_MASK ); +/* Enable access to DDR from TCU */ + clrbits_le32(CCU_REG_ADDR(CCU_TCU_MPRT_ADBASE_MEMSPACE0),
drivers/ddr/altera/sdram_s10.c +2
-0+ CCU_ADBASE_DI_MASK); +clrbits_le32(CCU_REG_ADDR(CCU_TCU_MPRT_ADBASE_MEMSPACE
1A),drivers/ddr/altera/sdram_s10.c +2
-0+ CCU_ADBASE_DI_MASK); +clrbits_le32(CCU_REG_ADDR(CCU_TCU_MPRT_ADBASE_MEMSPACE
1B),drivers/ddr/altera/sdram_s10.c +2
-0+ CCU_ADBASE_DI_MASK); +clrbits_le32(CCU_REG_ADDR(CCU_TCU_MPRT_ADBASE_MEMSPACE
1C),drivers/ddr/altera/sdram_s10.c +2
-0+ CCU_ADBASE_DI_MASK); +clrbits_le32(CCU_REG_ADDR(CCU_TCU_MPRT_ADBASE_MEMSPACE
1D),drivers/ddr/altera/sdram_s10.c +2
-0+ CCU_ADBASE_DI_MASK); +clrbits_le32(CCU_REG_ADDR(CCU_TCU_MPRT_ADBASE_MEMSPACE
1E),drivers/ddr/altera/sdram_s10.c +2
-0+ CCU_ADBASE_DI_MASK); +/* this enables nonsecure access to DDR */ /* mpuregion0addr_limit */ FW_MPU_DDR_SCR_WRITEL(0xFFFF0000,
FW_MPU_DDR_SCR_MPUREGION0ADDR_LIMIT);
--
2.7.4
PATCH v2 2/2 ddr: socfpga: Enable ARM64 Non-Secure SDRAM ECC Access
In reply to thor.thayer at linux.intel.comFrom: Thor Thayer <[email protected]>
The ECC registers in the SDRAM HMC Adapter should always be accessible (both when ECC is enabled and disabled). Currently, the registers are accessible only when ECC is enabled.
The ECC Enabled bit is used to determine the status of ECC by later OSes so always allow access.
---
v2 New Patch. Rebase patch on top of pending patchset
[PATCH v8 00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/
--- drivers/ddr/altera/sdram_agilex.c | 6 +++--- drivers/ddr/altera/sdram_s10.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/ddr/altera/sdram_agilex.c +3 -3
@@ -143,9 +143,6 @@ int sdram_mmr_init_full(struct udevice *dev)setbits_le32 (plat->hmc +ERRINTEN ,DDR_HMC_ERRINTEN_DERRINTEN_EN_SET_MSK ); -/* Enable non-secure writes to HMC Adapter for SDRAM ECC */ -writel (FW_HMC_ADAPTOR_MPU_MASK ,FW_HMC_ADAPTOR_REG_ADDR ); -if (!cpu_has_been_warmreset ())sdram_init_ecc_bits (&bd); }else {
@@ -158,6 +155,9 @@ int sdram_mmr_init_full(struct udevice *dev) DDR_HMC_ECCCTL2_AWB_EN_SET_MSK)); } +/* Enable non-secure reads/writes to HMC Adapter for SDRAM ECC */ +writel (FW_HMC_ADAPTOR_MPU_MASK ,FW_HMC_ADAPTOR_REG_ADDR ); +sdram_size_check (&bd); priv->info.base = bd.bi_dram[0 ].start;
drivers/ddr/altera/sdram_s10.c +3 -3
@@ -306,9 +306,6 @@ int sdram_mmr_init_full(struct udevice *dev) DDR_HMC_ECCCTL2_AWB_EN_SET_MSK));hmc_ecc_writel (plat,DDR_HMC_ERRINTEN_INTMASK ,ERRINTENS ); -/* Enable non-secure writes to HMC Adapter for SDRAM ECC */ -writel (FW_HMC_ADAPTOR_MPU_MASK ,FW_HMC_ADAPTOR_REG_ADDR ); -/* Initialize memory content if not from warm reset */ if (!cpu_has_been_warmreset ())sdram_init_ecc_bits (&bd);
@@ -322,6 +319,9 @@ int sdram_mmr_init_full(struct udevice *dev) DDR_HMC_ECCCTL2_AWB_EN_SET_MSK)); } +/* Enable non-secure reads/writes to HMC Adapter for SDRAM ECC */ +writel (FW_HMC_ADAPTOR_MPU_MASK ,FW_HMC_ADAPTOR_REG_ADDR ); +sdram_size_check (&bd); priv->info.base = bd.bi_dram[0 ].start;
Signature · 1 line
2.7.4
Tan
PATCH v2 2/2 ddr: socfpga: Enable ARM64 Non-Secure SDRAM ECC Access
Quoted 15 lines
-----Original Message-----
From: thor.thayer at linux.intel.com <[email protected]>
Sent: Saturday, December 7, 2019 3:48 AM
To: marex at denx.de; simon.k.r.goldschmidt at gmail.com; Tan, Ley Foon <[email protected]>
Cc: albert.u.boot at aribaud.net; Ang, Chee Hong <[email protected]>; Chee, Tien Fong <[email protected]>; u-boot at lists.denx.de; Thor Thayer <[email protected]>
Subject: [PATCHv2 2/2] ddr: socfpga: Enable ARM64 Non-Secure SDRAM ECC AccessFrom: Thor Thayer <[email protected]>
Quoted 8 lines
The ECC registers in the SDRAM HMC Adapter should always be accessible (both when ECC is enabled and disabled).
Currently, the registers are accessible only when ECC is enabled.The ECC Enabled bit is used to determine the status of ECC by later OSes so always allow access.
Signed-off-by Thor Thayer <[email protected]>
Quoted 69 lines
---
v2 New Patch. Rebase patch on top of pending patchset
[PATCH v8 00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/--- drivers/ddr/altera/sdram_agilex.c | 6 +++--- drivers/ddr/altera/sdram_s10.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/ddr/altera/sdram_agilex.c +0
-3@@ -143,9 +143,6 @@ int sdram_mmr_init_full(struct udevice *dev)setbits_le32(plat->hmc + ERRINTEN, DDR_HMC_ERRINTEN_DERRINTEN_EN_SET_MSK); -/* Enable non-secure writes to HMC Adapter for SDRAM ECC */ -writel (FW_HMC_ADAPTOR_MPU_MASK , FW_HMC_ADAPTOR_REG_ADDR); -if (!cpu_has_been_warmreset ())drivers/ddr/altera/sdram_agilex.c +3
-0sdram_init_ecc_bits (&bd); }else {@@ -158,6 +155,9 @@ int sdram_mmr_init_full(struct udevice *dev) DDR_HMC_ECCCTL2_AWB_EN_SET_MSK)); } +/* Enable non-secure reads/writes to HMC Adapter for SDRAM ECC */ +writel (FW_HMC_ADAPTOR_MPU_MASK ,FW_HMC_ADAPTOR_REG_ADDR ); +sdram_size_check (&bd);
priv->info.base= bd.bi_dram[0].start; diff --gita/drivers/ddr/altera/sdram_s10.cb/drivers/ddr/altera/sdram_s10.cindexa7bf82e4e5ce..2b8889260f9f100644drivers/ddr/altera/sdram_s10.c +0
-3@@ -306,9 +306,6 @@ int sdram_mmr_init_full(struct udevice *dev)DDR_HMC_ECCCTL2_AWB_EN_SET_MSK)); hmc_ecc_writel(plat, DDR_HMC_ERRINTEN_INTMASK, ERRINTENS); -/* Enable non-secure writes to HMC Adapter for SDRAM ECC */ -writel (FW_HMC_ADAPTOR_MPU_MASK , FW_HMC_ADAPTOR_REG_ADDR); -drivers/ddr/altera/sdram_s10.c +3
-0/* Initialize memory content if not from warm reset */ if (!cpu_has_been_warmreset ())sdram_init_ecc_bits (&bd);@@ -322,6 +319,9 @@ int sdram_mmr_init_full(struct udevice *dev) DDR_HMC_ECCCTL2_AWB_EN_SET_MSK)); } +/* Enable non-secure reads/writes to HMC Adapter for SDRAM ECC */ +writel (FW_HMC_ADAPTOR_MPU_MASK ,FW_HMC_ADAPTOR_REG_ADDR ); +sdram_size_check (&bd);
priv->info.base= bd.bi_dram[0].start;
--
2.7.4
v2 cover Intel Stratix10/Agilex Additions
In reply to thor.thayer at linux.intel.comQuoted 8 lines · thor.thayer at linux.intel.com
From: Thor Thayer <[email protected]>
This patchset is rebased on top of [1] and adds SMMU support for Stratix10 and fixes an ECC access issue with Stratix10 and Agilex.
[1] [U-Boot,v8,00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/
OK, I will let Ley handle this and prepare a PR for -next.
Tan
v2 cover Intel Stratix10/Agilex Additions
Quoted 15 lines
-----Original Message-----
From: Marek Vasut <[email protected]>
Sent: Saturday, December 7, 2019 8:24 AM
To: thor.thayer at linux.intel.com; simon.k.r.goldschmidt at gmail.com; Tan, Ley Foon <[email protected]>
Cc: albert.u.boot at aribaud.net; Ang, Chee Hong <[email protected]>; Chee, Tien Fong <[email protected]>; u-boot at lists.denx.de
Subject: Re: [PATCHv2 0/2] Intel Stratix10/Agilex AdditionsQuoted 2 lines · thor.thayer at linux.intel.com
From: Thor Thayer <[email protected]>
Quoted 7 lines
Quoted 5 lines
This patchset is rebased on top of [1] and adds SMMU support for Stratix10 and fixes an ECC access issue with Stratix10 and Agilex.
[1] [U-Boot,v8,00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/OK, I will let Ley handle this and prepare a PR for -next.
Simon already sent PR for Agilex series.
https://lists.denx.de/pipermail/u-boot/2019-December/393430.html
Regards
Ley Foon
Tan
v2 cover Intel Stratix10/Agilex Additions
In reply to Marek VasutQuoted 15 lines
-----Original Message-----
From: Marek Vasut <[email protected]>
Sent: Saturday, December 7, 2019 8:24 AM
To: thor.thayer at linux.intel.com; simon.k.r.goldschmidt at gmail.com; Tan, Ley Foon <[email protected]>
Cc: albert.u.boot at aribaud.net; Ang, Chee Hong <[email protected]>; Chee, Tien Fong <[email protected]>; u-boot at lists.denx.de
Subject: Re: [PATCHv2 0/2] Intel Stratix10/Agilex AdditionsQuoted 2 lines · thor.thayer at linux.intel.com
From: Thor Thayer <[email protected]>
Quoted 7 lines
Quoted 5 lines
This patchset is rebased on top of [1] and adds SMMU support for Stratix10 and fixes an ECC access issue with Stratix10 and Agilex.
[1] [U-Boot,v8,00/19] Add Intel Agilex SoC support
https://patchwork.ozlabs.org/cover/1201373/OK, I will let Ley handle this and prepare a PR for -next.
I will send PR for these 2 patches from Thor.
Regards
Ley Foon