shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: arm64: Register earlycon fixmap with the MMIO guard"

Browse Source 
Reason for revert:
MMIO guard is initialised too late for earlycon, so the fixup is
a waste of time.

Signed-off-by: Keir Fraser <keirf@google.com>
Bug: 259645922
Change-Id: Iace214f7140baf073cfa5cef1ee65fca9e4a76d0
This commit is contained in:
Keir Fraser
2023-01-25 11:35:25 +00:00
parent f71661a707
commit 63a0caecc9
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/mm/ioremap.c
View File

@@ -70,17 +70,6 @@ static int __init ioremap_guard_setup(char *str)
}
early_param("ioremap_guard", ioremap_guard_setup);
static void fixup_fixmap(void)
{
pte_t *ptep = __get_fixmap_pte(FIX_EARLYCON_MEM_BASE);
if (!ptep)
return;
ioremap_phys_range_hook(__pte_to_phys(*ptep), PAGE_SIZE,
__pgprot(pte_val(*ptep) & PTE_ATTRINDX_MASK));
}
void kvm_init_ioremap_services(void)
{
struct arm_smccc_res res;
@@ -111,7 +100,6 @@ void kvm_init_ioremap_services(void)
if (res.a0 == SMCCC_RET_SUCCESS) {
guard_granule = granule;
static_branch_enable(&ioremap_guard_key);
fixup_fixmap();
pr_info("Using KVM MMIO guard for ioremap\n");
} else {
pr_warn("KVM MMIO guard registration failed (%ld)\n", res.a0);