Skip to content

Commit 5f341ea

Browse files
glaserfglaserf
committed
[rdl] Use correct reset values for BCRs in TTI
Signed-off-by: Florian Glaser <glaserf@lowrisc.org>
1 parent ed63af1 commit 5f341ea

5 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎src/csr/I3CCSR.sv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7159,7 +7159,7 @@ module I3CCSR (
71597159
end
71607160
always_ff @(posedge clk or negedge hwif_in.rst_ni) begin
71617161
if(~hwif_in.rst_ni) begin
7162-
field_storage.I3C_EC.StdbyCtrlMode.STBY_CR_VIRTUAL_DEVICE_CHAR.BCR_VAR.value <= 5'h16;
7162+
field_storage.I3C_EC.StdbyCtrlMode.STBY_CR_VIRTUAL_DEVICE_CHAR.BCR_VAR.value <= 5'h10;
71637163
end else begin
71647164
if(field_combo.I3C_EC.StdbyCtrlMode.STBY_CR_VIRTUAL_DEVICE_CHAR.BCR_VAR.load_next) begin
71657165
field_storage.I3C_EC.StdbyCtrlMode.STBY_CR_VIRTUAL_DEVICE_CHAR.BCR_VAR.value <= field_combo.I3C_EC.StdbyCtrlMode.STBY_CR_VIRTUAL_DEVICE_CHAR.BCR_VAR.next;
@@ -7329,7 +7329,7 @@ module I3CCSR (
73297329
end
73307330
always_ff @(posedge clk or negedge hwif_in.rst_ni) begin
73317331
if(~hwif_in.rst_ni) begin
7332-
field_storage.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_CHAR.BCR_VAR.value <= 5'h6;
7332+
field_storage.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_CHAR.BCR_VAR.value <= 5'h16;
73337333
end else begin
73347334
if(field_combo.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_CHAR.BCR_VAR.load_next) begin
73357335
field_storage.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_CHAR.BCR_VAR.value <= field_combo.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_CHAR.BCR_VAR.next;

‎src/csr/I3CCSR_uvm.sv‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3108,7 +3108,7 @@ package I3CCSR_uvm;
31083108
this.DCR = new("DCR");
31093109
this.DCR.configure(this, 8, 16, "RW", 0, 'hbd, 1, 1, 0);
31103110
this.BCR_VAR = new("BCR_VAR");
3111-
this.BCR_VAR.configure(this, 5, 24, "RW", 0, 'h16, 1, 1, 0);
3111+
this.BCR_VAR.configure(this, 5, 24, "RW", 0, 'h10, 1, 1, 0);
31123112
this.BCR_FIXED = new("BCR_FIXED");
31133113
this.BCR_FIXED.configure(this, 3, 29, "RW", 0, 'h1, 1, 1, 0);
31143114
if (has_coverage(UVM_CVR_REG_BITS)) begin
@@ -3193,7 +3193,7 @@ package I3CCSR_uvm;
31933193
this.DCR = new("DCR");
31943194
this.DCR.configure(this, 8, 16, "RW", 0, 'hbd, 1, 1, 0);
31953195
this.BCR_VAR = new("BCR_VAR");
3196-
this.BCR_VAR.configure(this, 5, 24, "RW", 0, 'h6, 1, 1, 0);
3196+
this.BCR_VAR.configure(this, 5, 24, "RW", 0, 'h16, 1, 1, 0);
31973197
this.BCR_FIXED = new("BCR_FIXED");
31983198
this.BCR_FIXED.configure(this, 3, 29, "RW", 0, 'h1, 1, 1, 0);
31993199
if (has_coverage(UVM_CVR_REG_BITS)) begin

‎src/rdl/docs/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,7 @@ to receive its Dynamic Address before operating in Standby Controller mode.</p>
21722172
|-----|----------|------|------|---------|
21732173
| 15:1| PID_HI | rw |0x7FFF| PID_HI |
21742174
|23:16| DCR | rw | 0xBD | DCR |
2175-
|28:24| BCR_VAR | rw | 0x16 | BCR_VAR |
2175+
|28:24| BCR_VAR | rw | 0x10 | BCR_VAR |
21762176
|31:29| BCR_FIXED| rw | 0x1 |BCR_FIXED|
21772177

21782178
#### PID_HI field
@@ -2186,7 +2186,7 @@ to receive its Dynamic Address before operating in Standby Controller mode.</p>
21862186
#### BCR_VAR field
21872187

21882188
<p>Bus Characteristics, Variable Part.</p>
2189-
<p>Reset value is set to 5'b10110, because this device:</p>
2189+
<p>Reset value is set to 5'b10000, because this device:</p>
21902190
<ul>
21912191
<li>
21922192
<p>[bit4] is a Virtual Target</p>
@@ -2195,10 +2195,10 @@ to receive its Dynamic Address before operating in Standby Controller mode.</p>
21952195
<p>[bit3] is not Offline Capable</p>
21962196
</li>
21972197
<li>
2198-
<p>[bit2] uses the MDB in the IBI Payload</p>
2198+
<p>[bit2] does not apply due to bit1</p>
21992199
</li>
22002200
<li>
2201-
<p>[bit1] is capable of IBI requests</p>
2201+
<p>[bit1] is not capable of IBI requests</p>
22022202
</li>
22032203
<li>
22042204
<p>[bit0] has no speed limitation</p>
@@ -2249,7 +2249,7 @@ which supports extended capabilities</p>
22492249
|-----|----------|------|------|---------|
22502250
| 15:1| PID_HI | rw |0x7FFF| PID_HI |
22512251
|23:16| DCR | rw | 0xBD | DCR |
2252-
|28:24| BCR_VAR | rw | 0x6 | BCR_VAR |
2252+
|28:24| BCR_VAR | rw | 0x16 | BCR_VAR |
22532253
|31:29| BCR_FIXED| rw | 0x1 |BCR_FIXED|
22542254

22552255
#### PID_HI field
@@ -2263,16 +2263,16 @@ which supports extended capabilities</p>
22632263
#### BCR_VAR field
22642264

22652265
<p>Bus Characteristics, Variable Part.</p>
2266-
<p>Reset value is set to 5'b00110, because this device:</p>
2266+
<p>Reset value is set to 5'b10110, because this device:</p>
22672267
<ul>
22682268
<li>
2269-
<p>[bit4] is not a Virtual Target</p>
2269+
<p>[bit4] exposes a Virtual Target</p>
22702270
</li>
22712271
<li>
22722272
<p>[bit3] is not Offline Capable</p>
22732273
</li>
22742274
<li>
2275-
<p>[bit2] uses the MDB in the IBI Payload</p>
2275+
<p>[bit2] (always) uses the MDB in the IBI Payload</p>
22762276
</li>
22772277
<li>
22782278
<p>[bit1] is capable of IBI requests</p>

‎src/rdl/standby_controller_mode.rdl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -303,22 +303,22 @@ regfile StandbyControllerModeRegisters#(
303303
name = "BCR_VAR";
304304
desc = "Bus Characteristics, Variable Part.
305305

306-
Reset value is set to 5'b10110, because this device:
306+
Reset value is set to 5'b10000, because this device:
307307

308308

309309
- [bit4] is a Virtual Target
310310

311311
- [bit3] is not Offline Capable
312312

313-
- [bit2] uses the MDB in the IBI Payload
313+
- [bit2] does not apply due to bit1
314314

315-
- [bit1] is capable of IBI requests
315+
- [bit1] is not capable of IBI requests
316316

317317
- [bit0] has no speed limitation
318318
";
319319
hw = r;
320320
sw = rw;
321-
reset = 5'b10110;
321+
reset = 5'b10000;
322322
} BCR_VAR[28:24];
323323
field {
324324
name = "DCR";
@@ -378,22 +378,22 @@ regfile StandbyControllerModeRegisters#(
378378
name = "BCR_VAR";
379379
desc = "Bus Characteristics, Variable Part.
380380

381-
Reset value is set to 5'b00110, because this device:
381+
Reset value is set to 5'b10110, because this device:
382382

383383

384-
- [bit4] is not a Virtual Target
384+
- [bit4] exposes a Virtual Target
385385

386386
- [bit3] is not Offline Capable
387387

388-
- [bit2] uses the MDB in the IBI Payload
388+
- [bit2] (always) uses the MDB in the IBI Payload
389389

390390
- [bit1] is capable of IBI requests
391391

392392
- [bit0] has no speed limitation
393393
";
394394
hw = r;
395395
sw = rw;
396-
reset = 5'b00110;
396+
reset = 5'b10110;
397397
} BCR_VAR[28:24];
398398
field {
399399
name = "DCR";

‎verification/cocotb/common/reg_map.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,7 +2330,7 @@
23302330
"BCR_VAR": {
23312331
"low": 24,
23322332
"mask": 520093696,
2333-
"reset": 22,
2333+
"reset": 16,
23342334
"sw": "rw",
23352335
"hw": "r",
23362336
"woclr": 0,
@@ -2408,7 +2408,7 @@
24082408
"BCR_VAR": {
24092409
"low": 24,
24102410
"mask": 520093696,
2411-
"reset": 6,
2411+
"reset": 22,
24122412
"sw": "rw",
24132413
"hw": "r",
24142414
"woclr": 0,

0 commit comments

Comments
 (0)