Merge branch 'bunnie-dev'

This commit is contained in:
bunnie 2021-04-27 18:55:57 +08:00
commit f76358e716
31 changed files with 925 additions and 132 deletions

23
Cargo.lock generated
View file

@ -343,6 +343,12 @@ dependencies = [
"xous-names",
]
[[package]]
name = "convert_case"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "crc"
version = "1.8.1"
@ -1322,12 +1328,27 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "susres"
version = "0.1.0"
dependencies = [
"log",
"log-server",
"num-derive",
"num-traits",
"rkyv 0.4.3",
"utralib",
"xous",
"xous-names",
]
[[package]]
name = "svd2utra"
version = "0.1.0"
dependencies = [
"anyhow",
"clap",
"convert_case",
"quick-xml",
]
@ -1414,6 +1435,7 @@ dependencies = [
"log-server",
"num-derive",
"num-traits",
"susres",
"utralib",
"xous",
]
@ -1754,7 +1776,6 @@ dependencies = [
"num-derive",
"num-traits",
"rkyv 0.4.3",
"ticktimer-server",
"utralib",
"xous",
"xous-ipc",

View file

@ -23,6 +23,7 @@ default-members = [
"services/cb-test-srv",
"services/cb-test-c1",
"services/cb-test-c2",
"services/susres",
]
members = [
"xous-ipc",
@ -57,6 +58,7 @@ members = [
"services/cb-test-srv",
"services/cb-test-c1",
"services/cb-test-c2",
"services/susres",
]
resolver = "2"

View file

@ -135,7 +135,10 @@ then
fi
else
md5sum $FPGA_IMAGE
if [ -e "$FPGA_IMAGE" ]
then
md5sum $FPGA_IMAGE
fi
md5sum $KERNEL_IMAGE
md5sum $LOADER_IMAGE

View file

@ -19,7 +19,7 @@ app_uart: UART.LiteX_UART @ {
-> cpu@1004
timer0: Timers.LiteX_Timer_32 @ {
sysbus 0xF0021000
sysbus 0xF0022000
}
frequency: 100000000
-> cpu@1001
@ -41,12 +41,12 @@ fbmem: Memory.MappedMemory @ sysbus 0xB0000000
memlcd: Video.BetrustedLCD @ sysbus 0xF000B000
keyboard: Input.BetrustedKbd @ sysbus 0xF0014000
keyboard: Input.BetrustedKbd @ sysbus 0xF0015000
-> cpu @ 1010
trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xF0019000
trng_kernel: Miscellaneous.BetrustedRNGKernel @ sysbus 0xF001A000
trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xF001A000
trng_server: Miscellaneous.BetrustedRNGServer @ sysbus 0xF001B000
ticktimer: Timers.TickTimer @ sysbus 0xF0011000
periodInMs: 1

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor>
<name>SOC</name>
<description><![CDATA[Litex SoC 2021-04-20 19:28:31]]></description>
<description><![CDATA[Litex SoC 2021-04-27 00:24:37]]></description>
<addressUnitBits>8</addressUnitBits>
<width>32</width>
@ -1070,10 +1070,10 @@ register to disable individual events.]]></description>
<register>
<name>GIT_GITREV</name>
<description><![CDATA[First 32-bits of the git revision. This documentation was built from git rev
``7edc9bd9``, so this value is 2128387033, which should be enough to check out
``4878d3c3``, so this value is 1215878083, which should be enough to check out
the exact git version used to build this firmware.]]></description>
<addressOffset>0x0014</addressOffset>
<resetValue>0x7edc9bd9</resetValue>
<resetValue>0x4878d3c3</resetValue>
<size>32</size>
<fields>
<field>
@ -1090,7 +1090,7 @@ the exact git version used to build this firmware.]]></description>
is ``1``, then the repository this was built from has one additional commit
beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
<addressOffset>0x0018</addressOffset>
<resetValue>0x1b</resetValue>
<resetValue>0x1f</resetValue>
<size>32</size>
<fields>
<field>
@ -1104,7 +1104,7 @@ beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
<register>
<name>GIT_DIRTY</name>
<addressOffset>0x001c</addressOffset>
<resetValue>0x00</resetValue>
<resetValue>0x01</resetValue>
<size>32</size>
<fields>
<field>
@ -2015,14 +2015,8 @@ register advances the read pointer automatically.]]></description>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Write a `1` to this bit to reset the count to 0]]></description>
</field>
<field>
<name>pause</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Write a `1` to this field to pause counting, 0 for free-run]]></description>
<description><![CDATA[Write a `1` to this bit to reset the count to 0. This bit has priority over all
other requests.]]></description>
</field>
</fields>
</register>
@ -2150,8 +2144,218 @@ register to disable individual events.]]></description>
</interrupt>
</peripheral>
<peripheral>
<name>POWER</name>
<name>SUSRES</name>
<baseAddress>0xF0012000</baseAddress>
<groupName>SUSRES</groupName>
<registers>
<register>
<name>CONTROL</name>
<addressOffset>0x0000</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>reset</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Write a `1` to this bit to reset the count to 0. This bit has priority over all
other requests.]]></description>
</field>
<field>
<name>pause</name>
<msb>1</msb>
<bitRange>[1:1]</bitRange>
<lsb>1</lsb>
<description><![CDATA[Write a `1` to this field to request a pause to counting, 0 for free-run. Count
pauses on the next tick quanta.]]></description>
</field>
<field>
<name>load</name>
<msb>2</msb>
<bitRange>[2:2]</bitRange>
<lsb>2</lsb>
<description><![CDATA[If paused, write a `1` to this bit to load a resume value to the timer. If not
paused, this bit is ignored.]]></description>
</field>
</fields>
</register>
<register>
<name>RESUME_TIME1</name>
<description><![CDATA[Bits 32-63 of `SUSRES_RESUME_TIME`. Elapsed time to load. Loaded upon writing
`1` to the load bit in the control regsiter. This will immediately affect the
msleep extension.]]></description>
<addressOffset>0x0004</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>resume_time</name>
<msb>31</msb>
<bitRange>[31:0]</bitRange>
<lsb>0</lsb>
</field>
</fields>
</register>
<register>
<name>RESUME_TIME0</name>
<description><![CDATA[Bits 0-31 of `SUSRES_RESUME_TIME`.]]></description>
<addressOffset>0x0008</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>resume_time</name>
<msb>31</msb>
<bitRange>[31:0]</bitRange>
<lsb>0</lsb>
</field>
</fields>
</register>
<register>
<name>TIME1</name>
<description><![CDATA[Bits 32-63 of `SUSRES_TIME`. Cycle-accurate mirror copy of time in systicks,
from the TickTimer]]></description>
<addressOffset>0x000c</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>time</name>
<msb>31</msb>
<bitRange>[31:0]</bitRange>
<lsb>0</lsb>
</field>
</fields>
</register>
<register>
<name>TIME0</name>
<description><![CDATA[Bits 0-31 of `SUSRES_TIME`.]]></description>
<addressOffset>0x0010</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>time</name>
<msb>31</msb>
<bitRange>[31:0]</bitRange>
<lsb>0</lsb>
</field>
</fields>
</register>
<register>
<name>STATUS</name>
<addressOffset>0x0014</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>paused</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[When set, indicates that the counter has been paused]]></description>
</field>
</fields>
</register>
<register>
<name>STATE</name>
<addressOffset>0x0018</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>resume</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Used to transfer the resume state information from the loader to Xous. If set,
indicates we are on the resume half of a suspend/resume.]]></description>
</field>
</fields>
</register>
<register>
<name>INTERRUPT</name>
<addressOffset>0x001c</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>interrupt</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Writing this causes an interrupt to fire. Used by Xous to initiate
suspend/resume from an interrupt context.]]></description>
</field>
</fields>
</register>
<register>
<name>EV_STATUS</name>
<description><![CDATA[This register contains the current raw level of the soft_int event trigger.
Writes to this register have no effect.]]></description>
<addressOffset>0x0020</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>soft_int</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Level of the ``soft_int`` event]]></description>
</field>
</fields>
</register>
<register>
<name>EV_PENDING</name>
<description><![CDATA[When a soft_int event occurs, the corresponding bit will be set in this
register. To clear the Event, set the corresponding bit in this register.]]></description>
<addressOffset>0x0024</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>soft_int</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[`1` if a `soft_int` event occurred. This Event is triggered on a **falling**
edge.]]></description>
</field>
</fields>
</register>
<register>
<name>EV_ENABLE</name>
<description><![CDATA[This register enables the corresponding soft_int events. Write a ``0`` to this
register to disable individual events.]]></description>
<addressOffset>0x0028</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>soft_int</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Write a ``1`` to enable the ``soft_int`` Event]]></description>
</field>
</fields>
</register>
</registers>
<addressBlock>
<offset>0</offset>
<size>0x2c</size>
<usage>registers</usage>
</addressBlock>
<interrupt>
<name>susres</name>
<value>9</value>
</interrupt>
</peripheral>
<peripheral>
<name>POWER</name>
<baseAddress>0xF0013000</baseAddress>
<groupName>POWER</groupName>
<registers>
<register>
@ -2295,12 +2499,12 @@ reset fashion]]></description>
</addressBlock>
<interrupt>
<name>power</name>
<value>9</value>
<value>10</value>
</interrupt>
</peripheral>
<peripheral>
<name>SPINOR</name>
<baseAddress>0xF0013000</baseAddress>
<baseAddress>0xF0014000</baseAddress>
<groupName>SPINOR</groupName>
<registers>
<register>
@ -2581,7 +2785,7 @@ checked]]></description>
</peripheral>
<peripheral>
<name>KEYBOARD</name>
<baseAddress>0xF0014000</baseAddress>
<baseAddress>0xF0015000</baseAddress>
<groupName>KEYBOARD</groupName>
<registers>
<register>
@ -2834,12 +3038,12 @@ again until the interrupt is serviced.]]></description>
</addressBlock>
<interrupt>
<name>keyboard</name>
<value>10</value>
<value>11</value>
</interrupt>
</peripheral>
<peripheral>
<name>KEYINJECT</name>
<baseAddress>0xF0015000</baseAddress>
<baseAddress>0xF0016000</baseAddress>
<groupName>KEYINJECT</groupName>
<registers>
<register>
@ -2875,14 +3079,14 @@ inject too fast.]]></description>
</peripheral>
<peripheral>
<name>SEED</name>
<baseAddress>0xF0016000</baseAddress>
<baseAddress>0xF0017000</baseAddress>
<groupName>SEED</groupName>
<registers>
<register>
<name>SEED1</name>
<description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description>
<addressOffset>0x0000</addressOffset>
<resetValue>0x470716fd</resetValue>
<resetValue>0x77083f9a</resetValue>
<size>32</size>
<fields>
<field>
@ -2897,7 +3101,7 @@ inject too fast.]]></description>
<name>SEED0</name>
<description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
<addressOffset>0x0004</addressOffset>
<resetValue>0x2218afde</resetValue>
<resetValue>0x9411178</resetValue>
<size>32</size>
<fields>
<field>
@ -2917,7 +3121,7 @@ inject too fast.]]></description>
</peripheral>
<peripheral>
<name>KEYROM</name>
<baseAddress>0xF0017000</baseAddress>
<baseAddress>0xF0018000</baseAddress>
<groupName>KEYROM</groupName>
<registers>
<register>
@ -2959,7 +3163,7 @@ inject too fast.]]></description>
</peripheral>
<peripheral>
<name>AUDIO</name>
<baseAddress>0xF0018000</baseAddress>
<baseAddress>0xF0019000</baseAddress>
<groupName>AUDIO</groupName>
<registers>
<register>
@ -3326,12 +3530,12 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
</addressBlock>
<interrupt>
<name>audio</name>
<value>11</value>
<value>12</value>
</interrupt>
</peripheral>
<peripheral>
<name>TRNG_KERNEL</name>
<baseAddress>0xF0019000</baseAddress>
<baseAddress>0xF001A000</baseAddress>
<groupName>TRNG_KERNEL</groupName>
<registers>
<register>
@ -3462,12 +3666,12 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
</addressBlock>
<interrupt>
<name>trng_kernel</name>
<value>12</value>
<value>13</value>
</interrupt>
</peripheral>
<peripheral>
<name>TRNG_SERVER</name>
<baseAddress>0xF001A000</baseAddress>
<baseAddress>0xF001B000</baseAddress>
<groupName>TRNG_SERVER</groupName>
<registers>
<register>
@ -3794,12 +3998,12 @@ to max field size]]></description>
</addressBlock>
<interrupt>
<name>trng_server</name>
<value>13</value>
<value>14</value>
</interrupt>
</peripheral>
<peripheral>
<name>TRNG</name>
<baseAddress>0xF001B000</baseAddress>
<baseAddress>0xF001C000</baseAddress>
<groupName>TRNG</groupName>
<registers>
<register>
@ -4112,7 +4316,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]></description>
</peripheral>
<peripheral>
<name>SHA512</name>
<baseAddress>0xF001C000</baseAddress>
<baseAddress>0xF001D000</baseAddress>
<groupName>SHA512</groupName>
<registers>
<register>
@ -4602,12 +4806,12 @@ in bits]]></description>
</addressBlock>
<interrupt>
<name>sha512</name>
<value>14</value>
<value>15</value>
</interrupt>
</peripheral>
<peripheral>
<name>ENGINE</name>
<baseAddress>0xF001D000</baseAddress>
<baseAddress>0xF001E000</baseAddress>
<groupName>ENGINE</groupName>
<registers>
<register>
@ -4831,12 +5035,12 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
</addressBlock>
<interrupt>
<name>engine</name>
<value>15</value>
<value>16</value>
</interrupt>
</peripheral>
<peripheral>
<name>JTAG</name>
<baseAddress>0xF001E000</baseAddress>
<baseAddress>0xF001F000</baseAddress>
<groupName>JTAG</groupName>
<registers>
<register>
@ -4894,7 +5098,7 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
</peripheral>
<peripheral>
<name>WDT</name>
<baseAddress>0xF001F000</baseAddress>
<baseAddress>0xF0020000</baseAddress>
<groupName>WDT</groupName>
<registers>
<register>
@ -5049,12 +5253,54 @@ register to disable individual events.]]></description>
</addressBlock>
<interrupt>
<name>wdt</name>
<value>16</value>
<value>17</value>
</interrupt>
</peripheral>
<peripheral>
<name>D11CTIME</name>
<baseAddress>0xF0021000</baseAddress>
<groupName>D11CTIME</groupName>
<registers>
<register>
<name>CONTROL</name>
<addressOffset>0x0000</addressOffset>
<resetValue>0x666</resetValue>
<size>32</size>
<fields>
<field>
<name>count</name>
<msb>14</msb>
<bitRange>[14:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Number of 1/32768 second ticks before creating a heart beat]]></description>
</field>
</fields>
</register>
<register>
<name>HEARTBEAT</name>
<addressOffset>0x0004</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>beat</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Set to `1` at the next `count` interval rollover since `clear` was set.]]></description>
</field>
</fields>
</register>
</registers>
<addressBlock>
<offset>0</offset>
<size>0x8</size>
<usage>registers</usage>
</addressBlock>
</peripheral>
<peripheral>
<name>IDENTIFIER_MEM</name>
<baseAddress>0xF0020000</baseAddress>
<baseAddress>0xF0022000</baseAddress>
<groupName>IDENTIFIER_MEM</groupName>
<registers>
<register>
@ -5081,7 +5327,7 @@ register to disable individual events.]]></description>
</peripheral>
<peripheral>
<name>TIMER0</name>
<baseAddress>0xF0021000</baseAddress>
<baseAddress>0xF0023000</baseAddress>
<groupName>TIMER0</groupName>
<registers>
<register>
@ -5293,22 +5539,23 @@ register to disable individual events.]]></description>
<constant name="CONFIG_BUS_DATA_WIDTH" value="32" />
<constant name="CONFIG_BUS_ADDRESS_WIDTH" value="32" />
<constant name="APP_UART_INTERRUPT" value="4" />
<constant name="AUDIO_INTERRUPT" value="11" />
<constant name="AUDIO_INTERRUPT" value="12" />
<constant name="BTEVENTS_INTERRUPT" value="7" />
<constant name="COM_INTERRUPT" value="5" />
<constant name="CONSOLE_INTERRUPT" value="3" />
<constant name="ENGINE_INTERRUPT" value="15" />
<constant name="ENGINE_INTERRUPT" value="16" />
<constant name="GPIO_INTERRUPT" value="1" />
<constant name="I2C_INTERRUPT" value="6" />
<constant name="KEYBOARD_INTERRUPT" value="10" />
<constant name="POWER_INTERRUPT" value="9" />
<constant name="SHA512_INTERRUPT" value="14" />
<constant name="KEYBOARD_INTERRUPT" value="11" />
<constant name="POWER_INTERRUPT" value="10" />
<constant name="SHA512_INTERRUPT" value="15" />
<constant name="SUSRES_INTERRUPT" value="9" />
<constant name="TICKTIMER_INTERRUPT" value="8" />
<constant name="TIMER0_INTERRUPT" value="0" />
<constant name="TRNG_KERNEL_INTERRUPT" value="12" />
<constant name="TRNG_SERVER_INTERRUPT" value="13" />
<constant name="TRNG_KERNEL_INTERRUPT" value="13" />
<constant name="TRNG_SERVER_INTERRUPT" value="14" />
<constant name="UART_INTERRUPT" value="2" />
<constant name="WDT_INTERRUPT" value="16" />
<constant name="WDT_INTERRUPT" value="17" />
</constants>
</vendorExtensions>
</device>

