Skip to content

Commit

Permalink
Zeta: Update Generic Timer & GICR/D definitions for vNext
Browse files Browse the repository at this point in the history
  • Loading branch information
@gus33000
gus33000 committed May 21, 2023
1 parent c3b22a8 commit f92db8a
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 41 deletions.
Binary file modified 8350/builtin/APIC.UniCore.aml
View file
Binary file not shown.
Binary file modified 8350/builtin/APIC.aml
View file
Binary file not shown.
Binary file modified 8350/builtin/GTDT.aml
View file
Binary file not shown.
36 changes: 21 additions & 15 deletions 8350/src/APIC.UniCore.dsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)]
[004h 0004 4] Table Length : 000002D9
[004h 0004 4] Table Length : 000002E9
[008h 0008 1] Revision : 05
[009h 0009 1] Checksum : 00
[00Ah 0010 6] Oem ID : "QCOM "
Expand Down Expand Up @@ -28,7 +28,7 @@
[054h 0084 8] Virtual GIC Base Address : 0000000000000000
[05Ch 0092 8] Hypervisor GIC Base Address : 0000000000000000
[064h 0100 4] Virtual GIC Interrupt : 00000019
[068h 0104 8] Redistributor Base Address : 0000000017A80000
[068h 0104 8] Redistributor Base Address : 0000000000000000
[070h 0112 8] ARM MPIDR : 0000000000000000
[078h 0120 1] Efficiency Class : 00
[079h 0121 1] Reserved : 00
Expand All @@ -50,7 +50,7 @@
[0A4h 0164 8] Virtual GIC Base Address : 0000000000000000
[0ACh 0172 8] Hypervisor GIC Base Address : 0000000000000000
[0B4h 0180 4] Virtual GIC Interrupt : 00000019
[0B8h 0184 8] Redistributor Base Address : 0000000017AC0000
[0B8h 0184 8] Redistributor Base Address : 0000000000000000
[0C0h 0192 8] ARM MPIDR : 0000000000000100
[0C8h 0200 1] Efficiency Class : 00
[0C9h 0201 1] Reserved : 00
Expand All @@ -72,7 +72,7 @@
[0F4h 0244 8] Virtual GIC Base Address : 0000000000000000
[0FCh 0252 8] Hypervisor GIC Base Address : 0000000000000000
[104h 0260 4] Virtual GIC Interrupt : 00000019
[108h 0264 8] Redistributor Base Address : 0000000017B00000
[108h 0264 8] Redistributor Base Address : 0000000000000000
[110h 0272 8] ARM MPIDR : 0000000000000200
[118h 0280 1] Efficiency Class : 00
[119h 0281 1] Reserved : 00
Expand All @@ -94,7 +94,7 @@
[144h 0324 8] Virtual GIC Base Address : 0000000000000000
[14Ch 0332 8] Hypervisor GIC Base Address : 0000000000000000
[154h 0340 4] Virtual GIC Interrupt : 00000019
[158h 0344 8] Redistributor Base Address : 0000000017B40000
[158h 0344 8] Redistributor Base Address : 0000000000000000
[160h 0352 8] ARM MPIDR : 0000000000000300
[168h 0360 1] Efficiency Class : 00
[169h 0361 1] Reserved : 00
Expand All @@ -116,7 +116,7 @@
[194h 0404 8] Virtual GIC Base Address : 0000000000000000
[19Ch 0412 8] Hypervisor GIC Base Address : 0000000000000000
[1A4h 0420 4] Virtual GIC Interrupt : 00000019
[1A8h 0424 8] Redistributor Base Address : 0000000017B80000
[1A8h 0424 8] Redistributor Base Address : 0000000000000000
[1B0h 0432 8] ARM MPIDR : 0000000000000400
[1B8h 0440 1] Efficiency Class : 01
[1B9h 0441 1] Reserved : 00
Expand All @@ -138,7 +138,7 @@
[1E4h 0484 8] Virtual GIC Base Address : 0000000000000000
[1ECh 0492 8] Hypervisor GIC Base Address : 0000000000000000
[1F4h 0500 4] Virtual GIC Interrupt : 00000019
[1F8h 0504 8] Redistributor Base Address : 0000000017BC0000
[1F8h 0504 8] Redistributor Base Address : 0000000000000000
[200h 0512 8] ARM MPIDR : 0000000000000500
[208h 0520 1] Efficiency Class : 01
[209h 0521 1] Reserved : 00
Expand All @@ -160,7 +160,7 @@
[234h 0564 8] Virtual GIC Base Address : 0000000000000000
[23Ch 0572 8] Hypervisor GIC Base Address : 0000000000000000
[244h 0580 4] Virtual GIC Interrupt : 00000019
[248h 0584 8] Redistributor Base Address : 0000000017D00000
[248h 0584 8] Redistributor Base Address : 0000000000000000
[250h 0592 8] ARM MPIDR : 0000000000000600
[258h 0600 1] Efficiency Class : 01
[259h 0601 1] Reserved : 00
Expand All @@ -182,9 +182,9 @@
[284h 0644 8] Virtual GIC Base Address : 0000000000000000
[28Ch 0652 8] Hypervisor GIC Base Address : 0000000000000000
[294h 0660 4] Virtual GIC Interrupt : 00000019
[298h 0664 8] Redistributor Base Address : 0000000017D40000
[298h 0664 8] Redistributor Base Address : 0000000000000000
[2A0h 0672 8] ARM MPIDR : 0000000000000700
[2A8h 0680 1] Efficiency Class : 01
[2A8h 0680 1] Efficiency Class : 02
[2A9h 0681 1] Reserved : 00
[2AAh 0682 2] SPE Overflow Interrupt : 0000

