ram: k3-ddrss: Add support for multiple instances of DDR subsystems
The current driver only supports single instance of DRR subsystem. Add support for probing multiple instances of DDR subsystem. Signed-off-by: Aswath Govindraju <a-govindraju@ti.com>
This commit is contained in:
Aswath Govindraju
Praneeth Bajjuri
parent
c985cef439
commit
9aa404eff1
|
|
@ -27,6 +27,9 @@
|
|||
#define CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS 0x80
|
||||
#define CTRLMMR_DDR4_FSP_CLKCHNG_ACK_OFFS 0xc0
|
||||
|
||||
#define SINGLE_DDR_SUBSYSTEM 0x1
|
||||
#define MULTI_DDR_SUBSYSTEM 0x2
|
||||
|
||||
struct k3_ddrss_desc {
|
||||
struct udevice *dev;
|
||||
void __iomem *ddrss_ss_cfg;
|
||||
|
|
@ -40,14 +43,12 @@ struct k3_ddrss_desc {
|
|||
u32 ddr_freq2;
|
||||
u32 ddr_fhs_cnt;
|
||||
struct udevice *vtt_supply;
|
||||
u32 instance;
|
||||
lpddr4_obj *driverdt;
|
||||
lpddr4_config config;
|
||||
lpddr4_privatedata pd;
|
||||
};
|
||||
|
||||
static lpddr4_obj *driverdt;
|
||||
static lpddr4_config config;
|
||||
static lpddr4_privatedata pd;
|
||||
|
||||
static struct k3_ddrss_desc *ddrss;
|
||||
|
||||
struct reginitdata {
|
||||
u32 ctl_regs[LPDDR4_INTR_CTL_REG_COUNT];
|
||||
u16 ctl_regs_offs[LPDDR4_INTR_CTL_REG_COUNT];
|
||||
|
|
@ -82,15 +83,16 @@ struct reginitdata {
|
|||
} while (0)
|
||||
|
||||
|
||||
static uint32_t k3_lpddr4_read_ddr_type(void)
|
||||
static uint32_t k3_lpddr4_read_ddr_type(const lpddr4_privatedata *pd)
|
||||
{
|
||||
uint32_t status = 0U;
|
||||
uint32_t offset = 0U;
|
||||
uint32_t regval = 0U;
|
||||
uint32_t dram_class = 0U;
|
||||
struct k3_ddrss_desc *ddrss = (struct k3_ddrss_desc *)pd->ddr_instance;
|
||||
|
||||
TH_OFFSET_FROM_REG(LPDDR4__DRAM_CLASS__REG, CTL_SHIFT, offset);
|
||||
status = driverdt->readreg(&pd, LPDDR4_CTL_REGS, offset, ®val);
|
||||
status = ddrss->driverdt->readreg(pd, LPDDR4_CTL_REGS, offset, ®val);
|
||||
if (status > 0U) {
|
||||
printf("%s: Failed to read DRAM_CLASS\n", __func__);
|
||||
hang();
|
||||
|
|
@ -101,24 +103,23 @@ static uint32_t k3_lpddr4_read_ddr_type(void)
|
|||
return dram_class;
|
||||
}
|
||||
|
||||
static void k3_lpddr4_freq_update(void)
|
||||
static void k3_lpddr4_freq_update(struct k3_ddrss_desc *ddrss)
|
||||
{
|
||||
unsigned int req_type, counter;
|
||||
|
||||
for (counter = 0; counter < ddrss->ddr_fhs_cnt; counter++) {
|
||||
if (wait_for_bit_le32(ddrss->ddrss_ctrl_mmr +
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS, 0x80,
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS + ddrss->instance * 0x10, 0x80,
|
||||
true, 10000, false)) {
|
||||
printf("Timeout during frequency handshake\n");
|
||||
hang();
|
||||
}
|
||||
|
||||
|
||||
req_type = readl(ddrss->ddrss_ctrl_mmr +
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS) & 0x03;
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS + ddrss->instance * 0x10) & 0x03;
|
||||
|
||||
debug("%s: received freq change req: req type = %d, req no. = %d \n",
|
||||
__func__, req_type, counter);
|
||||
debug("%s: received freq change req: req type = %d, req no. = %d , instance = %d\n",
|
||||
__func__, req_type, counter, ddrss->instance);
|
||||
|
||||
if (req_type == 1)
|
||||
clk_set_rate(&ddrss->ddr_clk, ddrss->ddr_freq1);
|
||||
|
|
@ -130,31 +131,32 @@ static void k3_lpddr4_freq_update(void)
|
|||
printf("%s: Invalid freq request type\n", __func__);
|
||||
|
||||
writel(0x1, ddrss->ddrss_ctrl_mmr +
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_ACK_OFFS);
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_ACK_OFFS + ddrss->instance * 0x10);
|
||||
if (wait_for_bit_le32(ddrss->ddrss_ctrl_mmr +
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS, 0x80,
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS + ddrss->instance * 0x10, 0x80,
|
||||
false, 10, false)) {
|
||||
printf("Timeout during frequency handshake\n");
|
||||
hang();
|
||||
}
|
||||
writel(0x0, ddrss->ddrss_ctrl_mmr +
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_ACK_OFFS);
|
||||
CTRLMMR_DDR4_FSP_CLKCHNG_ACK_OFFS + ddrss->instance * 0x10);
|
||||
}
|
||||
}
|
||||
|
||||
static void k3_lpddr4_ack_freq_upd_req(void)
|
||||
static void k3_lpddr4_ack_freq_upd_req(const lpddr4_privatedata *pd)
|
||||
{
|
||||
u32 dram_class;
|
||||
struct k3_ddrss_desc *ddrss = (struct k3_ddrss_desc *)pd->ddr_instance;
|
||||
|
||||
debug("--->>> LPDDR4 Initialization is in progress ... <<<---\n");
|
||||
|
||||
dram_class = k3_lpddr4_read_ddr_type();
|
||||
dram_class = k3_lpddr4_read_ddr_type(pd);
|
||||
|
||||
switch(dram_class) {
|
||||
case DENALI_CTL_0_DRAM_CLASS_DDR4:
|
||||
break;
|
||||
case DENALI_CTL_0_DRAM_CLASS_LPDDR4:
|
||||
k3_lpddr4_freq_update();
|
||||
k3_lpddr4_freq_update(ddrss);
|
||||
break;
|
||||
default:
|
||||
printf("Unrecognized dram_class cannot update frequency!\n");
|
||||
|
|
@ -165,8 +167,9 @@ static int k3_ddrss_init_freq(struct k3_ddrss_desc *ddrss)
|
|||
{
|
||||
u32 dram_class;
|
||||
int ret;
|
||||
lpddr4_privatedata *pd = &ddrss->pd;
|
||||
|
||||
dram_class = k3_lpddr4_read_ddr_type();
|
||||
dram_class = k3_lpddr4_read_ddr_type(pd);
|
||||
|
||||
switch (dram_class) {
|
||||
case DENALI_CTL_0_DRAM_CLASS_DDR4:
|
||||
|
|
@ -193,7 +196,7 @@ static void k3_lpddr4_info_handler(const lpddr4_privatedata * pd,
|
|||
lpddr4_infotype infotype)
|
||||
{
|
||||
if (infotype == LPDDR4_DRV_SOC_PLL_UPDATE) {
|
||||
k3_lpddr4_ack_freq_upd_req();
|
||||
k3_lpddr4_ack_freq_upd_req(pd);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -233,6 +236,7 @@ static int k3_ddrss_power_on(struct k3_ddrss_desc *ddrss)
|
|||
static int k3_ddrss_ofdata_to_priv(struct udevice *dev)
|
||||
{
|
||||
struct k3_ddrss_desc *ddrss = dev_get_priv(dev);
|
||||
struct k3_ddrss_data *ddrss_data = (struct k3_ddrss_data *)dev_get_driver_data(dev);
|
||||
phys_addr_t reg;
|
||||
int ret;
|
||||
|
||||
|
|
@ -280,6 +284,17 @@ static int k3_ddrss_ofdata_to_priv(struct udevice *dev)
|
|||
ddrss->ddr_freq0);
|
||||
}
|
||||
|
||||
/* Reading instance number for multi ddr subystems */
|
||||
if (ddrss_data->flags & MULTI_DDR_SUBSYSTEM) {
|
||||
ret = dev_read_u32(dev, "instance", &ddrss->instance);
|
||||
if (ret) {
|
||||
dev_err(dev, "missing instance property");
|
||||
return -EINVAL;
|
||||
}
|
||||
} else {
|
||||
ddrss->instance = 0;
|
||||
}
|
||||
|
||||
ret = dev_read_u32(dev, "ti,ddr-freq1", &ddrss->ddr_freq1);
|
||||
if (ret)
|
||||
dev_err(dev, "ddr freq1 not populated %d\n", ret);
|
||||
|
|
@ -295,12 +310,13 @@ static int k3_ddrss_ofdata_to_priv(struct udevice *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
void k3_lpddr4_probe(void)
|
||||
void k3_lpddr4_probe(struct k3_ddrss_desc *ddrss)
|
||||
{
|
||||
uint32_t status = 0U;
|
||||
uint16_t configsize = 0U;
|
||||
lpddr4_config *config = &ddrss->config;
|
||||
|
||||
status = driverdt->probe(&config, &configsize);
|
||||
status = ddrss->driverdt->probe(config, &configsize);
|
||||
|
||||
if ((status != 0) || (configsize != sizeof(lpddr4_privatedata))
|
||||
|| (configsize > SRAM_MAX)) {
|
||||
|
|
@ -311,25 +327,30 @@ void k3_lpddr4_probe(void)
|
|||
}
|
||||
}
|
||||
|
||||
void k3_lpddr4_init(void)
|
||||
void k3_lpddr4_init(struct k3_ddrss_desc *ddrss)
|
||||
{
|
||||
uint32_t status = 0U;
|
||||
lpddr4_config *config = &ddrss->config;
|
||||
lpddr4_obj *driverdt = ddrss->driverdt;
|
||||
lpddr4_privatedata *pd = &ddrss->pd;
|
||||
|
||||
if ((sizeof(pd) != sizeof(lpddr4_privatedata))
|
||||
|| (sizeof(pd) > SRAM_MAX)) {
|
||||
if ((sizeof(*pd) != sizeof(lpddr4_privatedata)) || (sizeof(*pd) > SRAM_MAX)) {
|
||||
printf("LPDDR4_Init: FAIL\n");
|
||||
hang();
|
||||
}
|
||||
|
||||
config.ctlbase = (struct lpddr4_ctlregs_s *)ddrss->ddrss_ss_cfg;
|
||||
config.infohandler = (lpddr4_infocallback) k3_lpddr4_info_handler;
|
||||
config->ctlbase = (struct lpddr4_ctlregs_s *)ddrss->ddrss_ss_cfg;
|
||||
config->infohandler = (lpddr4_infocallback) k3_lpddr4_info_handler;
|
||||
|
||||
status = driverdt->init(&pd, &config);
|
||||
status = driverdt->init(pd, config);
|
||||
|
||||
/* linking ddr instance to lpddr4 */
|
||||
pd->ddr_instance = (void *)ddrss;
|
||||
|
||||
if ((status > 0U) ||
|
||||
(pd.ctlbase != (struct lpddr4_ctlregs_s *)config.ctlbase) ||
|
||||
(pd.ctlinterrupthandler != config.ctlinterrupthandler) ||
|
||||
(pd.phyindepinterrupthandler != config.phyindepinterrupthandler)) {
|
||||
(pd->ctlbase != (struct lpddr4_ctlregs_s *)config->ctlbase) ||
|
||||
(pd->ctlinterrupthandler != config->ctlinterrupthandler) ||
|
||||
(pd->phyindepinterrupthandler != config->phyindepinterrupthandler)) {
|
||||
printf("lpddr4_init: FAIL\n");
|
||||
hang();
|
||||
} else {
|
||||
|
|
@ -337,7 +358,8 @@ void k3_lpddr4_init(void)
|
|||
}
|
||||
}
|
||||
|
||||
void populate_data_array_from_dt(struct reginitdata * reginit_data)
|
||||
void populate_data_array_from_dt(struct k3_ddrss_desc *ddrss,
|
||||
struct reginitdata *reginit_data)
|
||||
{
|
||||
int ret, i;
|
||||
|
||||
|
|
@ -369,22 +391,24 @@ void populate_data_array_from_dt(struct reginitdata * reginit_data)
|
|||
reginit_data->phy_regs_offs[i] = i;
|
||||
}
|
||||
|
||||
void k3_lpddr4_hardware_reg_init(void)
|
||||
void k3_lpddr4_hardware_reg_init(struct k3_ddrss_desc *ddrss)
|
||||
{
|
||||
uint32_t status = 0U;
|
||||
struct reginitdata reginitdata;
|
||||
lpddr4_obj *driverdt = ddrss->driverdt;
|
||||
lpddr4_privatedata *pd = &ddrss->pd;
|
||||
|
||||
populate_data_array_from_dt(®initdata);
|
||||
populate_data_array_from_dt(ddrss, ®initdata);
|
||||
|
||||
status = driverdt->writectlconfig(&pd, reginitdata.ctl_regs,
|
||||
status = driverdt->writectlconfig(pd, reginitdata.ctl_regs,
|
||||
reginitdata.ctl_regs_offs,
|
||||
LPDDR4_INTR_CTL_REG_COUNT);
|
||||
if (!status)
|
||||
status = driverdt->writephyindepconfig(&pd, reginitdata.pi_regs,
|
||||
status = driverdt->writephyindepconfig(pd, reginitdata.pi_regs,
|
||||
reginitdata.pi_regs_offs,
|
||||
LPDDR4_INTR_PHY_INDEP_REG_COUNT);
|
||||
if (!status)
|
||||
status = driverdt->writephyconfig(&pd, reginitdata.phy_regs,
|
||||
status = driverdt->writephyconfig(pd, reginitdata.phy_regs,
|
||||
reginitdata.phy_regs_offs,
|
||||
LPDDR4_INTR_PHY_REG_COUNT);
|
||||
if (status) {
|
||||
|
|
@ -395,27 +419,29 @@ void k3_lpddr4_hardware_reg_init(void)
|
|||
return;
|
||||
}
|
||||
|
||||
void k3_lpddr4_start(void)
|
||||
void k3_lpddr4_start(struct k3_ddrss_desc *ddrss)
|
||||
{
|
||||
uint32_t status = 0U;
|
||||
uint32_t regval = 0U;
|
||||
uint32_t offset = 0U;
|
||||
lpddr4_obj *driverdt = ddrss->driverdt;
|
||||
lpddr4_privatedata *pd = &ddrss->pd;
|
||||
|
||||
TH_OFFSET_FROM_REG(LPDDR4__START__REG, CTL_SHIFT, offset);
|
||||
|
||||
status = driverdt->readreg(&pd, LPDDR4_CTL_REGS, offset, ®val);
|
||||
status = driverdt->readreg(pd, LPDDR4_CTL_REGS, offset, ®val);
|
||||
if ((status > 0U) || ((regval & TH_FLD_MASK(LPDDR4__START__FLD)) != 0U)) {
|
||||
printf("LPDDR4_StartTest: FAIL\n");
|
||||
hang();
|
||||
}
|
||||
|
||||
status = driverdt->start(&pd);
|
||||
status = driverdt->start(pd);
|
||||
if (status > 0U) {
|
||||
printf("LPDDR4_StartTest: FAIL\n");
|
||||
hang();
|
||||
}
|
||||
|
||||
status = driverdt->readreg(&pd, LPDDR4_CTL_REGS, offset, ®val);
|
||||
status = driverdt->readreg(pd, LPDDR4_CTL_REGS, offset, ®val);
|
||||
if ((status > 0U) || ((regval & TH_FLD_MASK(LPDDR4__START__FLD)) != 1U)) {
|
||||
printf("LPDDR4_Start: FAIL\n");
|
||||
hang();
|
||||
|
|
@ -428,7 +454,7 @@ void k3_lpddr4_start(void)
|
|||
static int k3_ddrss_probe(struct udevice *dev)
|
||||
{
|
||||
int ret;
|
||||
ddrss = dev_get_priv(dev);
|
||||
struct k3_ddrss_desc *ddrss = dev_get_priv(dev);
|
||||
|
||||
debug("%s(dev=%p)\n", __func__, dev);
|
||||
|
||||
|
|
@ -446,16 +472,17 @@ static int k3_ddrss_probe(struct udevice *dev)
|
|||
writel(0x0, AM64_DDRSS_SS_BASE + 0x120); //ECC Control Register 0x120 ecc_en = 0, rmw_en = 0, wr_alloc = 0, ecc_ck=0
|
||||
#endif
|
||||
|
||||
driverdt = lpddr4_getinstance();
|
||||
k3_lpddr4_probe();
|
||||
k3_lpddr4_init();
|
||||
k3_lpddr4_hardware_reg_init();
|
||||
ddrss->driverdt = lpddr4_getinstance();
|
||||
|
||||
k3_lpddr4_probe(ddrss);
|
||||
k3_lpddr4_init(ddrss);
|
||||
k3_lpddr4_hardware_reg_init(ddrss);
|
||||
|
||||
ret = k3_ddrss_init_freq(ddrss);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
k3_lpddr4_start();
|
||||
k3_lpddr4_start(ddrss);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -469,9 +496,18 @@ static struct ram_ops k3_ddrss_ops = {
|
|||
.get_info = k3_ddrss_get_info,
|
||||
};
|
||||
|
||||
static const struct k3_ddrss_data k3_data = {
|
||||
.flags = SINGLE_DDR_SUBSYSTEM,
|
||||
};
|
||||
|
||||
static const struct k3_ddrss_data j721s2_data = {
|
||||
.flags = MULTI_DDR_SUBSYSTEM,
|
||||
};
|
||||
|
||||
static const struct udevice_id k3_ddrss_ids[] = {
|
||||
{.compatible = "ti,am64-ddrss"},
|
||||
{.compatible = "ti,j721e-ddrss"},
|
||||
{.compatible = "ti,am64-ddrss", .data = (ulong)&k3_data, },
|
||||
{.compatible = "ti,j721e-ddrss", .data = (ulong)&k3_data, },
|
||||
{.compatible = "ti,j721s2-ddrss", .data = (ulong)&j721s2_data, },
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue