Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
9a93d8cc
Unverified
Commit
9a93d8cc
authored
6 years ago
by
Dimitris Papastamos
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1460 from robertovargas-arm/clang
Make TF compatible with Clang assembler and linker
parents
89a79342
4a98f0ef
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
28
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
lib/cpus/aarch64/cortex_a76.S
+16
-16
lib/cpus/aarch64/cortex_a76.S
lib/cpus/aarch64/denver.S
+16
-16
lib/cpus/aarch64/denver.S
lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S
+32
-32
lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S
lib/cpus/aarch64/wa_cve_2017_5715_mmu.S
+16
-16
lib/cpus/aarch64/wa_cve_2017_5715_mmu.S
plat/mediatek/mt6795/bl31.ld.S
+2
-2
plat/mediatek/mt6795/bl31.ld.S
plat/rockchip/common/pmusram/pmu_sram_cpus_on.S
+0
-1
plat/rockchip/common/pmusram/pmu_sram_cpus_on.S
plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S
+0
-1
plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S
services/std_svc/spm/aarch64/spm_shim_exceptions.S
+16
-16
services/std_svc/spm/aarch64/spm_shim_exceptions.S
with
98 additions
and
100 deletions
+98
-100
lib/cpus/aarch64/cortex_a76.S
View file @
9a93d8cc
...
...
@@ -107,19 +107,19 @@ vector_base cortex_a76_wa_cve_2018_3639_a76_vbar
*/
vector_entry
cortex_a76_sync_exception_sp_el0
b
sync_exception_sp_el0
check
_vector_
size
cortex_a76_sync_exception_sp_el0
end
_vector_
entry
cortex_a76_sync_exception_sp_el0
vector_entry
cortex_a76_irq_sp_el0
b
irq_sp_el0
check
_vector_
size
cortex_a76_irq_sp_el0
end
_vector_
entry
cortex_a76_irq_sp_el0
vector_entry
cortex_a76_fiq_sp_el0
b
fiq_sp_el0
check
_vector_
size
cortex_a76_fiq_sp_el0
end
_vector_
entry
cortex_a76_fiq_sp_el0
vector_entry
cortex_a76_serror_sp_el0
b
serror_sp_el0
check
_vector_
size
cortex_a76_serror_sp_el0
end
_vector_
entry
cortex_a76_serror_sp_el0
/
*
---------------------------------------------------------------------
*
Current
EL
with
SP_ELx
:
0x200
-
0x400
...
...
@@ -127,19 +127,19 @@ vector_entry cortex_a76_serror_sp_el0
*/
vector_entry
cortex_a76_sync_exception_sp_elx
b
sync_exception_sp_elx
check
_vector_
size
cortex_a76_sync_exception_sp_elx
end
_vector_
entry
cortex_a76_sync_exception_sp_elx
vector_entry
cortex_a76_irq_sp_elx
b
irq_sp_elx
check
_vector_
size
cortex_a76_irq_sp_elx
end
_vector_
entry
cortex_a76_irq_sp_elx
vector_entry
cortex_a76_fiq_sp_elx
b
fiq_sp_elx
check
_vector_
size
cortex_a76_fiq_sp_elx
end
_vector_
entry
cortex_a76_fiq_sp_elx
vector_entry
cortex_a76_serror_sp_elx
b
serror_sp_elx
check
_vector_
size
cortex_a76_serror_sp_elx
end
_vector_
entry
cortex_a76_serror_sp_elx
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch64
:
0x400
-
0x600
...
...
@@ -148,22 +148,22 @@ vector_entry cortex_a76_serror_sp_elx
vector_entry
cortex_a76_sync_exception_aarch64
apply_cve_2018_3639_wa
_is_sync_exception
=
1
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
sync_exception_aarch64
check
_vector_
size
cortex_a76_sync_exception_aarch64
end
_vector_
entry
cortex_a76_sync_exception_aarch64
vector_entry
cortex_a76_irq_aarch64
apply_cve_2018_3639_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
irq_aarch64
check
_vector_
size
cortex_a76_irq_aarch64
end
_vector_
entry
cortex_a76_irq_aarch64
vector_entry
cortex_a76_fiq_aarch64
apply_cve_2018_3639_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
fiq_aarch64
check
_vector_
size
cortex_a76_fiq_aarch64
end
_vector_
entry
cortex_a76_fiq_aarch64
vector_entry
cortex_a76_serror_aarch64
apply_cve_2018_3639_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
serror_aarch64
check
_vector_
size
cortex_a76_serror_aarch64
end
_vector_
entry
cortex_a76_serror_aarch64
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch32
:
0x600
-
0x800
...
...
@@ -172,22 +172,22 @@ vector_entry cortex_a76_serror_aarch64
vector_entry
cortex_a76_sync_exception_aarch32
apply_cve_2018_3639_wa
_is_sync_exception
=
1
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
sync_exception_aarch32
check
_vector_
size
cortex_a76_sync_exception_aarch32
end
_vector_
entry
cortex_a76_sync_exception_aarch32
vector_entry
cortex_a76_irq_aarch32
apply_cve_2018_3639_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
irq_aarch32
check
_vector_
size
cortex_a76_irq_aarch32
end
_vector_
entry
cortex_a76_irq_aarch32
vector_entry
cortex_a76_fiq_aarch32
apply_cve_2018_3639_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
fiq_aarch32
check
_vector_
size
cortex_a76_fiq_aarch32
end
_vector_
entry
cortex_a76_fiq_aarch32
vector_entry
cortex_a76_serror_aarch32
apply_cve_2018_3639_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
serror_aarch32
check
_vector_
size
cortex_a76_serror_aarch32
end
_vector_
entry
cortex_a76_serror_aarch32
func
check_errata_cve_2018_3639
#if WORKAROUND_CVE_2018_3639
...
...
This diff is collapsed.
Click to expand it.
lib/cpus/aarch64/denver.S
View file @
9a93d8cc
...
...
@@ -55,19 +55,19 @@ vector_base workaround_bpflush_runtime_exceptions
*/
vector_entry
workaround_bpflush_sync_exception_sp_el0
b
sync_exception_sp_el0
check
_vector_
size
workaround_bpflush_sync_exception_sp_el0
end
_vector_
entry
workaround_bpflush_sync_exception_sp_el0
vector_entry
workaround_bpflush_irq_sp_el0
b
irq_sp_el0
check
_vector_
size
workaround_bpflush_irq_sp_el0
end
_vector_
entry
workaround_bpflush_irq_sp_el0
vector_entry
workaround_bpflush_fiq_sp_el0
b
fiq_sp_el0
check
_vector_
size
workaround_bpflush_fiq_sp_el0
end
_vector_
entry
workaround_bpflush_fiq_sp_el0
vector_entry
workaround_bpflush_serror_sp_el0
b
serror_sp_el0
check
_vector_
size
workaround_bpflush_serror_sp_el0
end
_vector_
entry
workaround_bpflush_serror_sp_el0
/
*
---------------------------------------------------------------------
*
Current
EL
with
SP_ELx
:
0x200
-
0x400
...
...
@@ -75,19 +75,19 @@ vector_entry workaround_bpflush_serror_sp_el0
*/
vector_entry
workaround_bpflush_sync_exception_sp_elx
b
sync_exception_sp_elx
check
_vector_
size
workaround_bpflush_sync_exception_sp_elx
end
_vector_
entry
workaround_bpflush_sync_exception_sp_elx
vector_entry
workaround_bpflush_irq_sp_elx
b
irq_sp_elx
check
_vector_
size
workaround_bpflush_irq_sp_elx
end
_vector_
entry
workaround_bpflush_irq_sp_elx
vector_entry
workaround_bpflush_fiq_sp_elx
b
fiq_sp_elx
check
_vector_
size
workaround_bpflush_fiq_sp_elx
end
_vector_
entry
workaround_bpflush_fiq_sp_elx
vector_entry
workaround_bpflush_serror_sp_elx
b
serror_sp_elx
check
_vector_
size
workaround_bpflush_serror_sp_elx
end
_vector_
entry
workaround_bpflush_serror_sp_elx
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch64
:
0x400
-
0x600
...
...
@@ -96,22 +96,22 @@ vector_entry workaround_bpflush_serror_sp_elx
vector_entry
workaround_bpflush_sync_exception_aarch64
apply_workaround
b
sync_exception_aarch64
check
_vector_
size
workaround_bpflush_sync_exception_aarch64
end
_vector_
entry
workaround_bpflush_sync_exception_aarch64
vector_entry
workaround_bpflush_irq_aarch64
apply_workaround
b
irq_aarch64
check
_vector_
size
workaround_bpflush_irq_aarch64
end
_vector_
entry
workaround_bpflush_irq_aarch64
vector_entry
workaround_bpflush_fiq_aarch64
apply_workaround
b
fiq_aarch64
check
_vector_
size
workaround_bpflush_fiq_aarch64
end
_vector_
entry
workaround_bpflush_fiq_aarch64
vector_entry
workaround_bpflush_serror_aarch64
apply_workaround
b
serror_aarch64
check
_vector_
size
workaround_bpflush_serror_aarch64
end
_vector_
entry
workaround_bpflush_serror_aarch64
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch32
:
0x600
-
0x800
...
...
@@ -120,22 +120,22 @@ vector_entry workaround_bpflush_serror_aarch64
vector_entry
workaround_bpflush_sync_exception_aarch32
apply_workaround
b
sync_exception_aarch32
check
_vector_
size
workaround_bpflush_sync_exception_aarch32
end
_vector_
entry
workaround_bpflush_sync_exception_aarch32
vector_entry
workaround_bpflush_irq_aarch32
apply_workaround
b
irq_aarch32
check
_vector_
size
workaround_bpflush_irq_aarch32
end
_vector_
entry
workaround_bpflush_irq_aarch32
vector_entry
workaround_bpflush_fiq_aarch32
apply_workaround
b
fiq_aarch32
check
_vector_
size
workaround_bpflush_fiq_aarch32
end
_vector_
entry
workaround_bpflush_fiq_aarch32
vector_entry
workaround_bpflush_serror_aarch32
apply_workaround
b
serror_aarch32
check
_vector_
size
workaround_bpflush_serror_aarch32
end
_vector_
entry
workaround_bpflush_serror_aarch32
.
global
denver_disable_dco
...
...
This diff is collapsed.
Click to expand it.
lib/cpus/aarch64/wa_cve_2017_5715_bpiall.S
View file @
9a93d8cc
...
...
@@ -114,19 +114,19 @@ aarch32_stub:
.
word
EMIT_BPIALL
.
word
EMIT_SMC
check
_vector_
size
bpiall_sync_exception_sp_el0
end
_vector_
entry
bpiall_sync_exception_sp_el0
vector_entry
bpiall_irq_sp_el0
b
irq_sp_el0
check
_vector_
size
bpiall_irq_sp_el0
end
_vector_
entry
bpiall_irq_sp_el0
vector_entry
bpiall_fiq_sp_el0
b
fiq_sp_el0
check
_vector_
size
bpiall_fiq_sp_el0
end
_vector_
entry
bpiall_fiq_sp_el0
vector_entry
bpiall_serror_sp_el0
b
serror_sp_el0
check
_vector_
size
bpiall_serror_sp_el0
end
_vector_
entry
bpiall_serror_sp_el0
/
*
---------------------------------------------------------------------
*
Current
EL
with
SP_ELx
:
0x200
-
0x400
...
...
@@ -134,19 +134,19 @@ vector_entry bpiall_serror_sp_el0
*/
vector_entry
bpiall_sync_exception_sp_elx
b
sync_exception_sp_elx
check
_vector_
size
bpiall_sync_exception_sp_elx
end
_vector_
entry
bpiall_sync_exception_sp_elx
vector_entry
bpiall_irq_sp_elx
b
irq_sp_elx
check
_vector_
size
bpiall_irq_sp_elx
end
_vector_
entry
bpiall_irq_sp_elx
vector_entry
bpiall_fiq_sp_elx
b
fiq_sp_elx
check
_vector_
size
bpiall_fiq_sp_elx
end
_vector_
entry
bpiall_fiq_sp_elx
vector_entry
bpiall_serror_sp_elx
b
serror_sp_elx
check
_vector_
size
bpiall_serror_sp_elx
end
_vector_
entry
bpiall_serror_sp_elx
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch64
:
0x400
-
0x600
...
...
@@ -154,19 +154,19 @@ vector_entry bpiall_serror_sp_elx
*/
vector_entry
bpiall_sync_exception_aarch64
apply_cve_2017_5715_wa
1
check
_vector_
size
bpiall_sync_exception_aarch64
end
_vector_
entry
bpiall_sync_exception_aarch64
vector_entry
bpiall_irq_aarch64
apply_cve_2017_5715_wa
2
check
_vector_
size
bpiall_irq_aarch64
end
_vector_
entry
bpiall_irq_aarch64
vector_entry
bpiall_fiq_aarch64
apply_cve_2017_5715_wa
4
check
_vector_
size
bpiall_fiq_aarch64
end
_vector_
entry
bpiall_fiq_aarch64
vector_entry
bpiall_serror_aarch64
apply_cve_2017_5715_wa
8
check
_vector_
size
bpiall_serror_aarch64
end
_vector_
entry
bpiall_serror_aarch64
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch32
:
0x600
-
0x800
...
...
@@ -174,19 +174,19 @@ vector_entry bpiall_serror_aarch64
*/
vector_entry
bpiall_sync_exception_aarch32
apply_cve_2017_5715_wa
1
check
_vector_
size
bpiall_sync_exception_aarch32
end
_vector_
entry
bpiall_sync_exception_aarch32
vector_entry
bpiall_irq_aarch32
apply_cve_2017_5715_wa
2
check
_vector_
size
bpiall_irq_aarch32
end
_vector_
entry
bpiall_irq_aarch32
vector_entry
bpiall_fiq_aarch32
apply_cve_2017_5715_wa
4
check
_vector_
size
bpiall_fiq_aarch32
end
_vector_
entry
bpiall_fiq_aarch32
vector_entry
bpiall_serror_aarch32
apply_cve_2017_5715_wa
8
check
_vector_
size
bpiall_serror_aarch32
end
_vector_
entry
bpiall_serror_aarch32
/
*
---------------------------------------------------------------------
*
This
vector
table
is
used
while
the
workaround
is
executing
.
It
...
...
@@ -203,19 +203,19 @@ vector_base wa_cve_2017_5715_bpiall_ret_vbar
*/
vector_entry
bpiall_ret_sync_exception_sp_el0
b
report_unhandled_exception
check
_vector_
size
bpiall_ret_sync_exception_sp_el0
end
_vector_
entry
bpiall_ret_sync_exception_sp_el0
vector_entry
bpiall_ret_irq_sp_el0
b
report_unhandled_interrupt
check
_vector_
size
bpiall_ret_irq_sp_el0
end
_vector_
entry
bpiall_ret_irq_sp_el0
vector_entry
bpiall_ret_fiq_sp_el0
b
report_unhandled_interrupt
check
_vector_
size
bpiall_ret_fiq_sp_el0
end
_vector_
entry
bpiall_ret_fiq_sp_el0
vector_entry
bpiall_ret_serror_sp_el0
b
report_unhandled_exception
check
_vector_
size
bpiall_ret_serror_sp_el0
end
_vector_
entry
bpiall_ret_serror_sp_el0
/
*
---------------------------------------------------------------------
*
Current
EL
with
SP_ELx
:
0x200
-
0x400
(
UNUSED
)
...
...
@@ -223,19 +223,19 @@ vector_entry bpiall_ret_serror_sp_el0
*/
vector_entry
bpiall_ret_sync_exception_sp_elx
b
report_unhandled_exception
check
_vector_
size
bpiall_ret_sync_exception_sp_elx
end
_vector_
entry
bpiall_ret_sync_exception_sp_elx
vector_entry
bpiall_ret_irq_sp_elx
b
report_unhandled_interrupt
check
_vector_
size
bpiall_ret_irq_sp_elx
end
_vector_
entry
bpiall_ret_irq_sp_elx
vector_entry
bpiall_ret_fiq_sp_elx
b
report_unhandled_interrupt
check
_vector_
size
bpiall_ret_fiq_sp_elx
end
_vector_
entry
bpiall_ret_fiq_sp_elx
vector_entry
bpiall_ret_serror_sp_elx
b
report_unhandled_exception
check
_vector_
size
bpiall_ret_serror_sp_elx
end
_vector_
entry
bpiall_ret_serror_sp_elx
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch64
:
0x400
-
0x600
(
UNUSED
)
...
...
@@ -243,19 +243,19 @@ vector_entry bpiall_ret_serror_sp_elx
*/
vector_entry
bpiall_ret_sync_exception_aarch64
b
report_unhandled_exception
check
_vector_
size
bpiall_ret_sync_exception_aarch64
end
_vector_
entry
bpiall_ret_sync_exception_aarch64
vector_entry
bpiall_ret_irq_aarch64
b
report_unhandled_interrupt
check
_vector_
size
bpiall_ret_irq_aarch64
end
_vector_
entry
bpiall_ret_irq_aarch64
vector_entry
bpiall_ret_fiq_aarch64
b
report_unhandled_interrupt
check
_vector_
size
bpiall_ret_fiq_aarch64
end
_vector_
entry
bpiall_ret_fiq_aarch64
vector_entry
bpiall_ret_serror_aarch64
b
report_unhandled_exception
check
_vector_
size
bpiall_ret_serror_aarch64
end
_vector_
entry
bpiall_ret_serror_aarch64
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch32
:
0x600
-
0x800
...
...
@@ -324,7 +324,7 @@ vector_entry bpiall_ret_sync_exception_aarch32
1
:
ldp
x2
,
x3
,
[
sp
,
#
CTX_GPREGS_OFFSET
+
CTX_GPREG_X2
]
b
sync_exception_aarch64
check
_vector_
size
bpiall_ret_sync_exception_aarch32
end
_vector_
entry
bpiall_ret_sync_exception_aarch32
vector_entry
bpiall_ret_irq_aarch32
b
report_unhandled_interrupt
...
...
@@ -346,12 +346,12 @@ bpiall_ret_fiq:
bpiall_ret_serror
:
ldp
x2
,
x3
,
[
sp
,
#
CTX_GPREGS_OFFSET
+
CTX_GPREG_X2
]
b
serror_aarch64
check
_vector_
size
bpiall_ret_irq_aarch32
end
_vector_
entry
bpiall_ret_irq_aarch32
vector_entry
bpiall_ret_fiq_aarch32
b
report_unhandled_interrupt
check
_vector_
size
bpiall_ret_fiq_aarch32
end
_vector_
entry
bpiall_ret_fiq_aarch32
vector_entry
bpiall_ret_serror_aarch32
b
report_unhandled_exception
check
_vector_
size
bpiall_ret_serror_aarch32
end
_vector_
entry
bpiall_ret_serror_aarch32
This diff is collapsed.
Click to expand it.
lib/cpus/aarch64/wa_cve_2017_5715_mmu.S
View file @
9a93d8cc
...
...
@@ -66,19 +66,19 @@ vector_base wa_cve_2017_5715_mmu_vbar
*/
vector_entry
mmu_sync_exception_sp_el0
b
sync_exception_sp_el0
check
_vector_
size
mmu_sync_exception_sp_el0
end
_vector_
entry
mmu_sync_exception_sp_el0
vector_entry
mmu_irq_sp_el0
b
irq_sp_el0
check
_vector_
size
mmu_irq_sp_el0
end
_vector_
entry
mmu_irq_sp_el0
vector_entry
mmu_fiq_sp_el0
b
fiq_sp_el0
check
_vector_
size
mmu_fiq_sp_el0
end
_vector_
entry
mmu_fiq_sp_el0
vector_entry
mmu_serror_sp_el0
b
serror_sp_el0
check
_vector_
size
mmu_serror_sp_el0
end
_vector_
entry
mmu_serror_sp_el0
/
*
---------------------------------------------------------------------
*
Current
EL
with
SP_ELx
:
0x200
-
0x400
...
...
@@ -86,19 +86,19 @@ vector_entry mmu_serror_sp_el0
*/
vector_entry
mmu_sync_exception_sp_elx
b
sync_exception_sp_elx
check
_vector_
size
mmu_sync_exception_sp_elx
end
_vector_
entry
mmu_sync_exception_sp_elx
vector_entry
mmu_irq_sp_elx
b
irq_sp_elx
check
_vector_
size
mmu_irq_sp_elx
end
_vector_
entry
mmu_irq_sp_elx
vector_entry
mmu_fiq_sp_elx
b
fiq_sp_elx
check
_vector_
size
mmu_fiq_sp_elx
end
_vector_
entry
mmu_fiq_sp_elx
vector_entry
mmu_serror_sp_elx
b
serror_sp_elx
check
_vector_
size
mmu_serror_sp_elx
end
_vector_
entry
mmu_serror_sp_elx
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch64
:
0x400
-
0x600
...
...
@@ -107,22 +107,22 @@ vector_entry mmu_serror_sp_elx
vector_entry
mmu_sync_exception_aarch64
apply_cve_2017_5715_wa
_is_sync_exception
=
1
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
sync_exception_aarch64
check
_vector_
size
mmu_sync_exception_aarch64
end
_vector_
entry
mmu_sync_exception_aarch64
vector_entry
mmu_irq_aarch64
apply_cve_2017_5715_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
irq_aarch64
check
_vector_
size
mmu_irq_aarch64
end
_vector_
entry
mmu_irq_aarch64
vector_entry
mmu_fiq_aarch64
apply_cve_2017_5715_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
fiq_aarch64
check
_vector_
size
mmu_fiq_aarch64
end
_vector_
entry
mmu_fiq_aarch64
vector_entry
mmu_serror_aarch64
apply_cve_2017_5715_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A64_SMC0
b
serror_aarch64
check
_vector_
size
mmu_serror_aarch64
end
_vector_
entry
mmu_serror_aarch64
/
*
---------------------------------------------------------------------
*
Lower
EL
using
AArch32
:
0x600
-
0x800
...
...
@@ -131,19 +131,19 @@ vector_entry mmu_serror_aarch64
vector_entry
mmu_sync_exception_aarch32
apply_cve_2017_5715_wa
_is_sync_exception
=
1
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
sync_exception_aarch32
check
_vector_
size
mmu_sync_exception_aarch32
end
_vector_
entry
mmu_sync_exception_aarch32
vector_entry
mmu_irq_aarch32
apply_cve_2017_5715_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
irq_aarch32
check
_vector_
size
mmu_irq_aarch32
end
_vector_
entry
mmu_irq_aarch32
vector_entry
mmu_fiq_aarch32
apply_cve_2017_5715_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
fiq_aarch32
check
_vector_
size
mmu_fiq_aarch32
end
_vector_
entry
mmu_fiq_aarch32
vector_entry
mmu_serror_aarch32
apply_cve_2017_5715_wa
_is_sync_exception
=
0
_esr_el3_val
=
ESR_EL3_A32_SMC0
b
serror_aarch32
check
_vector_
size
mmu_serror_aarch32
end
_vector_
entry
mmu_serror_aarch32
This diff is collapsed.
Click to expand it.
plat/mediatek/mt6795/bl31.ld.S
View file @
9a93d8cc
...
...
@@ -59,7 +59,7 @@ SECTIONS
*
executable
.
No
RW
data
from
the
next
section
must
creep
in
.
*
Ensure
the
rest
of
the
current
memory
page
is
unused
.
*/
.
=
NEXT
(
PAGE_SIZE
)
;
.
=
ALIGN
(
PAGE_SIZE
)
;
__RO_END__
=
.
;
}
>
RAM
...
...
@@ -161,7 +161,7 @@ SECTIONS
*
as
device
memory
.
No
other
unexpected
data
must
creep
in
.
*
Ensure
the
rest
of
the
current
memory
page
is
unused
.
*/
.
=
NEXT
(
PAGE_SIZE
)
;
.
=
ALIGN
(
PAGE_SIZE
)
;
__COHERENT_RAM_END__
=
.
;
}
>
RAM2
#endif
...
...
This diff is collapsed.
Click to expand it.
plat/rockchip/common/pmusram/pmu_sram_cpus_on.S
View file @
9a93d8cc
...
...
@@ -12,7 +12,6 @@
.
macro
pmusram_entry_func
_name
.
section
.
pmusram
.
entry
,
"ax"
.
type
\
_name
,
%
function
.
func
\
_name
.
cfi_startproc
\
_name
:
.
endm
...
...
This diff is collapsed.
Click to expand it.
plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S
View file @
9a93d8cc
...
...
@@ -15,7 +15,6 @@
.
cfi_sections
.
debug_frame
.
section
.
sram
.
text
,
"ax"
.
type
\
_name
,
%
function
.
func
\
_name
.
cfi_startproc
\
_name
:
.
endm
...
...
This diff is collapsed.
Click to expand it.
services/std_svc/spm/aarch64/spm_shim_exceptions.S
View file @
9a93d8cc
...
...
@@ -23,19 +23,19 @@ vector_base spm_shim_exceptions_ptr, .spm_shim_exceptions
*/
vector_entry
SynchronousExceptionSP0
,
.
spm_shim_exceptions
b
.
check
_vector_
size
SynchronousExceptionSP0
end
_vector_
entry
SynchronousExceptionSP0
vector_entry
IrqSP0
,
.
spm_shim_exceptions
b
.
check
_vector_
size
IrqSP0
end
_vector_
entry
IrqSP0
vector_entry
FiqSP0
,
.
spm_shim_exceptions
b
.
check
_vector_
size
FiqSP0
end
_vector_
entry
FiqSP0
vector_entry
SErrorSP0
,
.
spm_shim_exceptions
b
.
check
_vector_
size
SErrorSP0
end
_vector_
entry
SErrorSP0
/
*
-----------------------------------------------------
*
Current
EL
with
SPx
:
0x200
-
0x400
...
...
@@ -43,19 +43,19 @@ vector_entry SErrorSP0, .spm_shim_exceptions
*/
vector_entry
SynchronousExceptionSPx
,
.
spm_shim_exceptions
b
.
check
_vector_
size
SynchronousExceptionSPx
end
_vector_
entry
SynchronousExceptionSPx
vector_entry
IrqSPx
,
.
spm_shim_exceptions
b
.
check
_vector_
size
IrqSPx
end
_vector_
entry
IrqSPx
vector_entry
FiqSPx
,
.
spm_shim_exceptions
b
.
check
_vector_
size
FiqSPx
end
_vector_
entry
FiqSPx
vector_entry
SErrorSPx
,
.
spm_shim_exceptions
b
.
check
_vector_
size
SErrorSPx
end
_vector_
entry
SErrorSPx
/
*
-----------------------------------------------------
*
Lower
EL
using
AArch64
:
0x400
-
0x600
.
No
exceptions
...
...
@@ -93,19 +93,19 @@ do_smc:
handle_sys_trap
:
panic
:
b
panic
check
_vector_
size
SynchronousExceptionA64
end
_vector_
entry
SynchronousExceptionA64
vector_entry
IrqA64
,
.
spm_shim_exceptions
b
.
check
_vector_
size
IrqA64
end
_vector_
entry
IrqA64
vector_entry
FiqA64
,
.
spm_shim_exceptions
b
.
check
_vector_
size
FiqA64
end
_vector_
entry
FiqA64
vector_entry
SErrorA64
,
.
spm_shim_exceptions
b
.
check
_vector_
size
SErrorA64
end
_vector_
entry
SErrorA64
/
*
-----------------------------------------------------
*
Lower
EL
using
AArch32
:
0x600
-
0x800
...
...
@@ -113,16 +113,16 @@ vector_entry SErrorA64, .spm_shim_exceptions
*/
vector_entry
SynchronousExceptionA32
,
.
spm_shim_exceptions
b
.
check
_vector_
size
SynchronousExceptionA32
end
_vector_
entry
SynchronousExceptionA32
vector_entry
IrqA32
,
.
spm_shim_exceptions
b
.
check
_vector_
size
IrqA32
end
_vector_
entry
IrqA32
vector_entry
FiqA32
,
.
spm_shim_exceptions
b
.
check
_vector_
size
FiqA32
end
_vector_
entry
FiqA32
vector_entry
SErrorA32
,
.
spm_shim_exceptions
b
.
check
_vector_
size
SErrorA32
end
_vector_
entry
SErrorA32
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help