Expand All @@ -197,9 +197,15 @@
[2C0h 0704 1] Version : 03
[2C1h 0705 3] Reserved : 000000

[2C5h 0709 1] Subtable Type : 0F [Generic Interrupt Translator]
[2C6h 0710 1] Length : 14
[2C5h 0709 1] Subtable Type : 0E [Generic Interrupt Redistributor]
[2C6h 0710 1] Length : 10
[2C7h 0711 2] Reserved : 0000
[2C9h 0713 4] Translation ID : 00000000
[2CDh 0717 8] Base Address : 0000000017A40000
[2D5h 0725 4] Reserved : 00000000
[2C9h 0713 8] Base Address : 0000000017A60000
[2D1h 0721 4] Length : 00100000

[2D5h 0725 1] Subtable Type : 0F [Generic Interrupt Translator]
[2D6h 0726 1] Length : 14
[2D7h 0727 2] Reserved : 0000
[2D9h 0729 4] Translation ID : 00000000
[2DDh 0733 8] Base Address : 0000000017A40000
[2E5h 0741 4] Reserved : 00000000
36 changes: 21 additions & 15 deletions 8350/src/APIC.dsl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[000h 0000 4] Signature : "APIC" [Multiple APIC Description Table (MADT)]
[004h 0004 4] Table Length : 000002D9
[004h 0004 4] Table Length : 000002E9
[008h 0008 1] Revision : 05
[009h 0009 1] Checksum : 00
[00Ah 0010 6] Oem ID : "QCOM "
Expand Down Expand Up @@ -28,7 +28,7 @@
[054h 0084 8] Virtual GIC Base Address : 0000000000000000
[05Ch 0092 8] Hypervisor GIC Base Address : 0000000000000000
[064h 0100 4] Virtual GIC Interrupt : 00000019
[068h 0104 8] Redistributor Base Address : 0000000017A80000
[068h 0104 8] Redistributor Base Address : 0000000000000000
[070h 0112 8] ARM MPIDR : 0000000000000000
[078h 0120 1] Efficiency Class : 00
[079h 0121 1] Reserved : 00
Expand All @@ -50,7 +50,7 @@
[0A4h 0164 8] Virtual GIC Base Address : 0000000000000000
[0ACh 0172 8] Hypervisor GIC Base Address : 0000000000000000
[0B4h 0180 4] Virtual GIC Interrupt : 00000019
[0B8h 0184 8] Redistributor Base Address : 0000000017AC0000
[0B8h 0184 8] Redistributor Base Address : 0000000000000000
[0C0h 0192 8] ARM MPIDR : 0000000000000100
[0C8h 0200 1] Efficiency Class : 00
[0C9h 0201 1] Reserved : 00
Expand All @@ -72,7 +72,7 @@
[0F4h 0244 8] Virtual GIC Base Address : 0000000000000000
[0FCh 0252 8] Hypervisor GIC Base Address : 0000000000000000
[104h 0260 4] Virtual GIC Interrupt : 00000019
[108h 0264 8] Redistributor Base Address : 0000000017B00000
[108h 0264 8] Redistributor Base Address : 0000000000000000
[110h 0272 8] ARM MPIDR : 0000000000000200
[118h 0280 1] Efficiency Class : 00
[119h 0281 1] Reserved : 00
Expand All @@ -94,7 +94,7 @@
[144h 0324 8] Virtual GIC Base Address : 0000000000000000
[14Ch 0332 8] Hypervisor GIC Base Address : 0000000000000000
[154h 0340 4] Virtual GIC Interrupt : 00000019
[158h 0344 8] Redistributor Base Address : 0000000017B40000
[158h 0344 8] Redistributor Base Address : 0000000000000000
[160h 0352 8] ARM MPIDR : 0000000000000300
[168h 0360 1] Efficiency Class : 00
[169h 0361 1] Reserved : 00
Expand All @@ -116,7 +116,7 @@
[194h 0404 8] Virtual GIC Base Address : 0000000000000000
[19Ch 0412 8] Hypervisor GIC Base Address : 0000000000000000
[1A4h 0420 4] Virtual GIC Interrupt : 00000019
[1A8h 0424 8] Redistributor Base Address : 0000000017B80000
[1A8h 0424 8] Redistributor Base Address : 0000000000000000
[1B0h 0432 8] ARM MPIDR : 0000000000000400
[1B8h 0440 1] Efficiency Class : 01
[1B9h 0441 1] Reserved : 00
Expand All @@ -138,7 +138,7 @@
[1E4h 0484 8] Virtual GIC Base Address : 0000000000000000
[1ECh 0492 8] Hypervisor GIC Base Address : 0000000000000000
[1F4h 0500 4] Virtual GIC Interrupt : 00000019
[1F8h 0504 8] Redistributor Base Address : 0000000017BC0000
[1F8h 0504 8] Redistributor Base Address : 0000000000000000
[200h 0512 8] ARM MPIDR : 0000000000000500
[208h 0520 1] Efficiency Class : 01
[209h 0521 1] Reserved : 00
Expand All @@ -160,7 +160,7 @@
[234h 0564 8] Virtual GIC Base Address : 0000000000000000
[23Ch 0572 8] Hypervisor GIC Base Address : 0000000000000000
[244h 0580 4] Virtual GIC Interrupt : 00000019
[248h 0584 8] Redistributor Base Address : 0000000017D00000
[248h 0584 8] Redistributor Base Address : 0000000000000000
[250h 0592 8] ARM MPIDR : 0000000000000600
[258h 0600 1] Efficiency Class : 01
[259h 0601 1] Reserved : 00
Expand All @@ -182,9 +182,9 @@
[284h 0644 8] Virtual GIC Base Address : 0000000000000000
[28Ch 0652 8] Hypervisor GIC Base Address : 0000000000000000
[294h 0660 4] Virtual GIC Interrupt : 00000019
[298h 0664 8] Redistributor Base Address : 0000000017D40000
[298h 0664 8] Redistributor Base Address : 0000000000000000
[2A0h 0672 8] ARM MPIDR : 0000000000000700
[2A8h 0680 1] Efficiency Class : 01
[2A8h 0680 1] Efficiency Class : 02
[2A9h 0681 1] Reserved : 00
[2AAh 0682 2] SPE Overflow Interrupt : 0000

