diff options
| author | Will Deacon <will@kernel.org> | 2025-09-24 18:33:25 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2025-09-24 18:33:25 +0300 |
| commit | 5647d32f514ecac98760d60a77c1fcfbc5fb2ed0 (patch) | |
| tree | 60c73adb533163c976fa7e547449abaf2b6c615c /arch/arm64/include | |
| parent | 57f13e3d91208900c59fbb4d4314a0281762cfb6 (diff) | |
| parent | d02c2e45b1e7767b177f6854026e4ad0d70b4a4d (diff) | |
| download | linux-5647d32f514ecac98760d60a77c1fcfbc5fb2ed0.tar.xz | |
Merge branch 'for-next/cca' into for-next/core
* for-next/cca:
arm64: acpi: Enable ACPI CCEL support
arm64: Enable EFI secret area Securityfs support
arm64: realm: ioremap: Allow mapping memory as encrypted
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/io.h | 6 | ||||
| -rw-r--r-- | arch/arm64/include/asm/rsi.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 9b96840fb979..83e03abbb2ca 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -274,6 +274,10 @@ int arm64_ioremap_prot_hook_register(const ioremap_prot_hook_t hook); #define ioremap_np(addr, size) \ ioremap_prot((addr), (size), __pgprot(PROT_DEVICE_nGnRnE)) + +#define ioremap_encrypted(addr, size) \ + ioremap_prot((addr), (size), PAGE_KERNEL) + /* * io{read,write}{16,32,64}be() macros */ @@ -311,7 +315,7 @@ extern bool arch_memremap_can_ram_remap(resource_size_t offset, size_t size, static inline bool arm64_is_protected_mmio(phys_addr_t phys_addr, size_t size) { if (unlikely(is_realm_world())) - return __arm64_is_protected_mmio(phys_addr, size); + return arm64_rsi_is_protected(phys_addr, size); return false; } diff --git a/arch/arm64/include/asm/rsi.h b/arch/arm64/include/asm/rsi.h index b42aeac05340..88b50d660e85 100644 --- a/arch/arm64/include/asm/rsi.h +++ b/arch/arm64/include/asm/rsi.h @@ -16,7 +16,7 @@ DECLARE_STATIC_KEY_FALSE(rsi_present); void __init arm64_rsi_init(void); -bool __arm64_is_protected_mmio(phys_addr_t base, size_t size); +bool arm64_rsi_is_protected(phys_addr_t base, size_t size); static inline bool is_realm_world(void) { |