mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
ddr: altera: sdram: Introduce socfpga_sdram_get_config()
Introduce socfpga_sdram_get_config() function implement in a board file, which returns the socfpga_sdram_config structure. This is the last step in cleaning up the socfpga_mmr_init_full(), but not the last step which allows removing the inclusion of sdram.h from drivers/ddr/altera/sdram.c thus far. Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut
parent
99f453e953
commit
5af914189e
4 changed files with 234 additions and 212 deletions
|
|
@ -73,6 +73,48 @@ struct socfpga_sdr_ctrl {
|
|||
u32 phy_ctrl2;
|
||||
};
|
||||
|
||||
/* SDRAM configuration structure for the SPL. */
|
||||
struct socfpga_sdram_config {
|
||||
u32 ctrl_cfg;
|
||||
u32 dram_timing1;
|
||||
u32 dram_timing2;
|
||||
u32 dram_timing3;
|
||||
u32 dram_timing4;
|
||||
u32 lowpwr_timing;
|
||||
u32 dram_odt;
|
||||
u32 dram_addrw;
|
||||
u32 dram_if_width;
|
||||
u32 dram_dev_width;
|
||||
u32 dram_intr;
|
||||
u32 lowpwr_eq;
|
||||
u32 static_cfg;
|
||||
u32 ctrl_width;
|
||||
u32 cport_width;
|
||||
u32 cport_wmap;
|
||||
u32 cport_rmap;
|
||||
u32 rfifo_cmap;
|
||||
u32 wfifo_cmap;
|
||||
u32 cport_rdwr;
|
||||
u32 port_cfg;
|
||||
u32 fpgaport_rst;
|
||||
u32 fifo_cfg;
|
||||
u32 mp_priority;
|
||||
u32 mp_weight0;
|
||||
u32 mp_weight1;
|
||||
u32 mp_weight2;
|
||||
u32 mp_weight3;
|
||||
u32 mp_pacing0;
|
||||
u32 mp_pacing1;
|
||||
u32 mp_pacing2;
|
||||
u32 mp_pacing3;
|
||||
u32 mp_threshold0;
|
||||
u32 mp_threshold1;
|
||||
u32 mp_threshold2;
|
||||
u32 phy_ctrl0;
|
||||
};
|
||||
|
||||
const struct socfpga_sdram_config *socfpga_get_sdram_config(void);
|
||||
|
||||
#define SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB 23
|
||||
#define SDR_CTRLGRP_CTRLCFG_NODMPINS_MASK 0x00800000
|
||||
#define SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB 22
|
||||
|
|
|
|||
|
|
@ -7,4 +7,5 @@
|
|||
#
|
||||
|
||||
obj-y := socfpga.o wrap_pll_config.o
|
||||
obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o
|
||||
obj-$(CONFIG_SPL_BUILD) += wrap_iocsr_config.o wrap_pinmux_config.o \
|
||||
wrap_sdram_config.o
|
||||
|
|
|
|||
185
board/altera/socfpga/wrap_sdram_config.c
Normal file
185
board/altera/socfpga/wrap_sdram_config.c
Normal file
|
|
@ -0,0 +1,185 @@
|
|||
/*
|
||||
* Copyright (C) 2015 Marek Vasut <marex@denx.de>
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0+
|
||||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <errno.h>
|
||||
#include <asm/arch/sdram.h>
|
||||
/* QTS output file. */
|
||||
#include "qts/sdram_config.h"
|
||||
|
||||
static const struct socfpga_sdram_config sdram_config = {
|
||||
.ctrl_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
|
||||
SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
|
||||
SDR_CTRLGRP_CTRLCFG_MEMBL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
|
||||
SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
|
||||
SDR_CTRLGRP_CTRLCFG_ECCEN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
|
||||
SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
|
||||
SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
|
||||
SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
|
||||
SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
|
||||
SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
|
||||
.dram_timing1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TAL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
|
||||
.dram_timing2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TRP_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TWR_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
|
||||
.dram_timing3 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TRC_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
|
||||
.dram_timing4 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
|
||||
SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
|
||||
SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
|
||||
.lowpwr_timing =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
|
||||
SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
|
||||
SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
|
||||
.dram_odt =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
|
||||
SDR_CTRLGRP_DRAMODT_READ_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
|
||||
SDR_CTRLGRP_DRAMODT_WRITE_LSB),
|
||||
.dram_addrw =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
|
||||
SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
|
||||
SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
|
||||
SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB) |
|
||||
((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
|
||||
SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
|
||||
.dram_if_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
|
||||
SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
|
||||
.dram_dev_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
|
||||
SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
|
||||
.dram_intr =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
|
||||
SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
|
||||
.lowpwr_eq =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
|
||||
SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
|
||||
.static_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
|
||||
SDR_CTRLGRP_STATICCFG_MEMBL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
|
||||
SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
|
||||
.ctrl_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
|
||||
SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
|
||||
.cport_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
|
||||
SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
|
||||
.cport_wmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
|
||||
SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
|
||||
.cport_rmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
|
||||
SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
|
||||
.rfifo_cmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
|
||||
SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
|
||||
.wfifo_cmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
|
||||
SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
|
||||
.cport_rdwr =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
|
||||
SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
|
||||
.port_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
|
||||
SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
|
||||
.fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
|
||||
.fifo_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
|
||||
SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
|
||||
SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
|
||||
.mp_priority =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
|
||||
SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
|
||||
.mp_weight0 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
|
||||
.mp_weight1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
|
||||
.mp_weight2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
|
||||
.mp_weight3 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
|
||||
.mp_pacing0 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
|
||||
.mp_pacing1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
|
||||
.mp_pacing2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
|
||||
.mp_pacing3 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
|
||||
.mp_threshold0 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
|
||||
SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
|
||||
.mp_threshold1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
|
||||
SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
|
||||
.mp_threshold2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
|
||||
SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
|
||||
.phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
|
||||
};
|
||||
|
||||
const struct socfpga_sdram_config *socfpga_get_sdram_config(void)
|
||||
{
|
||||
return &sdram_config;
|
||||
}
|
||||
|
|
@ -38,212 +38,6 @@ static struct socfpga_system_manager *sysmgr_regs =
|
|||
static struct socfpga_sdr_ctrl *sdr_ctrl =
|
||||
(struct socfpga_sdr_ctrl *)SDR_CTRLGRP_ADDRESS;
|
||||
|
||||
static struct socfpga_sdram_config {
|
||||
u32 ctrl_cfg;
|
||||
u32 dram_timing1;
|
||||
u32 dram_timing2;
|
||||
u32 dram_timing3;
|
||||
u32 dram_timing4;
|
||||
u32 lowpwr_timing;
|
||||
u32 dram_odt;
|
||||
u32 dram_addrw;
|
||||
u32 dram_if_width;
|
||||
u32 dram_dev_width;
|
||||
u32 dram_intr;
|
||||
u32 lowpwr_eq;
|
||||
u32 static_cfg;
|
||||
u32 ctrl_width;
|
||||
u32 cport_width;
|
||||
u32 cport_wmap;
|
||||
u32 cport_rmap;
|
||||
u32 rfifo_cmap;
|
||||
u32 wfifo_cmap;
|
||||
u32 cport_rdwr;
|
||||
u32 port_cfg;
|
||||
u32 fpgaport_rst;
|
||||
u32 fifo_cfg;
|
||||
u32 mp_priority;
|
||||
u32 mp_weight0;
|
||||
u32 mp_weight1;
|
||||
u32 mp_weight2;
|
||||
u32 mp_weight3;
|
||||
u32 mp_pacing0;
|
||||
u32 mp_pacing1;
|
||||
u32 mp_pacing2;
|
||||
u32 mp_pacing3;
|
||||
u32 mp_threshold0;
|
||||
u32 mp_threshold1;
|
||||
u32 mp_threshold2;
|
||||
u32 phy_ctrl0;
|
||||
} sdram_config = {
|
||||
.ctrl_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE <<
|
||||
SDR_CTRLGRP_CTRLCFG_MEMTYPE_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL <<
|
||||
SDR_CTRLGRP_CTRLCFG_MEMBL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER <<
|
||||
SDR_CTRLGRP_CTRLCFG_ADDRORDER_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN <<
|
||||
SDR_CTRLGRP_CTRLCFG_ECCEN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN <<
|
||||
SDR_CTRLGRP_CTRLCFG_ECCCORREN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN <<
|
||||
SDR_CTRLGRP_CTRLCFG_REORDEREN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT <<
|
||||
SDR_CTRLGRP_CTRLCFG_STARVELIMIT_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN <<
|
||||
SDR_CTRLGRP_CTRLCFG_DQSTRKEN_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS <<
|
||||
SDR_CTRLGRP_CTRLCFG_NODMPINS_LSB),
|
||||
.dram_timing1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TCWL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TAL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TCL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TRRD_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TFAW_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC <<
|
||||
SDR_CTRLGRP_DRAMTIMING1_TRFC_LSB),
|
||||
.dram_timing2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TREFI_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRCD <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TRCD_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TRP_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TWR_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR <<
|
||||
SDR_CTRLGRP_DRAMTIMING2_TWTR_LSB),
|
||||
.dram_timing3 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TRTP_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TRAS_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TRC_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TMRD_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TCCD <<
|
||||
SDR_CTRLGRP_DRAMTIMING3_TCCD_LSB),
|
||||
.dram_timing4 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_SELFRFSHEXIT <<
|
||||
SDR_CTRLGRP_DRAMTIMING4_SELFRFSHEXIT_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING4_PWRDOWNEXIT <<
|
||||
SDR_CTRLGRP_DRAMTIMING4_PWRDOWNEXIT_LSB),
|
||||
.lowpwr_timing =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_AUTOPDCYCLES <<
|
||||
SDR_CTRLGRP_LOWPWRTIMING_AUTOPDCYCLES_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_LOWPWRTIMING_CLKDISABLECYCLES <<
|
||||
SDR_CTRLGRP_LOWPWRTIMING_CLKDISABLECYCLES_LSB),
|
||||
.dram_odt =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_READ <<
|
||||
SDR_CTRLGRP_DRAMODT_READ_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE <<
|
||||
SDR_CTRLGRP_DRAMODT_WRITE_LSB),
|
||||
.dram_addrw =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_COLBITS <<
|
||||
SDR_CTRLGRP_DRAMADDRW_COLBITS_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS <<
|
||||
SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS <<
|
||||
SDR_CTRLGRP_DRAMADDRW_BANKBITS_LSB) |
|
||||
((CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS - 1) <<
|
||||
SDR_CTRLGRP_DRAMADDRW_CSBITS_LSB),
|
||||
.dram_if_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH <<
|
||||
SDR_CTRLGRP_DRAMIFWIDTH_IFWIDTH_LSB),
|
||||
.dram_dev_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH <<
|
||||
SDR_CTRLGRP_DRAMDEVWIDTH_DEVWIDTH_LSB),
|
||||
.dram_intr =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN <<
|
||||
SDR_CTRLGRP_DRAMINTR_INTREN_LSB),
|
||||
.lowpwr_eq =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_LOWPWREQ_SELFRFSHMASK <<
|
||||
SDR_CTRLGRP_LOWPWREQ_SELFRFSHMASK_LSB),
|
||||
.static_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL <<
|
||||
SDR_CTRLGRP_STATICCFG_MEMBL_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_STATICCFG_USEECCASDATA <<
|
||||
SDR_CTRLGRP_STATICCFG_USEECCASDATA_LSB),
|
||||
.ctrl_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CTRLWIDTH_CTRLWIDTH <<
|
||||
SDR_CTRLGRP_CTRLWIDTH_CTRLWIDTH_LSB),
|
||||
.cport_width =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTWIDTH_CPORTWIDTH <<
|
||||
SDR_CTRLGRP_CPORTWIDTH_CMDPORTWIDTH_LSB),
|
||||
.cport_wmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTWMAP_CPORTWMAP <<
|
||||
SDR_CTRLGRP_CPORTWMAP_CPORTWFIFOMAP_LSB),
|
||||
.cport_rmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTRMAP_CPORTRMAP <<
|
||||
SDR_CTRLGRP_CPORTRMAP_CPORTRFIFOMAP_LSB),
|
||||
.rfifo_cmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_RFIFOCMAP_RFIFOCMAP <<
|
||||
SDR_CTRLGRP_RFIFOCMAP_RFIFOCPORTMAP_LSB),
|
||||
.wfifo_cmap =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_WFIFOCMAP_WFIFOCMAP <<
|
||||
SDR_CTRLGRP_WFIFOCMAP_WFIFOCPORTMAP_LSB),
|
||||
.cport_rdwr =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_CPORTRDWR_CPORTRDWR <<
|
||||
SDR_CTRLGRP_CPORTRDWR_CPORTRDWR_LSB),
|
||||
.port_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_PORTCFG_AUTOPCHEN <<
|
||||
SDR_CTRLGRP_PORTCFG_AUTOPCHEN_LSB),
|
||||
.fpgaport_rst = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST,
|
||||
.fifo_cfg =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_SYNCMODE <<
|
||||
SDR_CTRLGRP_FIFOCFG_SYNCMODE_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_FIFOCFG_INCSYNC <<
|
||||
SDR_CTRLGRP_FIFOCFG_INCSYNC_LSB),
|
||||
.mp_priority =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPRIORITY_USERPRIORITY <<
|
||||
SDR_CTRLGRP_MPPRIORITY_USERPRIORITY_LSB),
|
||||
.mp_weight0 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_0_STATICWEIGHT_31_0 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_0_STATICWEIGHT_31_0_LSB),
|
||||
.mp_weight1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_STATICWEIGHT_49_32 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_STATICWEIGHT_49_32_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_1_SUMOFWEIGHT_13_0 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_1_SUMOFWEIGHTS_13_0_LSB),
|
||||
.mp_weight2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_2_SUMOFWEIGHT_45_14 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_2_SUMOFWEIGHTS_45_14_LSB),
|
||||
.mp_weight3 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPWIEIGHT_3_SUMOFWEIGHT_63_46 <<
|
||||
SDR_CTRLGRP_MPWEIGHT_MPWEIGHT_3_SUMOFWEIGHTS_63_46_LSB),
|
||||
.mp_pacing0 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_0_THRESHOLD1_31_0 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_0_THRESHOLD1_31_0_LSB),
|
||||
.mp_pacing1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD1_59_32 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD1_59_32_LSB) |
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_1_THRESHOLD2_3_0 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_1_THRESHOLD2_3_0_LSB),
|
||||
.mp_pacing2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_2_THRESHOLD2_35_4 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_2_THRESHOLD2_35_4_LSB),
|
||||
.mp_pacing3 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPPACING_3_THRESHOLD2_59_36 <<
|
||||
SDR_CTRLGRP_MPPACING_MPPACING_3_THRESHOLD2_59_36_LSB),
|
||||
.mp_threshold0 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0 <<
|
||||
SDR_CTRLGRP_MPTHRESHOLDRST_0_THRESHOLDRSTCYCLES_31_0_LSB),
|
||||
.mp_threshold1 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32 <<
|
||||
SDR_CTRLGRP_MPTHRESHOLDRST_1_THRESHOLDRSTCYCLES_63_32_LSB),
|
||||
.mp_threshold2 =
|
||||
(CONFIG_HPS_SDR_CTRLCFG_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64 <<
|
||||
SDR_CTRLGRP_MPTHRESHOLDRST_2_THRESHOLDRSTCYCLES_79_64_LSB),
|
||||
.phy_ctrl0 = CONFIG_HPS_SDR_CTRLCFG_PHYCTRL_PHYCTRL_0,
|
||||
};
|
||||
|
||||
/**
|
||||
* get_errata_rows() - Up the number of DRAM rows to cover entire address space
|
||||
* @cfg: SDRAM controller configuration data
|
||||
|
|
@ -252,7 +46,7 @@ static struct socfpga_sdram_config {
|
|||
* increase the number of rows so that the memory controller thinks it has
|
||||
* 4GB of RAM. This function returns such amount of rows.
|
||||
*/
|
||||
static int get_errata_rows(struct socfpga_sdram_config *cfg)
|
||||
static int get_errata_rows(const struct socfpga_sdram_config *cfg)
|
||||
{
|
||||
/* Define constant for 4G memory - used for SDRAM errata workaround */
|
||||
#define MEMSIZE_4G (4ULL * 1024ULL * 1024ULL * 1024ULL)
|
||||
|
|
@ -468,7 +262,7 @@ static unsigned sdram_write_verify(unsigned int *addr, unsigned reg_value)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static u32 sdr_get_ctrlcfg(struct socfpga_sdram_config *cfg)
|
||||
static u32 sdr_get_ctrlcfg(const struct socfpga_sdram_config *cfg)
|
||||
{
|
||||
const u32 csbits =
|
||||
((cfg->dram_addrw & SDR_CTRLGRP_DRAMADDRW_CSBITS_MASK) >>
|
||||
|
|
@ -500,7 +294,7 @@ static u32 sdr_get_ctrlcfg(struct socfpga_sdram_config *cfg)
|
|||
return ctrl_cfg;
|
||||
}
|
||||
|
||||
static u32 sdr_get_addr_rw(struct socfpga_sdram_config *cfg)
|
||||
static u32 sdr_get_addr_rw(const struct socfpga_sdram_config *cfg)
|
||||
{
|
||||
/*
|
||||
* SDRAM Failure When Accessing Non-Existent Memory
|
||||
|
|
@ -521,7 +315,7 @@ static u32 sdr_get_addr_rw(struct socfpga_sdram_config *cfg)
|
|||
*
|
||||
* This function loads the register values into the SDRAM controller block.
|
||||
*/
|
||||
static void sdr_load_regs(struct socfpga_sdram_config *cfg)
|
||||
static void sdr_load_regs(const struct socfpga_sdram_config *cfg)
|
||||
{
|
||||
const u32 ctrl_cfg = sdr_get_ctrlcfg(cfg);
|
||||
const u32 dram_addrw = sdr_get_addr_rw(cfg);
|
||||
|
|
@ -625,7 +419,7 @@ static void sdr_load_regs(struct socfpga_sdram_config *cfg)
|
|||
int sdram_mmr_init_full(unsigned int sdr_phy_reg)
|
||||
{
|
||||
unsigned long status = 0;
|
||||
struct socfpga_sdram_config *cfg = &sdram_config;
|
||||
const struct socfpga_sdram_config *cfg = socfpga_get_sdram_config();
|
||||
const unsigned int rows =
|
||||
(cfg->dram_addrw & SDR_CTRLGRP_DRAMADDRW_ROWBITS_MASK) >>
|
||||
SDR_CTRLGRP_DRAMADDRW_ROWBITS_LSB;
|
||||
|
|
|
|||
Loading…
Reference in a new issue