diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9d5569e3429c..bbc6f81236f2 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -28,7 +28,6 @@ config ARM64
 	select ARCH_HAS_KCOV
 	select ARCH_HAS_KEEPINITRD
 	select ARCH_HAS_MEMBARRIER_SYNC_CORE
-	select ARCH_HAS_MEM_ENCRYPT
 	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE
 	select ARCH_HAS_PTE_DEVMAP
 	select ARCH_HAS_PTE_SPECIAL
diff --git a/arch/arm64/include/asm/hypervisor.h b/arch/arm64/include/asm/hypervisor.h
index ef8e55e6f2f2..8e77f411903f 100644
--- a/arch/arm64/include/asm/hypervisor.h
+++ b/arch/arm64/include/asm/hypervisor.h
@@ -7,6 +7,5 @@
 void kvm_init_hyp_services(void);
 bool kvm_arm_hyp_service_available(u32 func_id);
 void kvm_arm_init_hyp_services(void);
-void kvm_init_memshare_services(void);
 
 #endif
diff --git a/arch/arm64/include/asm/mem_encrypt.h b/arch/arm64/include/asm/mem_encrypt.h
deleted file mode 100644
index 300c8b8cbebe..000000000000
--- a/arch/arm64/include/asm/mem_encrypt.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __ASM_MEM_ENCRYPT_H
-#define __ASM_MEM_ENCRYPT_H
-
-bool mem_encrypt_active(void);
-int set_memory_encrypted(unsigned long addr, int numpages);
-int set_memory_decrypted(unsigned long addr, int numpages);
-
-#endif	/* __ASM_MEM_ENCRYPT_H */
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index fe86a244b350..be5f85b0a24d 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -40,7 +40,6 @@
 #include <asm/elf.h>
 #include <asm/cpufeature.h>
 #include <asm/cpu_ops.h>
-#include <asm/hypervisor.h>
 #include <asm/kasan.h>
 #include <asm/numa.h>
 #include <asm/sections.h>
@@ -446,8 +445,3 @@ static int __init register_arm64_panic_block(void)
 	return 0;
 }
 device_initcall(register_arm64_panic_block);
-
-void kvm_arm_init_hyp_services(void)
-{
-	kvm_init_memshare_services();
-}
diff --git a/arch/arm64/mm/Makefile b/arch/arm64/mm/Makefile
index 7368829df986..f188c9092696 100644
--- a/arch/arm64/mm/Makefile
+++ b/arch/arm64/mm/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 obj-y				:= dma-mapping.o extable.o fault.o init.o \
 				   cache.o copypage.o flush.o \
-				   ioremap.o mem_encrypt.o mmap.o pgd.o mmu.o \
+				   ioremap.o mmap.o pgd.o mmu.o \
 				   context.o proc.o pageattr.o
 obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o
 obj-$(CONFIG_PTDUMP_CORE)	+= ptdump.o
diff --git a/arch/arm64/mm/mem_encrypt.c b/arch/arm64/mm/mem_encrypt.c
deleted file mode 100644
index ff75dd3200bc..000000000000
--- a/arch/arm64/mm/mem_encrypt.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Implementation of the memory encryption/decryption API.
- *
- * Amusingly, no crypto is actually performed. Rather, we call into the
- * hypervisor component of KVM to expose pages selectively to the host
- * for virtio "DMA" operations. In other words, "encrypted" pages are
- * not accessible to the host, whereas "decrypted" pages are.
- *
- * Author: Will Deacon <will@kernel.org>
- */
-#include <linux/arm-smccc.h>
-#include <linux/mem_encrypt.h>
-#include <linux/memory.h>
-#include <linux/mm.h>
-#include <linux/set_memory.h>
-#include <linux/types.h>
-
-#include <asm/hypervisor.h>
-
-static unsigned long memshare_granule_sz;
-
-bool mem_encrypt_active(void)
-{
-	return memshare_granule_sz;
-}
-EXPORT_SYMBOL(mem_encrypt_active);
-
-void kvm_init_memshare_services(void)
-{
-	int i;
-	struct arm_smccc_res res;
-	const u32 funcs[] = {
-		ARM_SMCCC_KVM_FUNC_HYP_MEMINFO,
-		ARM_SMCCC_KVM_FUNC_MEM_SHARE,
-		ARM_SMCCC_KVM_FUNC_MEM_UNSHARE,
-	};
-
-	for (i = 0; i < ARRAY_SIZE(funcs); ++i) {
-		if (!kvm_arm_hyp_service_available(funcs[i]))
-			return;
-	}
-
-	arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_HYP_MEMINFO_FUNC_ID,
-			     0, 0, 0, &res);
-	if (res.a0 > PAGE_SIZE) /* Includes error codes */
-		return;
-
-	memshare_granule_sz = res.a0;
-}
-
-static int arm_smccc_share_unshare_page(u32 func_id, phys_addr_t phys)
-{
-	phys_addr_t end = phys + PAGE_SIZE;
-
-	while (phys < end) {
-		struct arm_smccc_res res;
-
-		arm_smccc_1_1_invoke(func_id, phys, 0, 0, &res);
-		if (res.a0 != SMCCC_RET_SUCCESS)
-			return -EPERM;
-
-		phys += memshare_granule_sz;
-	}
-
-	return 0;
-}
-
-static int set_memory_xcrypted(u32 func_id, unsigned long start, int numpages)
-{
-	void *addr = (void *)start, *end = addr + numpages * PAGE_SIZE;
-
-	while (addr < end) {
-		int err;
-
-		err = arm_smccc_share_unshare_page(func_id, virt_to_phys(addr));
-		if (err)
-			return err;
-
-		addr += PAGE_SIZE;
-	}
-
-	return 0;
-}
-
-int set_memory_encrypted(unsigned long addr, int numpages)
-{
-	if (!memshare_granule_sz || WARN_ON(!PAGE_ALIGNED(addr)))
-		return 0;
-
-	return set_memory_xcrypted(ARM_SMCCC_VENDOR_HYP_KVM_MEM_UNSHARE_FUNC_ID,
-				   addr, numpages);
-}
-
-int set_memory_decrypted(unsigned long addr, int numpages)
-{
-	if (!memshare_granule_sz || WARN_ON(!PAGE_ALIGNED(addr)))
-		return 0;
-
-	return set_memory_xcrypted(ARM_SMCCC_VENDOR_HYP_KVM_MEM_SHARE_FUNC_ID,
-				   addr, numpages);
-}
diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 327350bb0f9e..b6237925f1c0 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -19,7 +19,6 @@
 #include <linux/list.h>
 #include <linux/log2.h>
 #include <linux/memblock.h>
-#include <linux/mem_encrypt.h>
 #include <linux/mm.h>
 #include <linux/msi.h>
 #include <linux/of.h>