From c9e4713476bec8933bbe2be8314604497d521d28 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 4 Feb 2016 08:40:00 +0100 Subject: [PATCH] Revert "arm: smc: Add helper asm code for invoking smc" This reverts commit 1f4dc97747abd75fb23f8d9f43f9acbf49408da6. SMC call is replaced by mainline patch: "armv8: Add Secure Monitor/Hypervisor Call (SMC/HVC) infrastructure" (sha1: a5b9fa30cebd91082f9fea93d7ef33812910da6a) Signed-off-by: Michal Simek --- README | 4 ---- arch/arm/include/asm/smc.h | 12 ------------ arch/arm/lib/Makefile | 1 - arch/arm/lib/smc.S | 14 -------------- 4 files changed, 31 deletions(-) delete mode 100644 arch/arm/include/asm/smc.h delete mode 100644 arch/arm/lib/smc.S diff --git a/README b/README index 7b38320cf34..2294e2dfffe 100644 --- a/README +++ b/README @@ -669,10 +669,6 @@ The following options need to be configured: CONFIG_ARM_ERRATA_798870 CONFIG_ARM_ERRATA_801819 - CONFIG_ARM_SMC - - Enable compilation of helper ASM code for calling SMC instructions. - - Tegra SoC options: CONFIG_TEGRA_SUPPORT_NON_SECURE diff --git a/arch/arm/include/asm/smc.h b/arch/arm/include/asm/smc.h deleted file mode 100644 index f5a790f7604..00000000000 --- a/arch/arm/include/asm/smc.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (C) 2015 - Xilinx, Inc., Michal Simek - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __ARM_SMC_H__ -#define __ARM_SMC_H__ - -extern int invoke_smc(u64 function_id, u64 arg0, u64 arg1, u64 arg2); - -#endif /* __ARM_SMC_H__ */ diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 6ca67f29444..f3db7b58cb5 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -12,7 +12,6 @@ ifdef CONFIG_CPU_V7M obj-y += vectors_m.o crt0.o else ifdef CONFIG_ARM64 obj-y += crt0_64.o -obj-$(CONFIG_ARM_SMC) += smc.o else obj-y += vectors.o crt0.o endif diff --git a/arch/arm/lib/smc.S b/arch/arm/lib/smc.S deleted file mode 100644 index 08a9c2ee2e4..00000000000 --- a/arch/arm/lib/smc.S +++ /dev/null @@ -1,14 +0,0 @@ -/* - * (C) Copyright 2015 - 2016, Xilinx, Inc, - * Michal Simek - * - * SPDX-License-Identifier: GPL-2.0 - */ - -#include -#include - -ENTRY(invoke_smc) - smc #0 - ret -ENDPROC(invoke_smc) -- 2.47.3