7
kernel/Cargo.lock generated
View file

@ -142,6 +142,12 @@ dependencies = [
"vec_map",
]
[[package]]
name = "convert_case"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "crossbeam-channel"
version = "0.5.0"
@ -450,6 +456,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"clap",
"convert_case",
"quick-xml",
]

View file

@ -7,7 +7,7 @@ use crate::arch::process::Process as ArchProcess;
use crate::arch::process::{Thread, RETURN_FROM_ISR};
use crate::mem::{MemoryManager, PAGE_SIZE};
use crate::services::SystemServices;
use riscv::register::{scause, sepc, sie, sstatus, stval, vexriscv::sim, vexriscv::sip};
use riscv::register::{scause, sepc, sstatus, stval, vexriscv::sim, vexriscv::sip};
use xous_kernel::{SysCall, PID, TID};
extern "Rust" {
@ -18,14 +18,17 @@ extern "C" {
fn flush_mmu();
}
// use RAM-based backing so this variable is automatically saved on suspend
static mut SIM_BACKING: usize = 0;
/// Disable external interrupts
pub fn disable_all_irqs() {
unsafe { sie::clear_sext() };
unsafe{SIM_BACKING = sim::read()};
sim::write(0x0);
}
/// Enable external interrupts
pub fn enable_all_irqs() {
unsafe { sie::set_sext() };
sim::write(unsafe{SIM_BACKING});
}
pub fn enable_irq(irq_no: usize) {

7
loader/Cargo.lock generated
View file

@ -53,6 +53,12 @@ dependencies = [
"vec_map",
]
[[package]]
name = "convert_case"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "getrandom"
version = "0.1.14"
@ -168,6 +174,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"clap",
"convert_case",
"quick-xml",
]

0
loader/assemble.sh Normal file → Executable file
View file

View file

@ -1116,6 +1116,8 @@ fn phase_1(cfg: &mut BootConfig) {
// prior to jumping to our program, so allocate one page of data for
// stack.
// All other allocations will be placed below the stack pointer.
//
// As of Xous 0.8, the top page is bootloader stack, and the page below that is the 'clean suspend' page.
cfg.init_size += PAGE_SIZE * 2;
// The first region is defined as being "main RAM", which will be used
@ -1152,8 +1154,11 @@ fn phase_1(cfg: &mut BootConfig) {
// will require us to transfer ownership in `stage3`.
// Note also that we skip the first index, causing the stack to be
// returned to the process pool.
// We also skip the second index as that is the clean suspend page. This
// needs to be claimed by the susres server before the kernel allocates it.
// Lower numbered indices corresponding to higher address pages.
println!("Marking pages as in-use");
for i in 1..(cfg.init_size / PAGE_SIZE) {
for i in 3..(cfg.init_size / PAGE_SIZE) {
cfg.runtime_page_tracker[cfg.sram_size / PAGE_SIZE - i] = 1;
}
}
@ -1229,5 +1234,7 @@ pub fn phase_2(cfg: &mut BootConfig) {
"Runtime Page Tracker: {} bytes",
cfg.runtime_page_tracker.len()
);
cfg.runtime_page_tracker[cfg.sram_size / PAGE_SIZE - 1] = 0;
// mark pages used by suspend/resume as unused for later allocation by the susres server
cfg.runtime_page_tracker[cfg.sram_size / PAGE_SIZE - 1] = 0; // loader stack
cfg.runtime_page_tracker[cfg.sram_size / PAGE_SIZE - 2] = 0; // clean suspend page
}

View file

@ -116,7 +116,6 @@ pub fn status_thread(canvas_gid_0: usize, canvas_gid_1: usize, canvas_gid_2: usi
let mut rtc = rtc::Rtc::new(&xns).unwrap();
#[cfg(target_os = "none")]
rtc.clear_wakeup_alarm().unwrap(); // clear any wakeup alarm state, if it was set
rtc.hook_rtc_callback(dt_callback).unwrap();

View file

@ -23,7 +23,7 @@ pub struct Llio {
}
impl Llio {
pub fn new(xns: &xous_names::XousNames) -> Result<Self, xous::Error> {
let conn = xns.request_connection_blocking(api::SERVER_NAME_LLIO).expect("Can't connect to MyServer");
let conn = xns.request_connection_blocking(api::SERVER_NAME_LLIO).expect("Can't connect to LLIO");
Ok(Llio {
conn,
com_sid: None,

View file

@ -402,6 +402,9 @@ mod implementation {
pub fn clear_wakeup_alarm(&mut self) {
self.wakeup_alarm_enabled = false;
// make sure battery switchover is enabled, otherwise we won't keep time when power goes off
self.blocking_i2c_write2([ABRTCMC_CONTROL3, (Control3::BATT_STD_BL_EN).bits()]);
let mut config = Config::CLKOUT_DISABLE.bits();
if self.rtc_alarm_enabled {
config |= (Config::TIMER_A_COUNTDWN | Config::TIMERA_SECONDS_INT_PULSED).bits();
@ -658,12 +661,15 @@ fn xmain() -> ! {
}),
Some(Opcode::ClearWakeupAlarm) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
rtc.clear_wakeup_alarm(); // blocks until transaction is finished
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
}),
Some(Opcode::SetRtcAlarm) => msg_blocking_scalar_unpack!(msg, delay, _, _, _, {
rtc.rtc_alarm(delay as u8); // this will block until finished, no callbacks used
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
}),
Some(Opcode::ClearRtcAlarm) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
rtc.clear_rtc_alarm(); // blocks until transaction is finished
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
}),
None => {
log::error!("unknown opcode received, exiting");

View file

@ -0,0 +1,23 @@
[package]
name = "susres"
version = "0.1.0"
authors = ["bunnie <bunnie@kosagi.com>"]
edition = "2018"
description = "Manager of suspend/resume operations"
[dependencies]
xous = { path = "../../xous-rs" }
log-server = { path = "../log-server" }
xous-names = { path = "../xous-names" }
log = "0.4"
num-derive = {version = "0.3", default-features = false}
num-traits = {version = "0.2", default-features = false}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}
[target.'cfg(not(any(windows,unix)))'.dependencies]
utralib = { path = "../../utralib"}
[features]
default = []

252
services/susres/src/api.rs Normal file
View file

@ -0,0 +1,252 @@
#[cfg(target_os = "none")]
use utralib::generated::*;
pub(crate) const SERVER_NAME_SUSRES: &str = "_Suspend/resume manager_";
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub(crate) enum Opcode {
/// requests a suspend
SuspendRequest,
/// register a subscriber to the suspend event
/// (if you don't register, you just get suspend without any warning!)
SuspendEventSubscribe,
/// indicate we're ready to suspend
SuspendReady,
}
#[derive(num_derive::FromPrimitive, num_derive::ToPrimitive, Debug)]
pub(crate) enum ExecGateOpcode {
SuspendNow,
}
#[cfg(target_os = "none")]
#[derive(Debug, Copy, Clone)]
pub enum RegOrField {
Field(Field),
Reg(Register),
}
#[cfg(target_os = "none")]
#[derive(Debug, Copy, Clone)]
pub struct ManagedReg {
/// register, or a field of a register
pub item: RegOrField,
/// override the default mask value if Some() - mask is aligned to the register or field (do not shift the mask to the left to correspond to the actual bit position)
pub mask: Option<usize>,
/// the saved value of the field or register
pub value: Option<usize>,
}
//#[derive(Debug)]
#[cfg(target_os = "none")]
pub struct RegManager<const N: usize> {
pub csr: CSR<u32>,
pub registers: [Option<ManagedReg>; N],
pub sus_prologue: Option<fn(&mut Self)>,
pub sus_epilogue: Option<fn(&mut Self)>,
pub res_prologue: Option<fn(&mut Self)>,
pub res_epilogue: Option<fn(&mut Self)>,
}
#[cfg(target_os = "none")]
impl<const N: usize> RegManager::<N> where ManagedReg: core::marker::Copy {
pub fn new(reg_base: *mut u32) -> RegManager::<N> {
RegManager::<N> {
csr: CSR::new(reg_base),
registers: [None; N],
sus_prologue: None,
sus_epilogue: None,
res_prologue: None,
res_epilogue: None,
}
}
// push registers into the manager in the order you want them suspended
pub fn push(&mut self, mr: RegOrField, mask_override: Option<usize>) {
let mrt = ManagedReg {
item: mr,
mask: mask_override,
value: None,
};
for entry in self.registers.iter_mut() {
if entry.is_none() {
*entry = Some(mrt);
return;
}
}
// A panic! is most appropriate here, because there is really no graceful
// remedy to this. It is a straight-up programmer error that needs to be fixed.
panic!("Ran out of space pushing to suspend/resume manager structure. Please increase the allocated size!");
}
}
#[cfg(target_os = "none")]
pub trait SuspendResume {
fn suspend(&mut self);
fn resume(&mut self);
}
#[cfg(target_os = "none")]
impl<const N: usize> SuspendResume for RegManager<N> {
fn suspend(&mut self) {
if let Some(sp) = self.sus_prologue {
sp(self);
}
for entry in self.registers.iter_mut().rev() {
if let Some(reg) = entry {
// masking is done on the write side
match reg.item {
RegOrField::Field(field) => reg.value = Some(self.csr.rf(field) as usize),
RegOrField::Reg(r) => reg.value = Some(self.csr.r(r) as usize),
}
}
}
if let Some(se) = self.sus_epilogue {
se(self);
}
}
fn resume(&mut self) {
if let Some(rp) = self.res_prologue {
rp(self);
}
for entry in self.registers.iter() { // this is in reverse order to the suspend
if let Some(reg) = entry {
if let Some(mut value) = reg.value {
if let Some(mask) = reg.mask {
value &= mask;
}
match reg.item {
RegOrField::Field(field) => self.csr.rmwf(field, value as u32),
RegOrField::Reg(r) => self.csr.wo(r, value as u32),
}
}
}
}
if let Some(re) = self.res_epilogue {
re(self);
}
}
}
// because the volatile memory regions can be potentially large (128kiB), but fewer (maybe 5-6 total in the system),
// we allocate these as stand-alone structures and manage them explicitly.
#[cfg(target_os = "none")]
pub struct ManagedMem<const N: usize> {
pub mem: xous::MemoryRange,
pub backing: [u32; N],
}
#[cfg(target_os = "none")]
impl<const N: usize> SuspendResume for ManagedMem<N> {
fn suspend(&mut self) {
let src = self.mem.as_ptr() as *const u32;
for words in 0..self.mem.len() {
self.backing[words] = unsafe{src.add(words).read_volatile()};
}
}
fn resume(&mut self) {
let dst = self.mem.as_ptr() as *mut u32;
for words in 0..self.mem.len() {
unsafe{dst.add(words).write_volatile(self.backing[words])};
}
}
}
/*
// "suspend/resume u32"
struct SrU32 {
/// offset of the register
offset: crate::Register,
/// the saved value of the register
value: u32,
/// the order in which this register should be written. If none, it's written at any convenient time.
resume_order: Option<u8>,
/// if this register should be in the suspend/resume set
do_sr: bool,
}
/* sketching some structs for suspend/resume */
struct TicktimerSusres {
csr: utralib::CSR<u32>, // new(csr_base) will allocate this register, from the virtual CSR base given to us by the owning server
pub control: Option<u32>,
pub time1: Option<u32>,
pub time0: Option<u32>,
pub resume_time1: Option<u32>,
pub resume_time0: Option<u32>,
pub status: Option<u32>,
pub msleep_target1: Option<u32>,
pub msleep_target0: Option<u32>,
pub ev_status: Option<u32>,
pub ev_pending: Option<u32>,
pub ev_enable: Option<u32>,
pub ticktimer_irq: Option<bool>, // whether to enable or not after resume
pub wait_suspend: Option<fn(timeout: u32) -> bool>, // function to call to check if a block can suspend
}
pub trait SuspendResume {
pub fn suspend(&mut self) {
/*
go through each item of the structure, and if the item is Some(item), access the corresponding
register and save it into the register
*/
}
pub fn resume(&mut self) {
/*
go through each item of the stucture, and if the item is Some(item), unwrap the value and
poke it into the register
*/
}
}
enum TickttimerReg {
Control = 0,
Time1 = 1,
Time0 = 2,
MSleepTarget1 = 3,
//...
}
//enum TickttimerInterrupt {
// Alarm = 0,
//}
struct ManagedReg {
offset: TickttimerReg,
mask: usize, // mask of data to store
value: u32,
}
//struct ManagedInterrupt {
// irq: usize,
//}
struct ManagedMem {
offset: usize, // the starting offset of the volatile memory block
mem: [u32; MEMLEN], // backup copy of the memory
}
// this can operate on the above three structure
pub trait SusResOps {
fn save();
fn restore();
}
/*
Interrupts need no suspend/resume setup:
- the hooks and callback locations are all stored in non-volatile SRAM
- the SIM register, which contains the mask of interrupts that are enabled, will be restored
by the loader on boot
Between these two facts, all of the interrupt mechanism are transparently handled by the kernel
*/
struct SusResManager {
csr: utralib::CSR<u32>,
pub registers: [Option<ManagedReg>; 12], // max number is set by the utra2svd generator
//pub interrupts: [Option<usize>; 1], // if in this list, this interrupt should be enabled
// i think maybe these go in the library, not in the auto-generated manager structure
pub suspend_cb: fn(),
pub resume_cb: fn(),
}
pub trait SusResBlockOps {
fn append(reg: ManagedReg); // adds a register to the managed suspend list
fn suspend(); // iterates through the list of registers and performs the suspend operation
fn resume(); // iterates through the list of registers and performs the resume operation
}
*/

View file

@ -0,0 +1,27 @@
#![cfg_attr(target_os = "none", no_std)]
pub mod api;
pub use api::*;
use xous::{CID, send_message};
use num_traits::ToPrimitive;
pub struct Susres {
conn: CID,
}
impl Susres {
pub fn new(xns: &xous_names::XousNames) -> Result<Self, xous::Error> {
let conn = xns.request_connection_blocking(api::SERVER_NAME_SUSRES).expect("Can't connect to SUSRES");
Ok(Susres {
conn
})
}
}
impl Drop for Susres {
fn drop(&mut self) {
// de-allocate myself. It's unsafe because we are responsible to make sure nobody else is using the connection.
unsafe{xous::disconnect(self.conn).unwrap();}
}
}

113
services/susres/src/main.rs Normal file
View file

@ -0,0 +1,113 @@
#![cfg_attr(target_os = "none", no_std)]
#![cfg_attr(target_os = "none", no_main)]
mod api;
use api::*;
use num_traits::FromPrimitive;
#[cfg(target_os = "none")]
mod implementation {
use utralib::generated::*;
use crate::api::*;
fn handle_irq(_irq_no: usize, arg: *mut usize) {
let sr = unsafe{ &mut *(arg as *mut SusResHw) };
// dummy routine for now
sr.csr.wfo(utra::susres::EV_PENDING_SOFT_INT, 1);
}
pub struct SusResHw {
/// our CSR
csr: utralib::CSR<u32>,
/// memory region for the "clean suspend" marker
marker: xous::MemoryRange,
/// loader stack region -- this data is dirtied on every resume; claim it in this process so no others accidentally use it
loader_stack: xous::MemoryRange,
/// backing store for the ticktimer value
time_backing: Option<[u32; 2]>,
}
impl SusResHw {
pub fn new() -> Self {
let csr = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::susres::HW_SUSRES_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map SusRes CSR range");
let marker = xous::syscall::map_memory(
xous::MemoryAddress::new(0x40FFE000), // this is a special, hard-coded location
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
).expect("couldn't map clean suspend page");
let loader_stack = xous::syscall::map_memory(
xous::MemoryAddress::new(0x40FFF000), // this is a special, hard-coded location
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
).expect("couldn't map clean suspend page");
let mut sr = SusResHw {
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
time_backing: None,
marker,
loader_stack,
};
// check that the marker has been zerod by map_memory
// TODO
xous::claim_interrupt(
utra::susres::SUSRES_IRQ,
handle_irq,
(&mut sr) as *mut SusResHw as *mut usize,
).expect("couldn't claim IRQ");
sr
}
}
}
#[cfg(not(target_os = "none"))]
mod implementation {
pub struct SusResHw {
}
impl SusResHw {
pub fn new() -> Self {
SusResHw {}
}
}
}
#[xous::xous_main]
fn xmain() -> ! {
log_server::init_wait().unwrap();
log::set_max_level(log::LevelFilter::Trace);
log::info!("my PID is {}", xous::process::id());
let xns = xous_names::XousNames::new().unwrap();
let susres_sid = xns.register_name(api::SERVER_NAME_SUSRES).expect("can't register server");
log::trace!("registered with NS -- {:?}", susres_sid);
let susres_hw = implementation::SusResHw::new();
loop {
let msg = xous::receive_message(susres_sid).unwrap();
/*
match FromPrimitive::from_usize(msg.body.id()) {
None => {
log::error!("couldn't convert opcode");
break
}
}*/
}
// clean up our program
log::trace!("main loop exit, destroying servers");
xns.unregister_server(susres_sid).unwrap();
xous::destroy_server(susres_sid).unwrap();
log::trace!("quitting");
xous::terminate_process(); loop {}
}

View file

@ -12,6 +12,7 @@ log-server = {path = "../log-server"}
xous = {path = "../../xous-rs"}
num-derive = {version = "0.3", default-features = false}
num-traits = {version = "0.2", default-features = false}
susres = {path = "../susres"}
[target.'cfg(not(any(windows,unix)))'.dependencies]
utralib = {path = "../../utralib"}

View file

@ -52,56 +52,13 @@ impl core::cmp::PartialEq for SleepRequest {
}
}
/*
// "suspend/resume u32"
struct SrU32 {
/// offset of the register
offset: crate::Register,
/// the saved value of the register
value: u32,
/// the order in which this register should be written. If none, it's written at any convenient time.
resume_order: Option<u8>,
/// if this register should be in the suspend/resume set
do_sr: bool,
}
/* sketching some structs for suspend/resume */
struct TicktimerSusres {
csr: utralib::CSR<u32>, // new(csr_base) will allocate this register, from the virtual CSR base given to us by the owning server
pub control: Option<u32>,
pub time1: Option<u32>,
pub time0: Option<u32>,
pub resume_time1: Option<u32>,
pub resume_time0: Option<u32>,
pub status: Option<u32>,
pub msleep_target1: Option<u32>,
pub msleep_target0: Option<u32>,
pub ev_status: Option<u32>,
pub ev_pending: Option<u32>,
pub ev_enable: Option<u32>,
pub ticktimer_irq: Option<bool>, // whether to enable or not after resume
pub wait_suspend: Option<fn(timeout: u32) -> bool>, // function to call to check if a block can suspend
}
pub trait SuspendResume {
pub fn suspend(&mut self) {
/*
go through each item of the structure, and if the item is Some(item), access the corresponding
register and save it into the register
*/
}
pub fn resume(&mut self) {
/*
go through each item of the stucture, and if the item is Some(item), unwrap the value and
poke it into the register
*/
}
}
*/
#[cfg(target_os = "none")]
mod implementation {
const TICKS_PER_MS: u64 = 1;
use super::SleepRequest;
use utralib::generated::*;
use utra::ticktimer::*;
use susres::*;
pub struct XousTickTimer {
csr: utralib::CSR<u32>,
@ -109,6 +66,7 @@ mod implementation {
wdt: utralib::CSR<u32>,
current_response: Option<SleepRequest>,
connection: xous::CID,
susres: RegManager<TICKTIMER_NUMREGS>,
}
fn handle_wdt(_irq_no: usize, arg: *mut usize) {
@ -179,16 +137,22 @@ mod implementation {
)
.expect("couldn't map Watchdog timer CSR range");
let susres = RegManager::new(csr.as_mut_ptr() as *mut u32);
let mut xtt = XousTickTimer {
csr: CSR::new(csr.as_mut_ptr() as *mut u32),
#[cfg(feature = "watchdog")]
wdt: CSR::new(wdt.as_mut_ptr() as *mut u32),
current_response: None,
connection,
susres,
};
#[cfg(feature = "watchdog")]
xtt.wdt.wfo(utra::wdt::WATCHDOG_ENABLE, 1);
{
xtt.wdt.wfo(utra::wdt::WATCHDOG_ENABLE, 1);
xtt.susres.push(RegOrField::Field(utra::wdt::WATCHDOG_ENABLE), None);
}
xous::claim_interrupt(
utra::ticktimer::TICKTIMER_IRQ,
@ -205,7 +169,10 @@ mod implementation {
.expect("couldn't claim irq");
#[cfg(feature = "watchdog")]
xtt.wdt.wfo(utra::wdt::EV_ENABLE_SOFT_INT, 1);
{
xtt.wdt.wfo(utra::wdt::EV_ENABLE_SOFT_INT, 1);
xtt.susres.push(RegOrField::Reg(utra::wdt::EV_ENABLE), None);
}
xtt
}

View file

@ -354,6 +354,12 @@ fn xmain() -> ! {
#[cfg(not(target_os = "none"))]
let mut trng = Trng::new();
#[cfg(feature = "avalanchetest")]
log::info!("TRNG built with avalanche test enabled");
#[cfg(feature = "ringosctest")]
log::info!("TRNG built with ring oscillator test enabled");
#[cfg(any(feature = "avalanchetest", feature="ringosctest"))]
xous::create_thread_1(tester_thread, trng.get_trng_csr() as usize).expect("couldn't create test thread");

View file

@ -13,7 +13,6 @@ num-derive = {version = "0.3", default-features = false}
num-traits = {version = "0.2", default-features = false}
log = "0.4"
log-server = {path = "../log-server"}
ticktimer-server = {path = "../ticktimer-server"}
xous = {path = "../../xous-rs"}
xous-ipc = {path = "../../xous-ipc"}
rkyv = {version = "0.4.3", default-features = false, features = ["const_generics"]}

View file

@ -15,11 +15,52 @@ use xous_ipc::{String, Buffer};
use log::{error, info};
const FAIL_TIMEOUT_MS: u64 = 100;
#[cfg(target_os = "none")]
mod implementation {
use utralib::generated::*;
pub struct D11cTimeout {
d11t_csr: utralib::CSR<u32>,
}
impl D11cTimeout {
pub fn new() -> Self {
let csr = xous::syscall::map_memory(
xous::MemoryAddress::new(utra::d11ctime::HW_D11CTIME_BASE),
None,
4096,
xous::MemoryFlags::R | xous::MemoryFlags::W,
)
.expect("couldn't map D11cTimeout CSR range");
D11cTimeout {
d11t_csr: CSR::new(csr.as_mut_ptr() as *mut u32),
}
}
pub fn deterministic_busy_wait(&self) {
let phase = self.d11t_csr.rf(utra::d11ctime::HEARTBEAT_BEAT);
while phase == self.d11t_csr.rf(utra::d11ctime::HEARTBEAT_BEAT) {
xous::yield_slice();
}
}
}
}
#[cfg(not(target_os = "none"))]
mod implementation {
pub struct D11cTimeout {}
impl D11cTimeout {
pub fn new() -> Self {
D11cTimeout {}
}
pub fn deterministic_busy_wait(&self) {
// don't do anything for hosted mode
}
}
}
#[xous::xous_main]
fn xmain() -> ! {
use implementation::*;
let debug1 = false;
log_server::init_wait().unwrap();
log::set_max_level(log::LevelFilter::Info);
@ -28,7 +69,7 @@ fn xmain() -> ! {
let name_server = xous::create_server_with_address(b"xous-name-server")
.expect("Couldn't create xousnames-server");
let ticktimer = ticktimer_server::Ticktimer::new().expect("Couldn't connect to Ticktimer");
let d11ctimeout = D11cTimeout::new();
// this limits the number of available servers to be requested to 128...!
let mut name_table = FnvIndexMap::<_, _, U128>::new();
@ -57,19 +98,12 @@ fn xmain() -> ! {
response = api::Return::SID(new_sid.into());
} else {
// compute the next interval, rounded to a multiple of FAIL_TIMEOUT_MS to reduce timing side channels
let target_time: u64 = ((ticktimer.elapsed_ms()
/ FAIL_TIMEOUT_MS)
+ 1)
* FAIL_TIMEOUT_MS;
info!("request failed, waiting for deterministic timeout");
while ticktimer.elapsed_ms() < target_time {
xous::yield_slice();
}
d11ctimeout.deterministic_busy_wait();
info!("deterministic timeout done");
response = api::Return::Failure
}
buffer.replace(response).unwrap();
buffer.replace(response).expect("Register can't serialize return value");
}
Some(api::Opcode::Lookup) => {
let mem = msg.body.memory_message_mut().unwrap();
@ -118,7 +152,7 @@ fn xmain() -> ! {
};
response = api::Return::AuthenticateRequest(auth_request) // this code just exists to exercise the return path
}
buffer.replace(response).unwrap();
buffer.replace(response).expect("Lookup can't serialize return value");
}
Some(api::Opcode::AuthenticatedLookup) => {
let mem = msg.body.memory_message_mut().unwrap();

View file

@ -10,3 +10,4 @@ edition = "2018"
quick-xml = "0.19"
clap = "2"
anyhow = "1.0"
convert_case = "0.4"

View file

@ -3,7 +3,7 @@
<device schemaVersion="1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="CMSIS-SVD.xsd" >
<vendor>litex</vendor>
<name>SOC</name>
<description><![CDATA[Litex SoC 2021-04-23 14:43:41]]></description>
<description><![CDATA[Litex SoC 2021-04-27 00:24:37]]></description>
<addressUnitBits>8</addressUnitBits>
<width>32</width>
@ -1104,7 +1104,7 @@ beyond the tag indicated in `MAJOR`, `MINOR`, and `REVISION`.]]></description>
<register>
<name>GIT_DIRTY</name>
<addressOffset>0x001c</addressOffset>
<resetValue>0x00</resetValue>
<resetValue>0x01</resetValue>
<size>32</size>
<fields>
<field>
@ -3086,7 +3086,7 @@ inject too fast.]]></description>
<name>SEED1</name>
<description><![CDATA[Bits 32-63 of `SEED_SEED`. Seed used for the build]]></description>
<addressOffset>0x0000</addressOffset>
<resetValue>0x468ba085</resetValue>
<resetValue>0x77083f9a</resetValue>
<size>32</size>
<fields>
<field>
@ -3101,7 +3101,7 @@ inject too fast.]]></description>
<name>SEED0</name>
<description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
<addressOffset>0x0004</addressOffset>
<resetValue>0x5f84de45</resetValue>
<resetValue>0x9411178</resetValue>
<size>32</size>
<fields>
<field>
@ -5257,8 +5257,50 @@ register to disable individual events.]]></description>
</interrupt>
</peripheral>
<peripheral>
<name>IDENTIFIER_MEM</name>
<name>D11CTIME</name>
<baseAddress>0xF0021000</baseAddress>
<groupName>D11CTIME</groupName>
<registers>
<register>
<name>CONTROL</name>
<addressOffset>0x0000</addressOffset>
<resetValue>0x666</resetValue>
<size>32</size>
<fields>
<field>
<name>count</name>
<msb>14</msb>
<bitRange>[14:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Number of 1/32768 second ticks before creating a heart beat]]></description>
</field>
</fields>
</register>
<register>
<name>HEARTBEAT</name>
<addressOffset>0x0004</addressOffset>
<resetValue>0x00</resetValue>
<size>32</size>
<fields>
<field>
<name>beat</name>
<msb>0</msb>
<bitRange>[0:0]</bitRange>
<lsb>0</lsb>
<description><![CDATA[Set to `1` at the next `count` interval rollover since `clear` was set.]]></description>
</field>
</fields>
</register>
</registers>
<addressBlock>
<offset>0</offset>
<size>0x8</size>
<usage>registers</usage>
</addressBlock>
</peripheral>
<peripheral>
<name>IDENTIFIER_MEM</name>
<baseAddress>0xF0022000</baseAddress>
<groupName>IDENTIFIER_MEM</groupName>
<registers>
<register>
@ -5285,7 +5327,7 @@ register to disable individual events.]]></description>
</peripheral>
<peripheral>
<name>TIMER0</name>
<baseAddress>0xF0022000</baseAddress>
<baseAddress>0xF0023000</baseAddress>
<groupName>TIMER0</groupName>
<registers>
<register>

