From b8be041663474a3e15dba5de5f8ef2bb76f5cf78 Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Fri, 23 Apr 2021 18:02:03 +0800
Subject: [PATCH] fix renode emulation -- need to figure out why TRNG server
 location changed

---
 emulation/renode.svd | 297 +++++++------------------------------------
 1 file changed, 46 insertions(+), 251 deletions(-)

diff --git a/emulation/renode.svd b/emulation/renode.svd
index 794d2937d..27260bd11 100644
--- a/emulation/renode.svd
+++ b/emulation/renode.svd
@@ -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-20 19:28:31]]></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
-``4878d3c3``, so this value is 1215878083, which should be enough to check out
+``7edc9bd9``, so this value is 2128387033, which should be enough to check out
 the exact git version used to build this firmware.]]></description>
                     <addressOffset>0x0014</addressOffset>
-                    <resetValue>0x4878d3c3</resetValue>
+                    <resetValue>0x7edc9bd9</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>0x1f</resetValue>
+                    <resetValue>0x1b</resetValue>
                     <size>32</size>
                     <fields>
                         <field>
@@ -2015,8 +2015,14 @@ 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. This bit has priority over all
-other requests.]]></description>
+                            <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>
                         </field>
                     </fields>
                 </register>
@@ -2143,219 +2149,9 @@ register to disable individual events.]]></description>
                 <value>8</value>
             </interrupt>
         </peripheral>
-        <peripheral>
-            <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>
+            <baseAddress>0xF0012000</baseAddress>
             <groupName>POWER</groupName>
             <registers>
                 <register>
@@ -2499,12 +2295,12 @@ reset fashion]]></description>
             </addressBlock>
             <interrupt>
                 <name>power</name>
-                <value>10</value>
+                <value>9</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>SPINOR</name>
-            <baseAddress>0xF0014000</baseAddress>
+            <baseAddress>0xF0013000</baseAddress>
             <groupName>SPINOR</groupName>
             <registers>
                 <register>
@@ -2785,7 +2581,7 @@ checked]]></description>
         </peripheral>
         <peripheral>
             <name>KEYBOARD</name>
-            <baseAddress>0xF0015000</baseAddress>
+            <baseAddress>0xF0014000</baseAddress>
             <groupName>KEYBOARD</groupName>
             <registers>
                 <register>
@@ -3038,12 +2834,12 @@ again until the interrupt is serviced.]]></description>
             </addressBlock>
             <interrupt>
                 <name>keyboard</name>
-                <value>11</value>
+                <value>10</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>KEYINJECT</name>
-            <baseAddress>0xF0016000</baseAddress>
+            <baseAddress>0xF0015000</baseAddress>
             <groupName>KEYINJECT</groupName>
             <registers>
                 <register>
@@ -3079,14 +2875,14 @@ inject too fast.]]></description>
         </peripheral>
         <peripheral>
             <name>SEED</name>
-            <baseAddress>0xF0017000</baseAddress>
+            <baseAddress>0xF0016000</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>0x468ba085</resetValue>
+                    <resetValue>0x470716fd</resetValue>
                     <size>32</size>
                     <fields>
                         <field>
@@ -3101,7 +2897,7 @@ inject too fast.]]></description>
                     <name>SEED0</name>
                     <description><![CDATA[Bits 0-31 of `SEED_SEED`.]]></description>
                     <addressOffset>0x0004</addressOffset>
-                    <resetValue>0x5f84de45</resetValue>
+                    <resetValue>0x2218afde</resetValue>
                     <size>32</size>
                     <fields>
                         <field>
@@ -3121,7 +2917,7 @@ inject too fast.]]></description>
         </peripheral>
         <peripheral>
             <name>KEYROM</name>
-            <baseAddress>0xF0018000</baseAddress>
+            <baseAddress>0xF0017000</baseAddress>
             <groupName>KEYROM</groupName>
             <registers>
                 <register>
@@ -3163,7 +2959,7 @@ inject too fast.]]></description>
         </peripheral>
         <peripheral>
             <name>AUDIO</name>
-            <baseAddress>0xF0019000</baseAddress>
+            <baseAddress>0xF0018000</baseAddress>
             <groupName>AUDIO</groupName>
             <registers>
                 <register>
@@ -3530,12 +3326,12 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
             </addressBlock>
             <interrupt>
                 <name>audio</name>
-                <value>12</value>
+                <value>11</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>TRNG_KERNEL</name>
-            <baseAddress>0xF001A000</baseAddress>
+            <baseAddress>0xF0019000</baseAddress>
             <groupName>TRNG_KERNEL</groupName>
             <registers>
                 <register>
