broadcom/cygnus: Enable DDR auto self-refresh

Enable auto entry and auto exit self-refresh.
Configure entry idle time to 16x long count sequences.
Where a long count sequence is 1024 cycles.
The idle entry configuration is based on 32x of the DLL lock time (512 cycles).
A conservative setting to help minimize self-refresh enter/exit thrashing.

BUG=chrome-os-partner:36456
BRANCH=broadcom-firmware
TEST=When enable configuration CYGNUS_SDRAM_TEST_DDR,
print on console:

sdram initialization is completed.
test ddr start from 0x60000000 to 0x80000000
...
test ddr end: fail=0
Translation table is @ 02004000
Mapping address range [0x00000000:0x00000000) as uncached

Change-Id: Ibad220429fd52ead2933db03bec1a555f9385e53
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 3768f82ca268fb854f8c4753916518a1efdf887d
Original-Reviewed-on: https://chrome-internal-review.googlesource.com/212125
Original-Reviewed-by: Scott Branden <sbranden@broadcom.com>
Original-Reviewed-by: Daisuke Nojiri <dnojiri@google.com>
Original-Commit-Queue: Daisuke Nojiri <dnojiri@google.com>
Original-Tested-by: Daisuke Nojiri <dnojiri@google.com>
Original-Signed-off-by: Icarus Chau <ichau@broadcom.com>
Original-Change-Id: Icac1e12745d048b32e1804a546f6b49c8b5953c0
Original-Reviewed-on: https://chromium-review.googlesource.com/265862
Original-Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Original-Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Original-Trybot-Ready: Daisuke Nojiri <dnojiri@chromium.org>
Original-Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: http://review.coreboot.org/9930
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Icarus Chau 2015-04-07 16:09:24 -07:00 committed by Patrick Georgi
parent bcdbdc6761
commit be47636de0
4 changed files with 95 additions and 0 deletions

View File

@ -51,6 +51,14 @@ config CYGNUS_DDR800
bool "DDR Speed at 800MHz" bool "DDR Speed at 800MHz"
default y default y
config CYGNUS_DDR_AUTO_SELF_REFRESH_ENABLE
bool "Enable DDR auto self-refresh"
default y
help
Warning: M0 expects that auto self-refresh is enabled. Modify
with caution.
config CYGNUS_SHMOO_REUSE_DDR_32BIT config CYGNUS_SHMOO_REUSE_DDR_32BIT
bool "Indicate if DDR width is 32-bit" bool "Indicate if DDR width is 32-bit"
default n default n

View File

@ -1490,6 +1490,27 @@ void ddr_init2(void)
} }
} }
#if CONFIG_CYGNUS_DDR_AUTO_SELF_REFRESH_ENABLE
#if (DDR_AUTO_SELF_REFRESH_IDLE_COUNT > 0) & (DDR_AUTO_SELF_REFRESH_IDLE_COUNT <= 0xff)
/* Enable auto self-refresh */
reg32_set_bits((unsigned int *)DDR_DENALI_CTL_57,
0x2 << DDR_DENALI_CTL_57__LP_AUTO_EXIT_EN_R |
0x2 << DDR_DENALI_CTL_57__LP_AUTO_ENTRY_EN_R );
reg32_set_bits((unsigned int *)DDR_DENALI_CTL_58,
DDR_AUTO_SELF_REFRESH_IDLE_COUNT << DDR_DENALI_CTL_58__LP_AUTO_SR_IDLE_R);
#else
#error DDR_AUTO_SELF_REFRESH_IDLE_COUNT out of range
#endif
#else
/* Disable auto-self refresh */
reg32_clear_bits((unsigned int *)DDR_DENALI_CTL_57,
0x2 << DDR_DENALI_CTL_57__LP_AUTO_EXIT_EN_R |
0x2 << DDR_DENALI_CTL_57__LP_AUTO_ENTRY_EN_R );
reg32_clear_bits((unsigned int *)DDR_DENALI_CTL_58,
0xff << DDR_DENALI_CTL_58__LP_AUTO_SR_IDLE_R );
#endif
/* Start the DDR */ /* Start the DDR */
reg32_set_bits((volatile uint32_t *)DDR_DENALI_CTL_00, 0x01); reg32_set_bits((volatile uint32_t *)DDR_DENALI_CTL_00, 0x01);

View File

@ -29,4 +29,8 @@
#else #else
#define SDI_NUM_ROWS 65536 #define SDI_NUM_ROWS 65536
#endif #endif
/* Idle count (in units of 1024 cycles) before auto entering self-refresh */
#define DDR_AUTO_SELF_REFRESH_IDLE_COUNT 16
#endif /* __SOC_BROADCOM_CYGNUS_CONFIG_H__ */ #endif /* __SOC_BROADCOM_CYGNUS_CONFIG_H__ */

View File