View file

@ -1,7 +1,7 @@
use quick_xml::events::Event;
use quick_xml::Reader;
use std::io::{BufRead, BufReader, Read, Write};
use convert_case::{Case, Casing};
#[derive(Debug)]
pub enum ParseError {
UnexpectedTag,
@ -477,16 +477,22 @@ fn parse_vendor_extensions<T: BufRead>(
fn print_header<U: Write>(out: &mut U) -> std::io::Result<()> {
let s = r####"
#![allow(dead_code)]
use core::convert::TryInto;
#[derive(Debug, Copy, Clone)]
pub struct Register {
/// Offset of this register within this CSR
offset: usize,
/// Mask of SVD-specified bits for the register
mask: usize,
}
impl Register {
pub const fn new(offset: usize) -> Register {
Register { offset }
pub const fn new(offset: usize, mask: usize) -> Register {
Register { offset, mask }
}
}
#[derive(Debug, Copy, Clone)]
pub struct Field {
/// A bitmask we use to AND to the value, unshifted.
/// E.g. for a width of `3` bits, this mask would be 0b111.
@ -549,6 +555,7 @@ impl Field {
}
}
}
#[derive(Debug, Copy, Clone)]
pub struct CSR<T> {
pub base: *mut T,
}
@ -676,20 +683,37 @@ fn print_peripherals<U: Write>(peripherals: &[Peripheral], out: &mut U) -> std::
}
writeln!(out)?;
writeln!(out, "pub mod utra {{")?;
let s = r####"
pub mod utra {
"####;
out.write_all(s.as_bytes())?;
for peripheral in peripherals {
writeln!(out)?;
writeln!(out, " pub mod {} {{", peripheral.name.to_lowercase())?;
writeln!(out, " // this enum is vestigal, and currently not used by anything")?;
writeln!(out, " #[derive(Debug, Copy, Clone)]")?;
writeln!(out, " pub enum {}Offset {{", peripheral.name.to_case(Case::UpperCamel))?;
for register in &peripheral.registers {
writeln!(out, " {} = {},", register.name.to_case(Case::UpperCamel), register.offset / 4)?;
}
writeln!(out, " }}")?;
writeln!(out, " pub const {}_NUMREGS: usize = {};", peripheral.name.to_uppercase(), peripheral.registers.len())?;
for register in &peripheral.registers {
writeln!(out)?;
if let Some(description) = &register.description {
writeln!(out, " /// {}", description)?;
}
let mut mask: usize = 0;
for field in &register.fields {
mask |= ((1 << (field.msb + 1 - field.lsb)) - 1) << field.lsb;
}
writeln!(
out,
" pub const {}: crate::Register = crate::Register::new({});",
" pub const {}: crate::Register = crate::Register::new({}, 0x{:x});",
register.name.to_uppercase(),
register.offset / 4
register.offset / 4,
mask,
)?;
for field in &register.fields {
writeln!(

View file

@ -98,6 +98,7 @@ fn try_main() -> Result<(), DynError> {
"llio",
"rkyv-test-client",
"rkyv-test-server",
"susres",
];
let task = env::args().nth(1);
match task.as_deref() {
@ -142,6 +143,7 @@ cbtest builds an image for callback testing
trng-test [soc.svd] builds an image for TRNG testing (both avalanche and ring oscillator on)
ro-test [soc.svd] builds an image for ring oscillator only TRNG testing
av-test [soc.svd] builds an image for avalanche generater only TRNG testing
sr-test [soc.svd] builds the suspend/resume testing image
"
)
}