Merge pull request #1920 from ambroise-arm/av/deprecated

Remove deprecated interfaces

Makefile

@@ -285,28 +285,6 @@ INCLUDES		+=	-Iinclude				\
 				${PLAT_INCLUDES}			\
 				${SPD_INCLUDES}
 
-ifeq (${ERROR_DEPRECATED},0)
-INCLUDES		+=	-Iinclude/bl1				\
-				-Iinclude/bl2				\
-				-Iinclude/bl2u				\
-				-Iinclude/bl31				\
-				-Iinclude/drivers			\
-				-Iinclude/drivers/arm			\
-				-Iinclude/drivers/auth			\
-				-Iinclude/drivers/io			\
-				-Iinclude/drivers/ti/uart		\
-				-Iinclude/lib				\
-				-Iinclude/lib/cpus			\
-				-Iinclude/lib/el3_runtime		\
-				-Iinclude/lib/extensions		\
-				-Iinclude/lib/pmf			\
-				-Iinclude/lib/psci			\
-				-Iinclude/lib/xlat_tables		\
-				-Iinclude/plat/common			\
-				-Iinclude/services			\
-				-Iinclude/tools_share
-endif
-
 include common/backtrace/backtrace.mk
 
 ################################################################################

drivers/arm/pl011/aarch32/pl011_console.S

@@ -6,7 +6,6 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/arm/pl011.h>
 

drivers/arm/pl011/aarch64/pl011_console.S

@@ -6,7 +6,6 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/arm/pl011.h>
 

drivers/arm/tzc/tzc380.c

@@ -24,7 +24,7 @@ static unsigned int tzc380_read_build_config(uintptr_t base)
 	return mmio_read_32(base + TZC380_CONFIGURATION_OFF);
 }
 
-static void tzc380_write_action(uintptr_t base, tzc_action_t action)
+static void tzc380_write_action(uintptr_t base, unsigned int action)
 {
 	mmio_write_32(base + ACTION_OFF, action);
 }
@@ -91,7 +91,7 @@ void tzc380_configure_region(uint8_t region, uintptr_t region_base, unsigned int
 	tzc380_write_region_attributes(tzc380.base, region, attr);
 }
 
