Skip to content

Commit

Permalink
Merge branch 'main' into aes-spec
Browse files Browse the repository at this point in the history
  • Loading branch information
@calebofearth
calebofearth authored Mar 7, 2025
2 parents 4fff33c + 90f6f79 commit 6b8f30a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflow_metadata/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pr\_\* objects are used to validate a Pull Request run. This is in support of an
The Pull Request run ignores updates to documentation files. That is, commits containing only the following files are not required to pass the timestamp/hash check.

* Markdown (.md)
* Images (.png)
* Images (.png, .jpg)
* Github Workflows (.github/workflows/**)
* Spreadsheets (.xlsx, .xls)

14 changes: 11 additions & 3 deletions .github/workflows/pre-run-check.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ jobs:
# File type exclusions:
# - *.md
# - *.png
# - *.jpg
# - *.xlsx/*.xls
# - any files inside
# - .git
# - .github/workflows
Expand Down Expand Up @@ -142,8 +144,9 @@ jobs:
# Find the last commit that modified any design file (not documentation)
# Start the search with the second parent of the PR merge commit
# in order to only traverse the feature branch commits
# Use an explicit list of files instead of an exclusion list
last_commit=$(git rev-parse HEAD^2)
until git diff --name-only "${last_commit}^..${last_commit}" | grep -v '\.md\|\.png\|.github\/workflows\|\.xls\|\.xlsx' > /dev/null; do
until git diff --name-only "${last_commit}^..${last_commit}" | grep -v '.github/workflows' | grep -e '\.sv\|\.svh\|\.rdl\|\.json\|\.v\|\.vh\|\.rsp\|\.s\|\.c\|\.cpp\|\.h\|\.hex\|\.ld\|\.gdb\|\.yml\|\.sh\|\.py\|pr_timestamp' > /dev/null; do
last_commit="$(git rev-parse ${last_commit}^)"
done
echo "Latest non-doc hash is ${last_commit}"
Expand Down Expand Up @@ -294,8 +297,13 @@ jobs:
echo "target ref for [origin/${TARGET_BR}] is $(git log -n1 --pretty=tformat:'%H' origin/${TARGET_BR} 2> /dev/null)"
echo "source ref for [${SOURCE_REMOTE}/${SOURCE_BR}] is $(git log -n1 --pretty=tformat:'%H' ${SOURCE_REMOTE}/${SOURCE_BR} 2> /dev/null)"
mods=$(git diff --name-only $(git log -n1 --pretty=tformat:'%H' "origin/${TARGET_BR}")...$(git log -n1 --pretty=tformat:'%H' "${SOURCE_REMOTE}/${SOURCE_BR}"))
if [[ $(IFS='\n' grep -c -v '\.md\|\.png\|\.xlsx\|\.xls' <<< "$mods") -gt 0 ]]; then
echo "Found modified source files in ${SOURCE_BR}"
excludes='.github/workflows/pre-run-check.yml\|.github/workflows/doc-gen.yml\|.github/workflows/pull_request.yml'
extensions='\.sv\|\.svh\|\.rdl\|\.json\|\.v\|\.vh\|\.rsp\|\.s\|\.c\|\.cpp\|\.h\|\.hex\|\.ld\|\.gdb\|\.yml\|\.sh\|\.py\|pr_timestamp'
mod_count=$(IFS='\n' grep -v "${excludes}" <<< "${mods}" | grep -c "${extensions}" | true)
if [[ ${mod_count} -gt 0 ]]; then
echo "Found ${mod_count} modified source files in ${SOURCE_BR}"
echo " ============== modified files ============="
IFS='\n' grep -v "${excludes}" <<< "$mods" | grep "${extensions}"
echo "src_mods=true" >> "${GITHUB_OUTPUT}"
else
echo "Only modified files in ${SOURCE_BR} are for documentation"
Expand Down
22 changes: 12 additions & 10 deletions docs/CaliptraHardwareSpecification.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ The RISC-V core is highly configurable and has the following settings.
| Parameter | Configuration |
| :---------------------- | :------------ |
| Interface | AHB-Lite |
| DCCM | 128 KiB |
| ICCM | 128 KiB |
| DCCM | 256 KiB |
| ICCM | 256 KiB |
| I-Cache | Disabled |
| Reset Vector | 0x00000000 |
| Fast Interrupt Redirect | Enabled |
Expand All @@ -88,12 +88,12 @@ The 32-bit address region is subdivided into 16 fixed-sized, contiguous 256 MB r

| Subsystem | Address size | Start address | End address |
| :------------------ | :----------- | :------------ | :---------- |
| ROM | 48 KiB | 0x0000_0000 | 0x0000_BFFF |
| ROM | 96 KiB | 0x0000_0000 | 0x0000_BFFF |
| Cryptographic | 512 KiB | 0x1000_0000 | 0x1007_FFFF |
| Peripherals | 32 KiB | 0x2000_0000 | 0x2000_7FFF |
| SoC IFC | 256 KiB | 0x3000_0000 | 0x3003_FFFF |
| RISC-V Core ICCM | 128 KiB | 0x4000_0000 | 0x4001_FFFF |
| RISC-V Core DCCM | 128 KiB | 0x5000_0000 | 0x5001_FFFF |
| SoC IFC | 512 KiB | 0x3000_0000 | 0x3007_FFFF |
| RISC-V Core ICCM | 256 KiB | 0x4000_0000 | 0x4003_FFFF |
| RISC-V Core DCCM | 256 KiB | 0x5000_0000 | 0x5003_FFFF |
| RISC-V MM CSR (PIC) | 256 MiB | 0x6000_0000 | 0x6FFF_FFFF |

#### Cryptographic subsystem
Expand Down Expand Up @@ -128,18 +128,20 @@ The following table shows the memory map address ranges for each of the IP block

| IP/Peripheral | Target \# | Address size | Start address | End address |
| :------------------------- | :-------- | :----------- | :------------ | :---------- |
| Mailbox SRAM Direct Access | 7 | 128 KiB | 0x3000_0000 | 0x3001_FFFF |
| Mailbox CSR | 7 | 4 KiB | 0x3002_0000 | 0x3002_0FFF |
| Mailbox | 7 | 64 KiB | 0x3003_0000 | 0x3003_FFFF |
| SHA512 Accelerator | 7 | 4 KiB | 0x3002_1000 | 0x3002_1FFF |
| AXI DMA | 7 | 4 KiB | 0x3002_2000 | 0x3002_2FFF |
| SOC IFC CSR | 7 | 64 KiB | 0x3003_0000 | 0x3003_FFFF |
| Mailbox SRAM Direct Access | 7 | 256 KiB | 0x3004_0000 | 0x3007_FFFF |

#### RISC-V core local memory blocks

The following table shows the memory map address ranges for each of the local memory blocks that interface with RISC-V core.

| IP/Peripheral | Target \# | Address size | Start address | End address |
| :-------------- | :-------- | :----------- | :------------ | :---------- |
| ICCM0 (via DMA) | 9 | 128 KiB | 0x4000_0000 | 0x4001_FFFF |
| DCCM | 8 | 128 KiB | 0x5000_0000 | 0x5001_FFFF |
| ICCM0 (via DMA) | 9 | 256 KiB | 0x4000_0000 | 0x4003_FFFF |
| DCCM | 8 | 256 KiB | 0x5000_0000 | 0x5003_FFFF |

### Interrupts

Expand Down

0 comments on commit 6b8f30a

Please sign in to comment.