This change uses the newly added meminit block driver and updates ADL SoC and mainboard code accordingly. BUG=b:172978729 Change-Id: Ibcc4ee685cdd70eac99f12a5b5d79fdbaf2b3cf6 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/49043 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Meera Ravindranath <meera.ravindranath@intel.com> Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com> Reviewed-by: Subrata Banik <subrata.banik@intel.com>
180 lines
4.1 KiB
C
180 lines
4.1 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
|
|
#include <arch/cpu.h>
|
|
#include "board_id.h"
|
|
#include <baseboard/variants.h>
|
|
#include <soc/romstage.h>
|
|
|
|
static const struct mb_cfg ddr4_mem_config = {
|
|
.type = MEM_TYPE_DDR4,
|
|
|
|
.ect = true, /* Early Command Training */
|
|
|
|
.UserBd = BOARD_TYPE_MOBILE,
|
|
|
|
.ddr_config = {
|
|
|
|
/* Baseboard uses only 100ohm Rcomp resistors */
|
|
.rcomp_resistor = {100, 100, 100},
|
|
|
|
/* Baseboard Rcomp target values */
|
|
.rcomp_targets = {40, 30, 33, 33, 30},
|
|
|
|
.dq_pins_interleaved = false,
|
|
},
|
|
};
|
|
|
|
static const struct mb_cfg lpddr4_mem_config = {
|
|
.type = MEM_TYPE_LP4X,
|
|
|
|
/* DQ byte map */
|
|
.lpx_dq_map = {
|
|
.ddr0 = {
|
|
.dq0 = { 0, 2, 3, 1, 6, 7, 5, 4, },
|
|
.dq1 = { 10, 8, 11, 9, 14, 12, 13, 15, },
|
|
},
|
|
.ddr1 = {
|
|
.dq0 = { 12, 8, 14, 10, 11, 13, 15, 9, },
|
|
.dq1 = { 5, 0, 7, 3, 6, 2, 1, 4, },
|
|
},
|
|
.ddr2 = {
|
|
.dq0 = { 3, 0, 2, 1, 6, 5, 4, 7, },
|
|
.dq1 = { 12, 13, 14, 15, 10, 9, 8, 11, },
|
|
},
|
|
.ddr3 = {
|
|
.dq0 = { 2, 6, 7, 1, 3, 4, 0, 5, },
|
|
.dq1 = { 9, 13, 8, 15, 14, 11, 12, 10, },
|
|
},
|
|
.ddr4 = {
|
|
.dq0 = { 3, 0, 1, 2, 7, 4, 6, 5, },
|
|
.dq1 = { 10, 8, 11, 9, 14, 13, 12, 15, },
|
|
},
|
|
.ddr5 = {
|
|
.dq0 = { 10, 12, 14, 8, 9, 13, 15, 11, },
|
|
.dq1 = { 3, 7, 6, 2, 0, 4, 5, 1, },
|
|
},
|
|
.ddr6 = {
|
|
.dq0 = { 12, 15, 14, 13, 9, 10, 11, 8, },
|
|
.dq1 = { 7, 4, 6, 5, 0, 1, 3, 2, },
|
|
},
|
|
.ddr7 = {
|
|
.dq0 = { 0, 2, 4, 3, 1, 6, 7, 5, },
|
|
.dq1 = { 13, 9, 10, 11, 8, 12, 14, 15, },
|
|
},
|
|
},
|
|
|
|
/* DQS CPU<>DRAM map */
|
|
.lpx_dqs_map = {
|
|
.ddr0 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr1 = { .dqs0 = 1, .dqs1 = 0 },
|
|
.ddr2 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr3 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr4 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr5 = { .dqs0 = 1, .dqs1 = 0 },
|
|
.ddr6 = { .dqs0 = 1, .dqs1 = 0 },
|
|
.ddr7 = { .dqs0 = 0, .dqs1 = 1 },
|
|
},
|
|
|
|
.ect = true, /* Early Command Training */
|
|
|
|
.UserBd = BOARD_TYPE_MOBILE,
|
|
};
|
|
|
|
static const struct mb_cfg lp5_mem_config = {
|
|
.type = MEM_TYPE_LP5X,
|
|
|
|
/* DQ byte map */
|
|
.lpx_dq_map = {
|
|
.ddr0 = {
|
|
.dq0 = { 3, 2, 1, 0, 5, 4, 6, 7, },
|
|
.dq1 = { 15, 14, 12, 13, 8, 9, 10, 11, },
|
|
},
|
|
.ddr1 = {
|
|
.dq0 = { 0, 2, 3, 1, 5, 7, 4, 6, },
|
|
.dq1 = { 14, 13, 15, 12, 8, 9, 11, 10, },
|
|
},
|
|
.ddr2 = {
|
|
.dq0 = { 1, 2, 0, 3, 4, 6, 5, 7, },
|
|
.dq1 = { 15, 13, 12, 14, 9, 10, 8, 11, },
|
|
},
|
|
.ddr3 = {
|
|
.dq0 = { 2, 1, 3, 0, 7, 4, 5, 6, },
|
|
.dq1 = { 13, 12, 15, 14, 9, 11, 8, 10, },
|
|
},
|
|
.ddr4 = {
|
|
.dq0 = { 1, 2, 3, 0, 6, 4, 5, 7, },
|
|
.dq1 = { 15, 13, 14, 12, 10, 9, 8, 11, },
|
|
},
|
|
.ddr5 = {
|
|
.dq0 = { 1, 0, 3, 2, 6, 7, 4, 5, },
|
|
.dq1 = { 14, 12, 15, 13, 8, 9, 10, 11, },
|
|
},
|
|
.ddr6 = {
|
|
.dq0 = { 0, 2, 1, 3, 4, 7, 5, 6, },
|
|
.dq1 = { 12, 13, 15, 14, 9, 11, 10, 8, },
|
|
},
|
|
.ddr7 = {
|
|
.dq0 = { 3, 2, 1, 0, 5, 4, 6, 7, },
|
|
.dq1 = { 13, 15, 11, 12, 10, 9, 14, 8, },
|
|
},
|
|
},
|
|
|
|
/* DQS CPU<>DRAM map */
|
|
.lpx_dqs_map = {
|
|
.ddr0 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr1 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr2 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr3 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr4 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr5 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr6 = { .dqs0 = 0, .dqs1 = 1 },
|
|
.ddr7 = { .dqs0 = 0, .dqs1 = 1 }
|
|
},
|
|
|
|
.ect = false, /* Early Command Training */
|
|
|
|
.UserBd = BOARD_TYPE_MOBILE,
|
|
|
|
.lp5x_config = {
|
|
.ccc_config = 0xff,
|
|
},
|
|
};
|
|
|
|
static const struct mb_cfg ddr5_mem_config = {
|
|
.type = MEM_TYPE_DDR5,
|
|
|
|
.ect = true, /* Early Command Training */
|
|
|
|
.UserBd = BOARD_TYPE_MOBILE,
|
|
|
|
.ddr_config = {
|
|
/* Baseboard uses only 100ohm Rcomp resistors */
|
|
.rcomp_resistor = {100, 100, 100},
|
|
|
|
/* Baseboard Rcomp target values */
|
|
.rcomp_targets = {50, 30, 30, 30, 27},
|
|
|
|
.dq_pins_interleaved = false,
|
|
}
|
|
};
|
|
|
|
const struct mb_cfg *variant_memory_params(void)
|
|
{
|
|
int board_id = get_board_id();
|
|
|
|
switch (board_id) {
|
|
case ADL_P_LP4_1:
|
|
case ADL_P_LP4_2:
|
|
return &lpddr4_mem_config;
|
|
case ADL_P_DDR4_1:
|
|
case ADL_P_DDR4_2:
|
|
return &ddr4_mem_config;
|
|
case ADL_P_DDR5:
|
|
return &ddr5_mem_config;
|
|
case ADL_P_LP5:
|
|
return &lp5_mem_config;
|
|
default:
|
|
die("unsupported board id : 0x%x\n", board_id);
|
|
}
|
|
}
|