diff options
| author | Tom Rini | 2023-07-24 19:51:05 -0400 |
|---|---|---|
| committer | Tom Rini | 2023-07-24 19:51:05 -0400 |
| commit | 94e7cb181ad6bd25d36a11c58e0df64e9f815888 (patch) | |
| tree | ecd308f65b3b7e5f709cb09c9766f1fc8edb7783 /include/linux | |
| parent | d927d1a80843e1c3e2a3f0b8f6150790bef83da1 (diff) | |
Revert "Merge branch '2023-07-24-introduce-FF-A-suppport'"
This reverts commit d927d1a80843e1c3e2a3f0b8f6150790bef83da1, reversing
changes made to c07ad9520c6190070513016fdb495d4703a4a853.
These changes do not pass CI currently.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/arm-smccc.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index f44e9e8f930..e1d09884a1c 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -1,10 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015, Linaro Limited - * Copyright 2022-2023 Arm Limited and/or its affiliates <open-source-office@arm.com> - * - * Authors: - * Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> */ #ifndef __LINUX_ARM_SMCCC_H #define __LINUX_ARM_SMCCC_H @@ -74,47 +70,6 @@ struct arm_smccc_res { unsigned long a3; }; -#ifdef CONFIG_ARM64 -/** - * struct arm_smccc_1_2_regs - Arguments for or Results from SMC call - * @a0-a17 argument values from registers 0 to 17 - */ -struct arm_smccc_1_2_regs { - unsigned long a0; - unsigned long a1; - unsigned long a2; - unsigned long a3; - unsigned long a4; - unsigned long a5; - unsigned long a6; - unsigned long a7; - unsigned long a8; - unsigned long a9; - unsigned long a10; - unsigned long a11; - unsigned long a12; - unsigned long a13; - unsigned long a14; - unsigned long a15; - unsigned long a16; - unsigned long a17; -}; - -/** - * arm_smccc_1_2_smc() - make SMC calls - * @args: arguments passed via struct arm_smccc_1_2_regs - * @res: result values via struct arm_smccc_1_2_regs - * - * This function is used to make SMC calls following SMC Calling Convention - * v1.2 or above. The content of the supplied param are copied from the - * structure to registers prior to the SMC instruction. The return values - * are updated with the content from registers on return from the SMC - * instruction. - */ -asmlinkage void arm_smccc_1_2_smc(const struct arm_smccc_1_2_regs *args, - struct arm_smccc_1_2_regs *res); -#endif - /** * struct arm_smccc_quirk - Contains quirk information * @id: quirk identification |