andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "intel: agilex: Fix memory controller driver" into integration

This commit is contained in:
Paul Beesley 2019-08-15 15:30:51 +00:00 committed by TrustedFirmware Code Review
parent 99becbe3df b266d82148
commit d1b6013d84
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plat/intel/soc/agilex/include/agilex_memory_controller.h
View File

@ -10,6 +10,8 @@
#define AGX_MPFE_IOHMC_REG_DRAMADDRW 0xf80100a8 #define AGX_MPFE_IOHMC_REG_DRAMADDRW 0xf80100a8
#define AGX_MPFE_IOHMC_CTRLCFG0 0xf8010028 #define AGX_MPFE_IOHMC_CTRLCFG0 0xf8010028
#define AGX_MPFE_IOHMC_CTRLCFG1 0xf801002c #define AGX_MPFE_IOHMC_CTRLCFG1 0xf801002c
#define AGX_MPFE_IOHMC_CTRLCFG2 0xf8010030
#define AGX_MPFE_IOHMC_CTRLCFG3 0xf8010034
#define AGX_MPFE_IOHMC_DRAMADDRW 0xf80100a8 #define AGX_MPFE_IOHMC_DRAMADDRW 0xf80100a8
#define AGX_MPFE_IOHMC_DRAMTIMING0 0xf8010050 #define AGX_MPFE_IOHMC_DRAMTIMING0 0xf8010050
#define AGX_MPFE_IOHMC_CALTIMING0 0xf801007c #define AGX_MPFE_IOHMC_CALTIMING0 0xf801007c
@ -127,6 +129,7 @@
#define AGX_NOC_FW_DDR_SCR_NONMPUREGION0ADDR_LIMIT 0xf8020298 #define AGX_NOC_FW_DDR_SCR_NONMPUREGION0ADDR_LIMIT 0xf8020298
#define AGX_SOC_NOC_FW_DDR_SCR_ENABLE 0xf8020200 #define AGX_SOC_NOC_FW_DDR_SCR_ENABLE 0xf8020200
#define AGX_SOC_NOC_FW_DDR_SCR_ENABLESET 0xf8020204
#define AGX_CCU_NOC_DI_SET_MSK 0x10 #define AGX_CCU_NOC_DI_SET_MSK 0x10
#define AGX_SYSMGR_CORE_HMC_CLK 0xffd120b4 #define AGX_SYSMGR_CORE_HMC_CLK 0xffd120b4
@ -156,6 +159,7 @@
#define IOHMC_DRAMADDRW_CFG_ROW_ADDR_WIDTH(x) (((x) & 0x003e0) >> 5) #define IOHMC_DRAMADDRW_CFG_ROW_ADDR_WIDTH(x) (((x) & 0x003e0) >> 5)
#define AGX_SDRAM_0_LB_ADDR 0x0 #define AGX_SDRAM_0_LB_ADDR 0x0
#define AGX_DDR_SIZE 0x40000000
int init_hard_memory_controller(void); int init_hard_memory_controller(void);

29
plat/intel/soc/agilex/soc/agilex_memory_controller.c
View File