-void tzc380_set_action(tzc_action_t action)
+void tzc380_set_action(unsigned int action)
 {
 	assert(tzc380.base != 0U);
 

drivers/cadence/uart/aarch64/cdns_console.S

@@ -6,7 +6,6 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/cadence/cdns_uart.h>
 

drivers/console/aarch64/skeleton_console.S

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <asm_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 
 	/*

drivers/coreboot/cbmem_console/aarch64/cbmem_console.S

@@ -5,7 +5,6 @@
  */
 
 #include <asm_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/coreboot/cbmem_console.h>
 

drivers/marvell/uart/a3700_console.S

@@ -7,7 +7,6 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/marvell/uart/a3700_console.h>
 

drivers/meson/console/aarch64/meson_console.S

@@ -6,7 +6,6 @@
 
 #include <asm_macros.S>
 #include <assert_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/meson/meson_console.h>
 

drivers/st/uart/aarch32/stm32_console.S

@@ -5,7 +5,6 @@
  */
 #include <asm_macros.S>
 #include <assert_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/st/stm32_console.h>
 #include <drivers/st/stm32_uart_regs.h>

drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_d3.c

@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <mmio.h>
+#include <lib/mmio.h>
 #include <common/debug.h>
 
 #include "boot_init_dram_regdef_d3.h"

drivers/staging/renesas/rcar/pfc/D3/pfc_init_d3.c

@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <mmio.h>
+#include <lib/mmio.h>
 #include "pfc_init_d3.h"
 #include "rcar_def.h"
 

drivers/staging/renesas/rcar/pfc/V3M/pfc_init_v3m.c

@@ -6,7 +6,7 @@
  */
 
 #include <stdint.h>		/* for uint32_t */
-#include <mmio.h>
+#include <lib/mmio.h>
 #include "pfc_init_v3m.h"
 #include "include/rcar_def.h"
 #include "rcar_private.h"

drivers/ti/uart/aarch64/16550_console.S

@@ -7,7 +7,6 @@
 #include <arch.h>
 #include <asm_macros.S>
 #include <assert_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <drivers/ti/uart/uart_16550.h>
 

include/arch/aarch32/console_macros.S

 /*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -17,39 +17,6 @@
  * with a tail call that will include return to the caller.
  * REQUIRES console_t pointer in x0 and a valid return address in x30.
  */
-/*
- * The USE_FINISH_CONSOLE_REG_2 guard is introduced to allow selection between
- * the 2 variants of the finish_console_register macro and will be removed
- * once the deprecated variant is removed.
- */
-#ifndef USE_FINISH_CONSOLE_REG_2
-#if !ERROR_DEPRECATED
-	/* This version of the macro is deprecated. Use the new version */
-	.macro	finish_console_register _driver
-	/*
-	 * Add these weak definitions so we will automatically write a 0 if the
-	 * function doesn't exist. I'd rather use .ifdef but that only works if
-	 * the function was defined (not just declared .global) above this point
-	 * in the file, which we can't guarantee.
-	 */
-	.weak console_\_driver\()_putc
-	.weak console_\_driver\()_getc
-	.weak console_\_driver\()_flush
-
-	/* Don't use adrp on weak funcs! See GNU ld bugzilla issue 22589. */
-	ldr	r1, =console_\_driver\()_putc
-	str	r1, [r0, #CONSOLE_T_PUTC]
-	ldr	r1, =console_\_driver\()_getc
-	str	r1, [r0, #CONSOLE_T_GETC]
-	ldr	r1, =console_\_driver\()_flush
-	str	r1, [r0, #CONSOLE_T_FLUSH]
-	mov	r1, #(CONSOLE_FLAG_BOOT | CONSOLE_FLAG_CRASH)
-	str	r1, [r0, #CONSOLE_T_FLAGS]
-	b	console_register
-	.endm
-#endif /* ERROR_DEPRECATED */
-#else /* USE_FINISH_CONSOLE_REG_2 */
-	/* The new version of the macro not using weak references */
 	.macro	finish_console_register _driver, putc=0, getc=0, flush=0
 	/*
 	 * If any of the callback is not specified or set as 0, then the
@@ -80,5 +47,5 @@
 	str	r1, [r0, #CONSOLE_T_FLAGS]
 	b	console_register
 	.endm
-#endif /* USE_FINISH_CONSOLE_REG_2 */
+
 #endif /* CONSOLE_MACROS_S */

include/arch/aarch64/arch_helpers.h

@@ -310,13 +310,6 @@ static inline void disable_debug_exceptions(void)
 	isb();
 }
 
-#if !ERROR_DEPRECATED
-uint32_t get_afflvl_shift(uint32_t);
-uint32_t mpidr_mask_lower_afflvls(uint64_t, uint32_t);
-
-void __dead2 eret(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3,
-		  uint64_t x4, uint64_t x5, uint64_t x6, uint64_t x7);
-#endif
 void __dead2 smc(uint64_t x0, uint64_t x1, uint64_t x2, uint64_t x3,
 		 uint64_t x4, uint64_t x5, uint64_t x6, uint64_t x7);
 
@@ -508,10 +501,6 @@ static inline uint64_t el_implemented(unsigned int el)
 	}
 }
 
-#if !ERROR_DEPRECATED
-#define EL_IMPLEMENTED(_el)	el_implemented(_el)
-#endif
-
 /* Previously defined accesor functions with incomplete register names  */
 
 #define read_current_el()	read_CurrentEl()

include/arch/aarch64/console_macros.S

 /*
- * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -17,39 +17,6 @@
  * with a tail call that will include return to the caller.
  * REQUIRES console_t pointer in x0 and a valid return address in x30.
  */
-/*
- * The USE_FINISH_CONSOLE_REG_2 guard is introduced to allow selection between
- * the 2 variants of the finish_console_register macro and will be removed
- * once the deprecated variant is removed.
- */
-#ifndef USE_FINISH_CONSOLE_REG_2
-#if !ERROR_DEPRECATED
-	/* This version of the macro is deprecated. Use the new version */
-	.macro	finish_console_register _driver
-	/*
-	 * Add these weak definitions so we will automatically write a 0 if the
-	 * function doesn't exist. I'd rather use .ifdef but that only works if
-	 * the function was defined (not just declared .global) above this point
-	 * in the file, which we can't guarantee.
-	 */
-	.weak console_\_driver\()_putc
-	.weak console_\_driver\()_getc
-	.weak console_\_driver\()_flush
-
-	/* Don't use adrp on weak funcs! See GNU ld bugzilla issue 22589. */
-	ldr	x1, =console_\_driver\()_putc
-	str	x1, [x0, #CONSOLE_T_PUTC]
-	ldr	x1, =console_\_driver\()_getc
-	str	x1, [x0, #CONSOLE_T_GETC]
-	ldr	x1, =console_\_driver\()_flush
-	str	x1, [x0, #CONSOLE_T_FLUSH]
-	mov	x1, #(CONSOLE_FLAG_BOOT | CONSOLE_FLAG_CRASH)
-	str	x1, [x0, #CONSOLE_T_FLAGS]
-	b	console_register
-	.endm
-#endif /* ERROR_DEPRECATED */
-#else /* USE_FINISH_CONSOLE_REG_2 */
-	/* The new version of the macro not using weak references */
 	.macro	finish_console_register _driver, putc=0, getc=0, flush=0
 	/*
 	 * If any of the callback is not specified or set as 0, then the
@@ -83,6 +50,5 @@
 	str	x1, [x0, #CONSOLE_T_FLAGS]
 	b	console_register
 	.endm
-#endif /* USE_FINISH_CONSOLE_REG_2 */
 
 #endif /* CONSOLE_MACROS_S */

include/drivers/arm/tzc380.h

@@ -138,7 +138,7 @@ void tzc380_init(uintptr_t base);
 void tzc380_configure_region(uint8_t region,
 			     uintptr_t region_base,
 			     unsigned int attr);
-void tzc380_set_action(tzc_action_t action);
+void tzc380_set_action(unsigned int action);
 static inline void tzc_init(uintptr_t base)
 {
 	tzc380_init(base);
@@ -151,7 +151,7 @@ static inline void tzc_configure_region(uint8_t region,
 	tzc380_configure_region(region, region_base, attr);
 }
 
-static inline void tzc_set_action(tzc_action_t action)
+static inline void tzc_set_action(unsigned int action)
 {
 	tzc380_set_action(action);
 }

include/drivers/arm/tzc_common.h

@@ -86,12 +86,4 @@
 #define TZC_REGION_OFFSET(region_size, region_no)	\
 				((region_size) * (region_no))
 
-#ifndef __ASSEMBLY__
-
-#if !ERROR_DEPRECATED
-typedef unsigned int tzc_action_t;
-typedef unsigned int tzc_region_attributes_t;
-#endif
-
-#endif /* __ASSEMBLY__ */
 #endif /* TZC_COMMON_H */

lib/aarch64/misc_helpers.S

@@ -10,11 +10,6 @@
 #include <common/bl_common.h>
 #include <lib/xlat_tables/xlat_tables_defs.h>
 
-#if !ERROR_DEPRECATED
-	.globl	get_afflvl_shift
-	.globl	mpidr_mask_lower_afflvls
-	.globl	eret
-#endif /* ERROR_DEPRECATED */
 	.globl	smc
 
 	.globl	zero_normalmem
@@ -30,31 +25,6 @@
 	.globl	enable_vfp
 #endif
 
-#if !ERROR_DEPRECATED
-func get_afflvl_shift
-	cmp	x0, #3
-	cinc	x0, x0, eq
-	mov	x1, #MPIDR_AFFLVL_SHIFT
-	lsl	x0, x0, x1
-	ret
-endfunc get_afflvl_shift
-
-func mpidr_mask_lower_afflvls
-	cmp	x1, #3
-	cinc	x1, x1, eq
-	mov	x2, #MPIDR_AFFLVL_SHIFT
-	lsl	x2, x1, x2
-	lsr	x0, x0, x2
-	lsl	x0, x0, x2
-	ret
-endfunc mpidr_mask_lower_afflvls
-
-
-func eret
-	eret
-endfunc eret
-#endif /* ERROR_DEPRECATED */
-
 func smc
 	smc	#0
 endfunc smc