@@ -3666,12 +3462,12 @@ I2S_FORMAT.I2S_STANDARD is I2S standard]]></description>
             </addressBlock>
             <interrupt>
                 <name>trng_kernel</name>
-                <value>13</value>
+                <value>12</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>TRNG_SERVER</name>
-            <baseAddress>0xF001B000</baseAddress>
+            <baseAddress>0xF001A000</baseAddress>
             <groupName>TRNG_SERVER</groupName>
             <registers>
                 <register>
@@ -3998,12 +3794,12 @@ to max field size]]></description>
             </addressBlock>
             <interrupt>
                 <name>trng_server</name>
-                <value>14</value>
+                <value>13</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>TRNG</name>
-            <baseAddress>0xF001C000</baseAddress>
+            <baseAddress>0xF001B000</baseAddress>
             <groupName>TRNG</groupName>
             <registers>
                 <register>
@@ -4316,7 +4112,7 @@ VCCBRAM (V) = ``Value`` x 3 / 4096.]]></description>
         </peripheral>
         <peripheral>
             <name>SHA512</name>
-            <baseAddress>0xF001D000</baseAddress>
+            <baseAddress>0xF001C000</baseAddress>
             <groupName>SHA512</groupName>
             <registers>
                 <register>
@@ -4806,12 +4602,12 @@ in bits]]></description>
             </addressBlock>
             <interrupt>
                 <name>sha512</name>
-                <value>15</value>
+                <value>14</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>ENGINE</name>
-            <baseAddress>0xF001E000</baseAddress>
+            <baseAddress>0xF001D000</baseAddress>
             <groupName>ENGINE</groupName>
             <registers>
                 <register>
@@ -5035,12 +4831,12 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
             </addressBlock>
             <interrupt>
                 <name>engine</name>
-                <value>16</value>
+                <value>15</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>JTAG</name>
-            <baseAddress>0xF001F000</baseAddress>
+            <baseAddress>0xF001E000</baseAddress>
             <groupName>JTAG</groupName>
             <registers>
                 <register>
@@ -5098,7 +4894,7 @@ exactly reflects the binary layout of an Engine instruction.]]></description>
         </peripheral>
         <peripheral>
             <name>WDT</name>
-            <baseAddress>0xF0020000</baseAddress>
+            <baseAddress>0xF001F000</baseAddress>
             <groupName>WDT</groupName>
             <registers>
                 <register>
@@ -5253,12 +5049,12 @@ register to disable individual events.]]></description>
             </addressBlock>
             <interrupt>
                 <name>wdt</name>
-                <value>17</value>
+                <value>16</value>
             </interrupt>
         </peripheral>
         <peripheral>
             <name>IDENTIFIER_MEM</name>
-            <baseAddress>0xF0021000</baseAddress>
+            <baseAddress>0xF0020000</baseAddress>
             <groupName>IDENTIFIER_MEM</groupName>
             <registers>
                 <register>
@@ -5285,7 +5081,7 @@ register to disable individual events.]]></description>
         </peripheral>
         <peripheral>
             <name>TIMER0</name>
-            <baseAddress>0xF0022000</baseAddress>
+            <baseAddress>0xF0021000</baseAddress>
             <groupName>TIMER0</groupName>
             <registers>
                 <register>
@@ -5497,23 +5293,22 @@ 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="12" />
+            <constant name="AUDIO_INTERRUPT" value="11" />
             <constant name="BTEVENTS_INTERRUPT" value="7" />
             <constant name="COM_INTERRUPT" value="5" />
             <constant name="CONSOLE_INTERRUPT" value="3" />
-            <constant name="ENGINE_INTERRUPT" value="16" />
+            <constant name="ENGINE_INTERRUPT" value="15" />
             <constant name="GPIO_INTERRUPT" value="1" />
             <constant name="I2C_INTERRUPT" value="6" />
-            <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="KEYBOARD_INTERRUPT" value="10" />
+            <constant name="POWER_INTERRUPT" value="9" />
+            <constant name="SHA512_INTERRUPT" value="14" />
             <constant name="TICKTIMER_INTERRUPT" value="8" />
             <constant name="TIMER0_INTERRUPT" value="0" />
-            <constant name="TRNG_KERNEL_INTERRUPT" value="13" />
-            <constant name="TRNG_SERVER_INTERRUPT" value="14" />
+            <constant name="TRNG_KERNEL_INTERRUPT" value="12" />
+            <constant name="TRNG_SERVER_INTERRUPT" value="13" />
             <constant name="UART_INTERRUPT" value="2" />
-            <constant name="WDT_INTERRUPT" value="17" />
+            <constant name="WDT_INTERRUPT" value="16" />
         </constants>
     </vendorExtensions>
 </device>
\ No newline at end of file