@ -19,7 +19,7 @@
#define MAX_MEM_CAL_RETRY 3 #define MAX_MEM_CAL_RETRY 3
#define PRE_CALIBRATION_DELAY 1 #define PRE_CALIBRATION_DELAY 1
#define POST_CALIBRATION_DELAY 1 #define POST_CALIBRATION_DELAY 1
#define TIMEOUT_EMIF_CALIBRATION 100 #define TIMEOUT_EMIF_CALIBRATION 1000
#define CLEAR_EMIF_DELAY 50000 #define CLEAR_EMIF_DELAY 50000
#define CLEAR_EMIF_TIMEOUT 0x100000 #define CLEAR_EMIF_TIMEOUT 0x100000
#define TIMEOUT_INT_RESP 10000 #define TIMEOUT_INT_RESP 10000
@ -109,7 +109,7 @@ static int clear_emif(void)
static int mem_calibration(void) static int mem_calibration(void)
{ {
int status = 0; int status;
uint32_t data; uint32_t data;
unsigned long timeout; unsigned long timeout;
unsigned long retry = 0; unsigned long retry = 0;
@ -125,13 +125,13 @@ static int mem_calibration(void)
data = mmio_read_32(AGX_MPFE_HMC_ADP_DDRCALSTAT); data = mmio_read_32(AGX_MPFE_HMC_ADP_DDRCALSTAT);
if (AGX_MPFE_HMC_ADP_DDRCALSTAT_CAL(data) == 1) if (AGX_MPFE_HMC_ADP_DDRCALSTAT_CAL(data) == 1)
break; break;
udelay(1); mdelay(1);
} while (++timeout < TIMEOUT_EMIF_CALIBRATION); } while (++timeout < TIMEOUT_EMIF_CALIBRATION);
if (AGX_MPFE_HMC_ADP_DDRCALSTAT_CAL(data) == 0) { if (AGX_MPFE_HMC_ADP_DDRCALSTAT_CAL(data) == 0) {
status = clear_emif(); status = clear_emif();
if (status) if (status)
ERROR("Failed to clear Emif\n"); ERROR("Failed to clear Emif\n");
} else { } else {
break; break;
} }
@ -348,9 +348,11 @@ void configure_hmc_adaptor_regs(void)
mmio_read_32(AGX_MPFE_IOHMC_REG_NIOSRESERVE0_OFST)); mmio_read_32(AGX_MPFE_IOHMC_REG_NIOSRESERVE0_OFST));
dram_io_width = (dram_io_width & 0xFF) >> 5; dram_io_width = (dram_io_width & 0xFF) >> 5;
mmio_clrsetbits_32(AGX_MPFE_HMC_ADP_DDRIOCTRL, data = mmio_read_32(AGX_MPFE_IOHMC_CTRLCFG3);
AGX_MPFE_HMC_ADP_DDRIOCTRL_IO_SIZE_MSK,
dram_io_width << AGX_MPFE_HMC_ADP_DDRIOCTRL_IO_SIZE_OFST); dram_io_width |= (data & 0x4);
mmio_write_32(AGX_MPFE_HMC_ADP_DDRIOCTRL, dram_io_width);
/* Copy dram addr width from IOHMC to HMC ADP */ /* Copy dram addr width from IOHMC to HMC ADP */
data = mmio_read_32(AGX_MPFE_IOHMC_DRAMADDRW); data = mmio_read_32(AGX_MPFE_IOHMC_DRAMADDRW);
@ -358,10 +360,15 @@ void configure_hmc_adaptor_regs(void)
/* Enable nonsecure access to DDR */ /* Enable nonsecure access to DDR */
mmio_write_32(AGX_NOC_FW_DDR_SCR_MPUREGION0ADDR_LIMIT, mmio_write_32(AGX_NOC_FW_DDR_SCR_MPUREGION0ADDR_LIMIT,
0x4000000 - 1); AGX_DDR_SIZE - 1);
mmio_write_32(AGX_NOC_FW_DDR_SCR_MPUREGION0ADDR_LIMITEXT,
0x1f);
mmio_write_32(AGX_NOC_FW_DDR_SCR_NONMPUREGION0ADDR_LIMIT, mmio_write_32(AGX_NOC_FW_DDR_SCR_NONMPUREGION0ADDR_LIMIT,
0x4000000 - 1); AGX_DDR_SIZE - 1);
mmio_write_32(AGX_SOC_NOC_FW_DDR_SCR_ENABLE, BIT(0) | BIT(8));
mmio_write_32(AGX_SOC_NOC_FW_DDR_SCR_ENABLESET, BIT(0) | BIT(8));
/* ECC enablement */ /* ECC enablement */
data = mmio_read_32(AGX_MPFE_IOHMC_REG_CTRLCFG1); data = mmio_read_32(AGX_MPFE_IOHMC_REG_CTRLCFG1);