diff options
| author | Alistair Delva <adelva@google.com> | 2021-02-15 12:43:29 -0800 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2021-02-15 12:44:34 -0800 |
| commit | faa476c0caaa598afa5a6109d17102db5fe35ec6 (patch) | |
| tree | 37a21c69306801ee7cdda5167a30896c8740155b /include/services/sdei.h | |
| parent | b00a71fc312c9781fa6f404dccfb55b062b2ccac (diff) | |
| parent | 66306814586b1bf6bcb859aaad218ec3bb090e94 (diff) | |
| download | platform_external_arm-trusted-firmware-faa476c0caaa598afa5a6109d17102db5fe35ec6.tar.gz platform_external_arm-trusted-firmware-faa476c0caaa598afa5a6109d17102db5fe35ec6.tar.bz2 platform_external_arm-trusted-firmware-faa476c0caaa598afa5a6109d17102db5fe35ec6.zip | |
Merge branch 'aosp/upstream-master' into HEADandroid-s-preview-1
This keeps the bl31 interface change reverted which still has not been
fixed in upstream U-Boot for rockchip devices.
Test: CROSS_COMPILE=aarch64-linux-gnu- make PLAT=rk3399 \
DEBUG=0 ERROR_DEPRECATED=1 bl31
Signed-off-by: Alistair Delva <adelva@google.com>
Change-Id: I7c3972a7b767715efb05593096d5d92dba14c609
Diffstat (limited to 'include/services/sdei.h')
| -rw-r--r-- | include/services/sdei.h | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/include/services/sdei.h b/include/services/sdei.h index ae8c7e42f..063ed6f28 100644 --- a/include/services/sdei.h +++ b/include/services/sdei.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,6 +9,7 @@ #include <lib/spinlock.h> #include <lib/utils_def.h> +#include <services/sdei_flags.h> /* Range 0xC4000020 - 0xC400003F reserved for SDE 64bit smc calls */ #define SDEI_VERSION 0xC4000020U @@ -41,50 +42,6 @@ #define SDEI_EV_HANDLED 0U #define SDEI_EV_FAILED 1U -/* Internal: SDEI flag bit positions */ -#define SDEI_MAPF_DYNAMIC_SHIFT_ 1U -#define SDEI_MAPF_BOUND_SHIFT_ 2U -#define SDEI_MAPF_SIGNALABLE_SHIFT_ 3U -#define SDEI_MAPF_PRIVATE_SHIFT_ 4U -#define SDEI_MAPF_CRITICAL_SHIFT_ 5U -#define SDEI_MAPF_EXPLICIT_SHIFT_ 6U - -/* SDEI event 0 */ -#define SDEI_EVENT_0 0 - -/* Placeholder interrupt for dynamic mapping */ -#define SDEI_DYN_IRQ 0U - -/* SDEI flags */ - -/* - * These flags determine whether or not an event can be associated with an - * interrupt. Static events are permanently associated with an interrupt, and - * can't be changed at runtime. Association of dynamic events with interrupts - * can be changed at run time using the SDEI_INTERRUPT_BIND and - * SDEI_INTERRUPT_RELEASE calls. - * - * SDEI_MAPF_DYNAMIC only indicates run time configurability, where as - * SDEI_MAPF_BOUND indicates interrupt association. For example: - * - * - Calling SDEI_INTERRUPT_BIND on a dynamic event will have both - * SDEI_MAPF_DYNAMIC and SDEI_MAPF_BOUND set. - * - * - Statically-bound events will always have SDEI_MAPF_BOUND set, and neither - * SDEI_INTERRUPT_BIND nor SDEI_INTERRUPT_RELEASE can be called on them. - * - * See also the is_map_bound() macro. - */ -#define SDEI_MAPF_DYNAMIC BIT(SDEI_MAPF_DYNAMIC_SHIFT_) -#define SDEI_MAPF_BOUND BIT(SDEI_MAPF_BOUND_SHIFT_) -#define SDEI_MAPF_EXPLICIT BIT(SDEI_MAPF_EXPLICIT_SHIFT_) - -#define SDEI_MAPF_SIGNALABLE BIT(SDEI_MAPF_SIGNALABLE_SHIFT_) -#define SDEI_MAPF_PRIVATE BIT(SDEI_MAPF_PRIVATE_SHIFT_) - -#define SDEI_MAPF_NORMAL 0 -#define SDEI_MAPF_CRITICAL BIT(SDEI_MAPF_CRITICAL_SHIFT_) - /* Indices of private and shared mappings */ #define SDEI_MAP_IDX_PRIV_ 0U #define SDEI_MAP_IDX_SHRD_ 1U |