Expand All @@ -197,9 +197,15 @@
[2C0h 0704 1] Version : 03
[2C1h 0705 3] Reserved : 000000

[2C5h 0709 1] Subtable Type : 0F [Generic Interrupt Translator]
[2C6h 0710 1] Length : 14
[2C5h 0709 1] Subtable Type : 0E [Generic Interrupt Redistributor]
[2C6h 0710 1] Length : 10
[2C7h 0711 2] Reserved : 0000
[2C9h 0713 4] Translation ID : 00000000
[2CDh 0717 8] Base Address : 0000000017A40000
[2D5h 0725 4] Reserved : 00000000
[2C9h 0713 8] Base Address : 0000000017A60000
[2D1h 0721 4] Length : 00100000

[2D5h 0725 1] Subtable Type : 0F [Generic Interrupt Translator]
[2D6h 0726 1] Length : 14
[2D7h 0727 2] Reserved : 0000
[2D9h 0729 4] Translation ID : 00000000
[2DDh 0733 8] Base Address : 0000000017A40000
[2E5h 0741 4] Reserved : 00000000
42 changes: 31 additions & 11 deletions 8350/src/GTDT.dsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,52 @@
[02Ch 0044 4] Reserved : 00000000

[030h 0048 4] Secure EL1 Interrupt : 0000001D
[034h 0052 4] EL1 Flags (decoded below) : 00000004
[034h 0052 4] EL1 Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
Always On : 1
Always On : 0

