From 90e0c983734ca4d2ee7523a1c85d7d5449a756df Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Mon, 24 Sep 2018 17:28:13 +0100 Subject: [PATCH] xlat: Remove deprecated interfaces Change-Id: I83de2ae3e0795e6fec3c1e5b37c441b64b0c9cb6 Signed-off-by: Antonio Nino Diaz --- docs/porting-guide.rst | 7 ----- include/lib/xlat_tables/xlat_mmu_helpers.h | 5 ---- include/lib/xlat_tables/xlat_tables.h | 4 --- include/lib/xlat_tables/xlat_tables_v2.h | 4 --- lib/aarch64/xlat_tables.c | 14 ---------- lib/xlat_tables/aarch32/xlat_tables.c | 16 ------------ lib/xlat_tables/xlat_tables_private.h | 17 ------------ lib/xlat_tables_v2/xlat_tables_context.c | 30 ---------------------- 8 files changed, 97 deletions(-) delete mode 100644 lib/aarch64/xlat_tables.c diff --git a/docs/porting-guide.rst b/docs/porting-guide.rst index 2d0f8d4b..269a57e1 100644 --- a/docs/porting-guide.rst +++ b/docs/porting-guide.rst @@ -477,13 +477,6 @@ constants must also be defined: enabled for a BL image, ``MAX_MMAP_REGIONS`` must be defined to accommodate the dynamic regions as well. -- **#define : ADDR\_SPACE\_SIZE** - - Defines the total size of the address space in bytes. For example, for a 32 - bit address space, this value should be ``(1ULL << 32)``. This definition is - now deprecated, platforms should use ``PLAT_PHY_ADDR_SPACE_SIZE`` and - ``PLAT_VIRT_ADDR_SPACE_SIZE`` instead. - - **#define : PLAT\_VIRT\_ADDR\_SPACE\_SIZE** Defines the total size of the virtual address space in bytes. For example, diff --git a/include/lib/xlat_tables/xlat_mmu_helpers.h b/include/lib/xlat_tables/xlat_mmu_helpers.h index ab491e36..85effcaa 100644 --- a/include/lib/xlat_tables/xlat_mmu_helpers.h +++ b/include/lib/xlat_tables/xlat_mmu_helpers.h @@ -67,11 +67,6 @@ void setup_mmu_cfg(uint64_t *params, unsigned int flags, #ifdef AARCH32 /* AArch32 specific translation table API */ -#if !ERROR_DEPRECATED -void enable_mmu_secure(unsigned int flags); -void enable_mmu_direct(unsigned int flags); -#endif - void enable_mmu_svc_mon(unsigned int flags); void enable_mmu_hyp(unsigned int flags); diff --git a/include/lib/xlat_tables/xlat_tables.h b/include/lib/xlat_tables/xlat_tables.h index 4097c76f..050679d9 100644 --- a/include/lib/xlat_tables/xlat_tables.h +++ b/include/lib/xlat_tables/xlat_tables.h @@ -71,10 +71,6 @@ #define MT_CODE (MT_MEMORY | MT_RO | MT_EXECUTE) #define MT_RO_DATA (MT_MEMORY | MT_RO | MT_EXECUTE_NEVER) -#if !ERROR_DEPRECATED -typedef unsigned int mmap_attr_t; -#endif - /* * Structure for specifying a single region of memory. */ diff --git a/include/lib/xlat_tables/xlat_tables_v2.h b/include/lib/xlat_tables/xlat_tables_v2.h index 52c4dc6d..4bd0bb23 100644 --- a/include/lib/xlat_tables/xlat_tables_v2.h +++ b/include/lib/xlat_tables/xlat_tables_v2.h @@ -104,10 +104,6 @@ #define MT_RO_DATA (MT_MEMORY | MT_RO | MT_EXECUTE_NEVER) #define MT_RW_DATA (MT_MEMORY | MT_RW | MT_EXECUTE_NEVER) -#if !ERROR_DEPRECATED -typedef unsigned int mmap_attr_t; -#endif - /* * Structure for specifying a single region of memory. */ diff --git a/lib/aarch64/xlat_tables.c b/lib/aarch64/xlat_tables.c deleted file mode 100644 index 04cbf3c2..00000000 --- a/lib/aarch64/xlat_tables.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/* - * This file is deprecated and is retained here only for compatibility. - * The xlat_tables library can be found in `lib/xlat_tables` directory. - */ -#if !ERROR_DEPRECATED -#include "../xlat_tables/xlat_tables_common.c" -#include "../xlat_tables/aarch64/xlat_tables.c" -#endif diff --git a/lib/xlat_tables/aarch32/xlat_tables.c b/lib/xlat_tables/aarch32/xlat_tables.c index 033e2375..55957031 100644 --- a/lib/xlat_tables/aarch32/xlat_tables.c +++ b/lib/xlat_tables/aarch32/xlat_tables.c @@ -61,22 +61,6 @@ void init_xlat_tables(void) assert((PLAT_PHY_ADDR_SPACE_SIZE - 1U) <= get_max_supported_pa()); } -/******************************************************************************* - * Function for enabling the MMU in Secure PL1, assuming that the - * page-tables have already been created. - ******************************************************************************/ -#if !ERROR_DEPRECATED -void enable_mmu_secure(unsigned int flags) -{ - enable_mmu_svc_mon(flags); -} - -void enable_mmu_direct(unsigned int flags) -{ - enable_mmu_direct_svc_mon(flags); -} -#endif - void enable_mmu_svc_mon(unsigned int flags) { unsigned int mair0, ttbcr, sctlr; diff --git a/lib/xlat_tables/xlat_tables_private.h b/lib/xlat_tables/xlat_tables_private.h index f882f7ef..fad967eb 100644 --- a/lib/xlat_tables/xlat_tables_private.h +++ b/lib/xlat_tables/xlat_tables_private.h @@ -15,23 +15,6 @@ #error xlat tables v2 must be used with HW_ASSISTED_COHERENCY #endif -/* - * If the platform hasn't defined a physical and a virtual address space size - * default to ADDR_SPACE_SIZE. - */ -#if ERROR_DEPRECATED -# ifdef ADDR_SPACE_SIZE -# error "ADDR_SPACE_SIZE is deprecated. Use PLAT_xxx_ADDR_SPACE_SIZE instead." -# endif -#elif defined(ADDR_SPACE_SIZE) -# ifndef PLAT_PHY_ADDR_SPACE_SIZE -# define PLAT_PHY_ADDR_SPACE_SIZE ADDR_SPACE_SIZE -# endif -# ifndef PLAT_VIRT_ADDR_SPACE_SIZE -# define PLAT_VIRT_ADDR_SPACE_SIZE ADDR_SPACE_SIZE -# endif -#endif - CASSERT(CHECK_VIRT_ADDR_SPACE_SIZE(PLAT_VIRT_ADDR_SPACE_SIZE), assert_valid_virt_addr_space_size); diff --git a/lib/xlat_tables_v2/xlat_tables_context.c b/lib/xlat_tables_v2/xlat_tables_context.c index bf0cc9f5..4a4cb946 100644 --- a/lib/xlat_tables_v2/xlat_tables_context.c +++ b/lib/xlat_tables_v2/xlat_tables_context.c @@ -18,24 +18,6 @@ */ uint64_t mmu_cfg_params[MMU_CFG_PARAM_MAX]; -/* - * Each platform can define the size of its physical and virtual address spaces. - * If the platform hasn't defined one or both of them, default to - * ADDR_SPACE_SIZE. The latter is deprecated, though. - */ -#if ERROR_DEPRECATED -# ifdef ADDR_SPACE_SIZE -# error "ADDR_SPACE_SIZE is deprecated. Use PLAT_xxx_ADDR_SPACE_SIZE instead." -# endif -#elif defined(ADDR_SPACE_SIZE) -# ifndef PLAT_PHY_ADDR_SPACE_SIZE -# define PLAT_PHY_ADDR_SPACE_SIZE ADDR_SPACE_SIZE -# endif -# ifndef PLAT_VIRT_ADDR_SPACE_SIZE -# define PLAT_VIRT_ADDR_SPACE_SIZE ADDR_SPACE_SIZE -# endif -#endif - /* * Allocate and initialise the default translation context for the BL image * currently executing. @@ -121,18 +103,6 @@ int xlat_change_mem_attributes(uintptr_t base_va, size_t size, uint32_t attr) #ifdef AARCH32 -#if !ERROR_DEPRECATED -void enable_mmu_secure(unsigned int flags) -{ - enable_mmu_svc_mon(flags); -} - -void enable_mmu_direct(unsigned int flags) -{ - enable_mmu_direct_svc_mon(flags); -} -#endif - void enable_mmu_svc_mon(unsigned int flags) { setup_mmu_cfg((uint64_t *)&mmu_cfg_params, flags, -- 2.30.2