Skip to content

Commit f59f05a

Browse files
committed
Merge remote-tracking branch 'chips/main' into caliptra_ss-synthesis-build-fix-nvidia
2 parents 3a1e118 + 0b6a805 commit f59f05a

File tree

10 files changed

+330
-190
lines changed

10 files changed

+330
-190
lines changed

.github/workflow_metadata/pr_hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
64493d2343dc772a4b45093173182d340aff16da171a0f3ee8cb4ef6d7c802ad6be15409444c707f2345b11063eaa624
1+
8fcecd8df0e636fa5009731edf28dac6c9ffc6071041ffe139fd6462a024f6bd05fdf35aed46eaff8c0ac28bb8359b16
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1744401255
1+
1744604477

docs/CaliptraSSHardwareSpecification.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,22 @@ MCI aggregates the error information (Fatal, Non-Fatal errors from Caliptra, any
13211321

13221322
![](images/MCI-error-agg.png)
13231323

1324+
Aggregate error register assignments are documented in the register specification: **TODO:** Add a link to rdl -> html file
1325+
1326+
Regions of 6 bits in the aggregate error registers are reserved for each component.
1327+
MCU and Caliptra errors are connected to appropriate severity levels.
1328+
Lifecycle controller, fuse controller and I3C are connected to both severities.
1329+
Masks are used to set the severity of each error for these components. These can be configured by integrators, ROM, or runtime firmware.
1330+
1331+
| **Error Register Bits** | **Component** | **Default Error Severity** | **Description** |
1332+
| :--------- | :--------- | :--------- |:--------- |
1333+
| Aggregate error[5:0] | Caliptra core | Both | [Caliptra errors](https://github.com/chipsalliance/Caliptra/blob/main/doc/Caliptra.md#error-reporting-and-handling) |
1334+
| Aggregate error[11:6] | MCU | Both | DCCM double bit ECC error is fatal <br> DCCM single bit ECC error is non-fatal |
1335+
| Aggregate error[17:12] | Life cycle controller | Fatal | [LCC alerts](https://opentitan.org/book/hw/ip/lc_ctrl/doc/interfaces.html#security-alerts) |
1336+
| Aggregate error[23:18] | OTP Fuse controller | Fatal | [FC alerts](https://opentitan.org/book/hw/top_earlgrey/ip_autogen/otp_ctrl/doc/interfaces.html#security-alerts) |
1337+
| Aggregate error[29:24] | I3C | Non-Fatal | Peripheral reset and escalated reset pins from I3C <br> **TODO:** Add a link to I3C doc |
1338+
| Aggregate error[31:30] | Spare bits | None | Spare bits for integrator use |
1339+
13241340
MCI also generates error signals for its own internal blocks, specifically for MCU SRAM & mailboxes double bit ECC and WDT.
13251341

13261342
![](images/MCI-internal-error.png)

0 commit comments

Comments
 (0)