diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/bl31/services/psci.h | 4 | ||||
| -rw-r--r-- | include/drivers/arm/nic_400.h | 40 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/css/common/css_def.h | 3 |
4 files changed, 45 insertions, 6 deletions
diff --git a/include/bl31/services/psci.h b/include/bl31/services/psci.h index 871e2907..6298a404 100644 --- a/include/bl31/services/psci.h +++ b/include/bl31/services/psci.h @@ -283,9 +283,9 @@ typedef struct plat_psci_ops { typedef struct spd_pm_ops { void (*svc_on)(uint64_t target_cpu); int32_t (*svc_off)(uint64_t __unused); - void (*svc_suspend)(uint64_t __unused); + void (*svc_suspend)(uint64_t max_off_pwrlvl); void (*svc_on_finish)(uint64_t __unused); - void (*svc_suspend_finish)(uint64_t suspend_level); + void (*svc_suspend_finish)(uint64_t max_off_pwrlvl); int32_t (*svc_migrate)(uint64_t from_cpu, uint64_t to_cpu); int32_t (*svc_migrate_info)(uint64_t *resident_cpu); void (*svc_system_off)(void); diff --git a/include/drivers/arm/nic_400.h b/include/drivers/arm/nic_400.h new file mode 100644 index 00000000..1031662b --- /dev/null +++ b/include/drivers/arm/nic_400.h @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of ARM nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific + * prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __NIC_400_H__ +#define __NIC_400_H__ + +/* + * Address of slave 'n' security setting in the NIC-400 address region + * control + */ +#define NIC400_ADDR_CTRL_SECURITY_REG(n) (0x8 + (n) * 4) + +#endif /* __NIC_400_H__ */ diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 98705ec6..c236970a 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -173,10 +173,6 @@ #define ARM_CONSOLE_BAUDRATE 115200 -/* TZC related constants */ -#define ARM_TZC_BASE 0x2a4a0000 - - /****************************************************************************** * Required platform porting definitions common to all ARM standard platforms *****************************************************************************/ diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 157a22f4..38ff9ddd 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -111,6 +111,9 @@ /* TZC related constants */ #define PLAT_ARM_TZC_FILTERS REG_ATTR_FILTER_BIT_ALL +#define PLAT_ARM_TZC_BASE 0x2a4a0000 +/* System timer related constants */ +#define PLAT_ARM_NSTIMER_FRAME_ID 1 #endif /* __CSS_DEF_H__ */ |