[038h 0056 4] Non-Secure EL1 Interrupt : 0000001E
[03Ch 0060 4] NEL1 Flags (decoded below) : 00000004
[03Ch 0060 4] NEL1 Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
Always On : 1
Always On : 0

[040h 0064 4] Virtual Timer Interrupt : 0000001B
[044h 0068 4] VT Flags (decoded below) : 00000004
[044h 0068 4] VT Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
Always On : 1
Always On : 0

[048h 0072 4] Non-Secure EL2 Interrupt : 0000001A
[04Ch 0076 4] NEL2 Flags (decoded below) : 00000004
[04Ch 0076 4] NEL2 Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
Always On : 1
Always On : 0
[050h 0080 8] Counter Read Block Address : FFFFFFFFFFFFFFFF

[058h 0088 4] Platform Timer Count : 00000000
[05Ch 0092 4] Platform Timer Offset : 00000000
[058h 0088 4] Platform Timer Count : 00000001
[05Ch 0092 4] Platform Timer Offset : 00000060

[060h 0096 1] Subtable Type : 00 [Generic Timer Block]
[061h 0097 2] Length : 0000
[061h 0097 2] Length : 003C
[063h 0099 1] Reserved : 00
[064h 0100 8] Block Address : 0000000017C20000
[06Ch 0108 4] Timer Count : 00000001
[070h 0112 4] Timer Offset : 00000014

[074h 0116 1] Frame Number : 00
[075h 0117 3] Reserved : 000000
[078h 0120 8] Base Address : 0000000017C21000
[080h 0128 8] EL0 Base Address : 0000000017C22000
[088h 0136 4] Timer Interrupt : 00000028
[08Ch 0140 4] Timer Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
[090h 0144 4] Virtual Timer Interrupt : 00000026
[094h 0148 4] Virtual Timer Flags (decoded below) : 00000000
Trigger Mode : 0
Polarity : 0
[098h 0152 4] Common Flags (decoded below) : 00000002
Secure : 0
Always On : 1

0 comments on commit f92db8a

Please sign in to comment.