@ -114,6 +114,68 @@
#define DDR_DENALI_CTL_56_DATAMASK 0xffffffff #define DDR_DENALI_CTL_56_DATAMASK 0xffffffff
#define DDR_DENALI_CTL_56_RDWRMASK 0x00000000 #define DDR_DENALI_CTL_56_RDWRMASK 0x00000000
#define DDR_DENALI_CTL_56_RESETVALUE 0x0 #define DDR_DENALI_CTL_56_RESETVALUE 0x0
#define DDR_DENALI_CTL_57 0x180100e4
#define DDR_DENALI_CTL_57_BASE 0x0e4
#define DDR_DENALI_CTL_57__LP_AUTO_EXIT_EN_L 26
#define DDR_DENALI_CTL_57__LP_AUTO_EXIT_EN_R 24
#define DDR_DENALI_CTL_57__LP_AUTO_EXIT_EN_WIDTH 3
#define DDR_DENALI_CTL_57__LP_AUTO_EXIT_EN_RESETVALUE 0x0
#define DDR_DENALI_CTL_57__LP_AUTO_ENTRY_EN_L 18
#define DDR_DENALI_CTL_57__LP_AUTO_ENTRY_EN_R 16
#define DDR_DENALI_CTL_57__LP_AUTO_ENTRY_EN_WIDTH 3
#define DDR_DENALI_CTL_57__LP_AUTO_ENTRY_EN_RESETVALUE 0x0
#define DDR_DENALI_CTL_57__LP_ARB_STATE_L 11
#define DDR_DENALI_CTL_57__LP_ARB_STATE_R 8
#define DDR_DENALI_CTL_57__LP_ARB_STATE_WIDTH 4
#define DDR_DENALI_CTL_57__LP_ARB_STATE_RESETVALUE 0x0
#define DDR_DENALI_CTL_57__LP_STATE_L 5
#define DDR_DENALI_CTL_57__LP_STATE_R 0
#define DDR_DENALI_CTL_57__LP_STATE_WIDTH 6
#define DDR_DENALI_CTL_57__LP_STATE_RESETVALUE 0x20
#define DDR_DENALI_CTL_57__RESERVED_0_L 31
#define DDR_DENALI_CTL_57__RESERVED_0_R 27
#define DDR_DENALI_CTL_57__RESERVED_1_L 23
#define DDR_DENALI_CTL_57__RESERVED_1_R 19
#define DDR_DENALI_CTL_57__RESERVED_2_L 15
#define DDR_DENALI_CTL_57__RESERVED_2_R 12
#define DDR_DENALI_CTL_57__RESERVED_3_L 7
#define DDR_DENALI_CTL_57__RESERVED_3_R 6
#define DDR_DENALI_CTL_57__RESERVED_L 31
#define DDR_DENALI_CTL_57__RESERVED_R 27
#define DDR_DENALI_CTL_57_WIDTH 27
#define DDR_DENALI_CTL_57__WIDTH 27
#define DDR_DENALI_CTL_57_ALL_L 26
#define DDR_DENALI_CTL_57_ALL_R 0
#define DDR_DENALI_CTL_57__ALL_L 26
#define DDR_DENALI_CTL_57__ALL_R 0
#define DDR_DENALI_CTL_57_DATAMASK 0x07070f3f
#define DDR_DENALI_CTL_57_RDWRMASK 0xf8f8f0c0
#define DDR_DENALI_CTL_57_RESETVALUE 0x20
#define DDR_DENALI_CTL_58 0x180100e8
#define DDR_DENALI_CTL_58_BASE 0x0e8
#define DDR_DENALI_CTL_58__LP_AUTO_SR_IDLE_L 31
#define DDR_DENALI_CTL_58__LP_AUTO_SR_IDLE_R 24
#define DDR_DENALI_CTL_58__LP_AUTO_SR_IDLE_WIDTH 8
#define DDR_DENALI_CTL_58__LP_AUTO_SR_IDLE_RESETVALUE 0x00
#define DDR_DENALI_CTL_58__LP_AUTO_PD_IDLE_L 19
#define DDR_DENALI_CTL_58__LP_AUTO_PD_IDLE_R 8
#define DDR_DENALI_CTL_58__LP_AUTO_PD_IDLE_WIDTH 12
#define DDR_DENALI_CTL_58__LP_AUTO_PD_IDLE_RESETVALUE 0x000
#define DDR_DENALI_CTL_58__LP_AUTO_MEM_GATE_EN_L 1
#define DDR_DENALI_CTL_58__LP_AUTO_MEM_GATE_EN_R 0
#define DDR_DENALI_CTL_58__LP_AUTO_MEM_GATE_EN_WIDTH 2
#define DDR_DENALI_CTL_58__LP_AUTO_MEM_GATE_EN_RESETVALUE 0x0
#define DDR_DENALI_CTL_58__RESERVED_L 23
#define DDR_DENALI_CTL_58__RESERVED_R 20
#define DDR_DENALI_CTL_58_WIDTH 32
#define DDR_DENALI_CTL_58__WIDTH 32
#define DDR_DENALI_CTL_58_ALL_L 31
#define DDR_DENALI_CTL_58_ALL_R 0
#define DDR_DENALI_CTL_58__ALL_L 31
#define DDR_DENALI_CTL_58__ALL_R 0
#define DDR_DENALI_CTL_58_DATAMASK 0xff0fff03
#define DDR_DENALI_CTL_58_RDWRMASK 0x00f000fc
#define DDR_DENALI_CTL_58_RESETVALUE 0x0
#define DDR_DENALI_CTL_175 0x180102bc #define DDR_DENALI_CTL_175 0x180102bc
#define DDR_DENALI_CTL_175_BASE 0x2bc #define DDR_DENALI_CTL_175_BASE 0x2bc