M-Labs
/
zynq-rs
11
0
Fork 15
Code Issues 6 Pull Requests 1 Releases Wiki Activity

Compare commits

base: M-Labs:0fde82a982fbc2825958b81d71c685806c98c4fe
Branches Tags
M-Labs:master
..
compare: M-Labs:b9323653bbe84ea198c486241a8ba551d65694cf
Branches Tags
M-Labs:master

No commits in common. "0fde82a982fbc2825958b81d71c685806c98c4fe" and "b9323653bbe84ea198c486241a8ba551d65694cf" have entirely different histories.
0fde82a982 ... b9323653bb

2 changed files with 51 additions and 1 deletions
Show Stats Expand all files Collapse all files

51
libboard_zynq/src/ddr/mod.rs
View File

@ -257,6 +257,17 @@ impl DdrRam {
.post_selfref_gap_x32(0x10)
);
#[cfg(feature = "target_cora_z7_10")]
self.regs.dram_param1.write(
regs::DramParam1::zeroed()
.wr2pre(0x12)
.powerdown_to_x32(0x6)
.t_faw(0x15)
.t_ras_max(0x23)
.t_ras_min(0x13)
.t_cke(0x4)
);
self.regs.dram_param2.write(
regs::DramParam2::zeroed()
.write_latency(0x5)
@ -268,12 +279,34 @@ impl DdrRam {
.t_rcd(0x7)
);
#[cfg(feature = "target_cora_z7_10")]
self.regs.dram_param3.write(
regs::DramParam3::zeroed()
.t_ccd(4)
.t_rrd(6)
.refresh_margin(2)
.t_rp(7)
.refresh_to_x32(8)
.mobile(false)
.dfi_dram_clk_disable(false)
.read_latency(7)
.mode_ddr1_ddr2(true)
.dis_pad_pd(false)
);
self.regs.dram_emr_mr.write(
regs::DramEmrMr::zeroed()
.mr(0x930)
.emr(0x4)
);
#[cfg(feature = "target_cora_z7_10")]
self.regs.dram_burst8_rdwr.write(
regs::Burst8Rdwr::zeroed()
.burst_rdwr(4)
.pre_cke_x1024(0x167)
.post_cke_x1024(0x1)
);
#[cfg(feature = "target_cora_z7_10")]
self.regs.phy_config2.modify(
|_, w| w.data_slice_in_use(false)
@ -315,6 +348,12 @@ impl DdrRam {
.ctrlup_max(0x40)
);
#[cfg(feature = "target_cora_z7_10")]
self.regs.phy_init_ratio3.write(
regs::PhyInitRatio::zeroed()
.wrlvl_init_ratio(0x0)
.gatelvl_init_ratio(0x76)
);
#[cfg(feature = "target_zc706")]
self.regs.phy_init_ratio3.write(
regs::PhyInitRatio::zeroed()
@ -340,6 +379,18 @@ impl DdrRam {
.dis_calib_rst(false)
.ctrl_slave_delay(0x0)
);
#[cfg(feature = "target_cora_z7_10")]
for axi_priority_rd_port in &mut self.regs.axi_priority_rd_ports {
axi_priority_rd_port.modify(
|_, w| w
.arb_pri_rd_portn(0x3ff)
.arb_disable_aging_rd_portn(false)
.arb_disable_urgent_rd_portn(false)
.arb_disable_page_match_rd_portn(false)
.arb_set_hpr_rd_portn(false)
);
}
}
/// Reset DDR controller

1
szl/Cargo.toml
View File

@ -7,7 +7,6 @@ edition = "2018"
[features]
target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706"]
target_cora_z7_10 = ["libboard_zynq/target_cora_z7_10", "libsupport_zynq/target_cora_z7_10", "libconfig/target_cora_z7_10"]
target_redpitaya = ["libboard_zynq/target_redpitaya", "libsupport_zynq/target_redpitaya", "libconfig/target_redpitaya"]
default = ["target_zc706"]