luke
/
prjpeppercorn
mirror of https://github.com/YosysHQ/prjpeppercorn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gmpack: add background reconfiguration feature

This commit is contained in:
Patrick Urban 2025-10-15 23:19:50 +02:00
parent f9183e4e2a
commit 0283a03d82
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libgm/src/Bitstream.cpp
View File

@ -967,6 +967,7 @@ Bitstream Bitstream::serialise_chip(const Chip &chip, const std::map<std::string
}
// Write latch configuration
int scrubaddr = 0;
for (int iteration = 0; iteration < 3; iteration++) {
for (int y = 0; y < Die::MAX_ROWS; y++) {
for (int x = 0; x < Die::MAX_COLS; x++) {
@ -979,6 +980,8 @@ Bitstream Bitstream::serialise_chip(const Chip &chip, const std::map<std::string
// If CPE empty skip other iterations
if (iteration != 0 && die.is_cpe_empty(x, y))
continue;
if (iteration == 1 && scrubaddr == 0)
scrubaddr = wr.data.size();
std::vector<uint8_t> data = std::vector<uint8_t>(die.get_latch_config(x, y));
uint8_t ff_init = data.back();
data.pop_back();
@ -1030,15 +1033,20 @@ Bitstream Bitstream::serialise_chip(const Chip &chip, const std::map<std::string
if (die.is_using_cfg_gpios())
wr.write_cmd_chg_status(CFG_DONE);
cfg_stat |= CFG_STOP | CFG_DONE;
cfg_stat |= CFG_DONE;
if (!options.count("background")) {
cfg_stat |= CFG_STOP;
}
if (options.count("reconfig")) {
cfg_stat |= CFG_RECONFIG | CFG_CPE_CFG;
}
if (options.count("bootaddr")) {
// Enable config clock
die_config[Die::STATUS_CFG_START + 2 + 2] |= CFG_PLL_AUTN;
die_config[Die::STATUS_CFG_START + 2 + 3] |= CFG_AUTN_CT_I;
if (options.count("bootaddr") || options.count("background")) {
// Enable autonomous clock if PLL not enabled
if (die.is_pll_cfg_empty(0)) {
die_config[Die::STATUS_CFG_START + 2 + 2] |= CFG_PLL_AUTN;
die_config[Die::STATUS_CFG_START + 2 + 3] |= CFG_AUTN_CT_I;
}
}
}
if (!die.is_serdes_cfg_empty()) {
@ -1051,10 +1059,13 @@ Bitstream Bitstream::serialise_chip(const Chip &chip, const std::map<std::string
wr.write_cmd_chg_status(cfg_stat, die_config);
if (d == 0) {
if (options.count("bootaddr")) {
if (options.count("bootaddr") && !options.count("background")) {
uint32_t bootaddr = std::strtoul(options.at("bootaddr").c_str(), nullptr, 0);
wr.write_cmd_jump(bootaddr);
}
if (options.count("background") && !options.count("bootaddr")) {
wr.write_cmd_jump(scrubaddr);
}
}
}
return Bitstream(wr.get());

5
libgm/tools/gmpack.cpp
View File

@ -41,6 +41,7 @@ int main(int argc, char *argv[])
options.add_options()("crcmode", po::value<std::string>(), "CRC error behaviour (check, ignore, unused)");
options.add_options()("spimode", po::value<std::string>(), "SPI Mode to use (single, dual, quad)");
options.add_options()("reconfig", "enable reconfiguration in bitstream");
options.add_options()("background", "enable background reconfiguration in bitstream");
options.add_options()("bootaddr", po::value<int>(), "boot address for secondary bitstream");
po::positional_options_description pos;
options.add_options()("input", po::value<std::string>()->required(), "input textual configuration");
@ -100,6 +101,10 @@ int main(int argc, char *argv[])
bitopts["reconfig"] = "yes";
}
if (vm.count("background")) {
bitopts["background"] = "yes";
}
if (vm.count("bootaddr")) {
bitopts["bootaddr"] = std::to_string(vm["bootaddr"].as<int>());
}