Skip to content

Morello copy_page cherry-pick #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heshamelmatary wants to merge 2 commits into
base: codasip-cheri-riscv-7.0
Choose a base branch
from
Open

Morello copy_page cherry-pick #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4818c4f
arm64: morello: Preserve capabilities in copy_page()
kevin-brodsky-arm Jul 10, 2020
7b7ba7f
arm64: morello: Remove late runtime detection
kevin-brodsky-arm Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions arch/arm64/lib/copy_page.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ alternative_else_nop_endif
ret
.Lno_mops:
#endif

#ifdef CONFIG_ARM64_MORELLO
ldp c2, c3, [x1]
ldp c4, c5, [x1, #32]
ldp c6, c7, [x1, #64]
ldp c8, c9, [x1, #96]
#else
ldp x2, x3, [x1]
ldp x4, x5, [x1, #16]
ldp x6, x7, [x1, #32]
Expand All @@ -39,12 +46,23 @@ alternative_else_nop_endif
ldp x12, x13, [x1, #80]
ldp x14, x15, [x1, #96]
ldp x16, x17, [x1, #112]
#endif

add x0, x0, #256
add x1, x1, #128
1:
tst x0, #(PAGE_SIZE - 1)

#ifdef CONFIG_ARM64_MORELLO
stp c2, c3, [x0, #-256]
ldp c2, c3, [x1]
stp c4, c5, [x0, #32 - 256]
ldp c4, c5, [x1, #32]
stp c6, c7, [x0, #64 - 256]
ldp c6, c7, [x1, #64]
stp c8, c9, [x0, #96 - 256]
ldp c8, c9, [x1, #96]
#else
stnp x2, x3, [x0, #-256]
ldp x2, x3, [x1]
stnp x4, x5, [x0, #16 - 256]
Expand All @@ -61,12 +79,19 @@ alternative_else_nop_endif
ldp x14, x15, [x1, #96]
stnp x16, x17, [x0, #112 - 256]
ldp x16, x17, [x1, #112]
#endif

add x0, x0, #128
add x1, x1, #128

b.ne 1b

#ifdef CONFIG_ARM64_MORELLO
stp c2, c3, [x0, #-256]
stp c4, c5, [x0, #32 - 256]
stp c6, c7, [x0, #64 - 256]
stp c8, c9, [x0, #96 - 256]
#else
stnp x2, x3, [x0, #-256]
stnp x4, x5, [x0, #16 - 256]
stnp x6, x7, [x0, #32 - 256]
Expand All @@ -75,6 +100,7 @@ alternative_else_nop_endif
stnp x12, x13, [x0, #80 - 256]
stnp x14, x15, [x0, #96 - 256]
stnp x16, x17, [x0, #112 - 256]
#endif

ret
SYM_FUNC_END(__pi_copy_page)
Expand Down
Loading