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 <michal.simek@xilinx.com>

diff --git a/README b/README
index 7b38320cf34dc1daf5d0afacefdccfdc1e75b16e..2294e2dfffea554087e72740ba14065b26ee3f2a 100644 (file)
--- 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 (file)
index f5a790f..0000000
--- 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 6ca67f29444468ddcd11d6a27d1e6382b1e73160..f3db7b58cb593fdc3116b2a5cd5a9f0952780e65 100644 (file)
--- 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 (file)
index 08a9c2e..0000000
--- a/arch/arm/lib/smc.S
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * (C) Copyright 2015 - 2016, Xilinx, Inc,
- * Michal Simek <michal.simek@xilinx.com>
- *
- * SPDX-License-Identifier:    GPL-2.0
- */
-
-#include <config.h>
-#include <linux/linkage.h>
-
-ENTRY(invoke_smc)
-       smc     #0
-       ret
-ENDPROC(invoke_smc)