Merge pull request #729 from dp-arm/dp/arm-sip
Add instrumentation support for PSCI
This commit is contained in:
commit
66b4542a5f
8
Makefile
8
Makefile
|
@ -117,6 +117,12 @@ ENABLE_PSCI_STAT := 0
|
||||||
SEPARATE_CODE_AND_RODATA := 0
|
SEPARATE_CODE_AND_RODATA := 0
|
||||||
# Flag to enable new version of image loading
|
# Flag to enable new version of image loading
|
||||||
LOAD_IMAGE_V2 := 0
|
LOAD_IMAGE_V2 := 0
|
||||||
|
# Flag to enable runtime instrumentation using PMF
|
||||||
|
ENABLE_RUNTIME_INSTRUMENTATION := 0
|
||||||
|
|
||||||
|
ifeq (${ENABLE_RUNTIME_INSTRUMENTATION}, 1)
|
||||||
|
ENABLE_PMF := 1
|
||||||
|
endif
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Checkpatch script options
|
# Checkpatch script options
|
||||||
|
@ -466,6 +472,7 @@ $(eval $(call assert_boolean,ENABLE_PMF))
|
||||||
$(eval $(call assert_boolean,ENABLE_PSCI_STAT))
|
$(eval $(call assert_boolean,ENABLE_PSCI_STAT))
|
||||||
$(eval $(call assert_boolean,SEPARATE_CODE_AND_RODATA))
|
$(eval $(call assert_boolean,SEPARATE_CODE_AND_RODATA))
|
||||||
$(eval $(call assert_boolean,LOAD_IMAGE_V2))
|
$(eval $(call assert_boolean,LOAD_IMAGE_V2))
|
||||||
|
$(eval $(call assert_boolean,ENABLE_RUNTIME_INSTRUMENTATION))
|
||||||
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
@ -497,6 +504,7 @@ $(eval $(call add_define,ENABLE_PMF))
|
||||||
$(eval $(call add_define,ENABLE_PSCI_STAT))
|
$(eval $(call add_define,ENABLE_PSCI_STAT))
|
||||||
$(eval $(call add_define,SEPARATE_CODE_AND_RODATA))
|
$(eval $(call add_define,SEPARATE_CODE_AND_RODATA))
|
||||||
$(eval $(call add_define,LOAD_IMAGE_V2))
|
$(eval $(call add_define,LOAD_IMAGE_V2))
|
||||||
|
$(eval $(call add_define,ENABLE_RUNTIME_INSTRUMENTATION))
|
||||||
# Define the EL3_PAYLOAD_BASE flag only if it is provided.
|
# Define the EL3_PAYLOAD_BASE flag only if it is provided.
|
||||||
ifdef EL3_PAYLOAD_BASE
|
ifdef EL3_PAYLOAD_BASE
|
||||||
$(eval $(call add_define,EL3_PAYLOAD_BASE))
|
$(eval $(call add_define,EL3_PAYLOAD_BASE))
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
#include <arch.h>
|
#include <arch.h>
|
||||||
#include <bl_common.h>
|
#include <bl_common.h>
|
||||||
#include <el3_common_macros.S>
|
#include <el3_common_macros.S>
|
||||||
|
#include <pmf_asm_macros.S>
|
||||||
|
#include <runtime_instr.h>
|
||||||
#include <xlat_tables.h>
|
#include <xlat_tables.h>
|
||||||
|
|
||||||
.globl bl31_entrypoint
|
.globl bl31_entrypoint
|
||||||
|
@ -141,6 +143,18 @@ endfunc bl31_entrypoint
|
||||||
* --------------------------------------------------------------------
|
* --------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
func bl31_warm_entrypoint
|
func bl31_warm_entrypoint
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This timestamp update happens with cache off. The next
|
||||||
|
* timestamp collection will need to do cache maintenance prior
|
||||||
|
* to timestamp update.
|
||||||
|
*/
|
||||||
|
pmf_calc_timestamp_addr rt_instr_svc RT_INSTR_EXIT_HW_LOW_PWR
|
||||||
|
mrs x1, cntpct_el0
|
||||||
|
str x1, [x0]
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* On the warm boot path, most of the EL3 initialisations performed by
|
* On the warm boot path, most of the EL3 initialisations performed by
|
||||||
* 'el3_entrypoint_common' must be skipped:
|
* 'el3_entrypoint_common' must be skipped:
|
||||||
|
@ -188,5 +202,23 @@ func bl31_warm_entrypoint
|
||||||
|
|
||||||
bl psci_warmboot_entrypoint
|
bl psci_warmboot_entrypoint
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
pmf_calc_timestamp_addr rt_instr_svc RT_INSTR_EXIT_PSCI
|
||||||
|
mov x19, x0
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Invalidate before updating timestamp to ensure previous timestamp
|
||||||
|
* updates on the same cache line with caches disabled are properly
|
||||||
|
* seen by the same core. Without the cache invalidate, the core might
|
||||||
|
* write into a stale cache line.
|
||||||
|
*/
|
||||||
|
mov x1, #PMF_TS_SIZE
|
||||||
|
mov x20, x30
|
||||||
|
bl inv_dcache_range
|
||||||
|
mov x30, x20
|
||||||
|
|
||||||
|
mrs x0, cntpct_el0
|
||||||
|
str x0, [x19]
|
||||||
|
#endif
|
||||||
b el3_exit
|
b el3_exit
|
||||||
endfunc bl31_warm_entrypoint
|
endfunc bl31_warm_entrypoint
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include <arch.h>
|
#include <arch.h>
|
||||||
#include <asm_macros.S>
|
#include <asm_macros.S>
|
||||||
#include <context.h>
|
#include <context.h>
|
||||||
|
#include <cpu_data.h>
|
||||||
#include <interrupt_mgmt.h>
|
#include <interrupt_mgmt.h>
|
||||||
#include <platform_def.h>
|
#include <platform_def.h>
|
||||||
#include <runtime_svc.h>
|
#include <runtime_svc.h>
|
||||||
|
@ -47,6 +48,21 @@
|
||||||
msr daifclr, #DAIF_ABT_BIT
|
msr daifclr, #DAIF_ABT_BIT
|
||||||
|
|
||||||
str x30, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR]
|
str x30, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_LR]
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Read the timestamp value and store it in per-cpu data.
|
||||||
|
* The value will be extracted from per-cpu data by the
|
||||||
|
* C level SMC handler and saved to the PMF timestamp region.
|
||||||
|
*/
|
||||||
|
mrs x30, cntpct_el0
|
||||||
|
str x29, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X29]
|
||||||
|
mrs x29, tpidr_el3
|
||||||
|
str x30, [x29, #CPU_DATA_PMF_TS0_OFFSET]
|
||||||
|
ldr x29, [sp, #CTX_GPREGS_OFFSET + CTX_GPREG_X29]
|
||||||
|
#endif
|
||||||
|
|
||||||
mrs x30, esr_el3
|
mrs x30, esr_el3
|
||||||
ubfx x30, x30, #ESR_EC_SHIFT, #ESR_EC_LENGTH
|
ubfx x30, x30, #ESR_EC_SHIFT, #ESR_EC_LENGTH
|
||||||
|
|
||||||
|
|
|
@ -36,9 +36,16 @@
|
||||||
#include <context_mgmt.h>
|
#include <context_mgmt.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
#include <platform.h>
|
#include <platform.h>
|
||||||
|
#include <pmf.h>
|
||||||
|
#include <runtime_instr.h>
|
||||||
#include <runtime_svc.h>
|
#include <runtime_svc.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
PMF_REGISTER_SERVICE_SMC(rt_instr_svc, PMF_RT_INSTR_SVC_ID,
|
||||||
|
RT_INSTR_TOTAL_IDS, PMF_STORE_ENABLE)
|
||||||
|
#endif
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* This function pointer is used to initialise the BL32 image. It's initialized
|
* This function pointer is used to initialise the BL32 image. It's initialized
|
||||||
* by SPD calling bl31_register_bl32_init after setting up all things necessary
|
* by SPD calling bl31_register_bl32_init after setting up all things necessary
|
||||||
|
|
|
@ -50,8 +50,18 @@
|
||||||
|
|
||||||
#if CRASH_REPORTING
|
#if CRASH_REPORTING
|
||||||
#define CPU_DATA_LOG2SIZE 7
|
#define CPU_DATA_LOG2SIZE 7
|
||||||
|
#define CPU_DATA_CRASH_BUF_END (CPU_DATA_CRASH_BUF_OFFSET + \
|
||||||
|
CPU_DATA_CRASH_BUF_SIZE)
|
||||||
#else
|
#else
|
||||||
#define CPU_DATA_LOG2SIZE 6
|
#define CPU_DATA_LOG2SIZE 6
|
||||||
|
#define CPU_DATA_CRASH_BUF_END CPU_DATA_CRASH_BUF_OFFSET
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
/* Temporary space to store PMF timestamps from assembly code */
|
||||||
|
#define CPU_DATA_PMF_TS_COUNT 1
|
||||||
|
#define CPU_DATA_PMF_TS0_OFFSET CPU_DATA_CRASH_BUF_END
|
||||||
|
#define CPU_DATA_PMF_TS0_IDX 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
@ -95,6 +105,9 @@ typedef struct cpu_data {
|
||||||
uintptr_t cpu_ops_ptr;
|
uintptr_t cpu_ops_ptr;
|
||||||
#if CRASH_REPORTING
|
#if CRASH_REPORTING
|
||||||
u_register_t crash_buf[CPU_DATA_CRASH_BUF_SIZE >> 3];
|
u_register_t crash_buf[CPU_DATA_CRASH_BUF_SIZE >> 3];
|
||||||
|
#endif
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
uint64_t cpu_data_pmf_ts[CPU_DATA_PMF_TS_COUNT];
|
||||||
#endif
|
#endif
|
||||||
struct psci_cpu_data psci_svc_cpu_data;
|
struct psci_cpu_data psci_svc_cpu_data;
|
||||||
#if PLAT_PCPU_DATA_SIZE
|
#if PLAT_PCPU_DATA_SIZE
|
||||||
|
@ -116,6 +129,12 @@ CASSERT(CPU_DATA_CPU_OPS_PTR == __builtin_offsetof
|
||||||
(cpu_data_t, cpu_ops_ptr),
|
(cpu_data_t, cpu_ops_ptr),
|
||||||
assert_cpu_data_cpu_ops_ptr_offset_mismatch);
|
assert_cpu_data_cpu_ops_ptr_offset_mismatch);
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
CASSERT(CPU_DATA_PMF_TS0_OFFSET == __builtin_offsetof
|
||||||
|
(cpu_data_t, cpu_data_pmf_ts[0]),
|
||||||
|
assert_cpu_data_pmf_ts0_offset_mismatch);
|
||||||
|
#endif
|
||||||
|
|
||||||
struct cpu_data *_cpu_data_by_index(uint32_t cpu_index);
|
struct cpu_data *_cpu_data_by_index(uint32_t cpu_index);
|
||||||
|
|
||||||
#ifndef AARCH32
|
#ifndef AARCH32
|
||||||
|
|
|
@ -75,6 +75,7 @@
|
||||||
|
|
||||||
/* Following are the supported PMF service IDs */
|
/* Following are the supported PMF service IDs */
|
||||||
#define PMF_PSCI_STAT_SVC_ID 0
|
#define PMF_PSCI_STAT_SVC_ID 0
|
||||||
|
#define PMF_RT_INSTR_SVC_ID 1
|
||||||
|
|
||||||
#if ENABLE_PMF
|
#if ENABLE_PMF
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
|
|
||||||
#include <arch_helpers.h>
|
#include <arch_helpers.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <bl_common.h>
|
||||||
#include <platform.h>
|
#include <platform.h>
|
||||||
#include <pmf.h>
|
#include <pmf.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2016, 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 __RUNTIME_INSTR_H__
|
||||||
|
#define __RUNTIME_INSTR_H__
|
||||||
|
|
||||||
|
#define RT_INSTR_TOTAL_IDS 4
|
||||||
|
#define RT_INSTR_ENTER_PSCI 0
|
||||||
|
#define RT_INSTR_EXIT_PSCI 1
|
||||||
|
#define RT_INSTR_ENTER_HW_LOW_PWR 2
|
||||||
|
#define RT_INSTR_EXIT_HW_LOW_PWR 3
|
||||||
|
|
||||||
|
#ifndef __ASSEMBLY__
|
||||||
|
PMF_DECLARE_CAPTURE_TIMESTAMP(rt_instr_svc)
|
||||||
|
PMF_DECLARE_GET_TIMESTAMP(rt_instr_svc)
|
||||||
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
|
#endif /* __RUNTIME_INSTR_H__ */
|
|
@ -0,0 +1,45 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2016, 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 __ARM_SIP_SVC_H__
|
||||||
|
#define __ARM_SIP_SVC_H__
|
||||||
|
|
||||||
|
/* SMC function IDs for SiP Service queries */
|
||||||
|
|
||||||
|
#define ARM_SIP_SVC_CALL_COUNT 0x8200ff00
|
||||||
|
#define ARM_SIP_SVC_UID 0x8200ff01
|
||||||
|
/* 0x8200ff02 is reserved */
|
||||||
|
#define ARM_SIP_SVC_VERSION 0x8200ff03
|
||||||
|
|
||||||
|
/* ARM SiP Service Calls version numbers */
|
||||||
|
#define ARM_SIP_SVC_VERSION_MAJOR 0x0
|
||||||
|
#define ARM_SIP_SVC_VERSION_MINOR 0x1
|
||||||
|
|
||||||
|
#endif /* __ARM_SIP_SVC_H__ */
|
|
@ -33,6 +33,8 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
#include <platform.h>
|
#include <platform.h>
|
||||||
|
#include <pmf.h>
|
||||||
|
#include <runtime_instr.h>
|
||||||
#include <smcc.h>
|
#include <smcc.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "psci_private.h"
|
#include "psci_private.h"
|
||||||
|
@ -124,11 +126,23 @@ int psci_cpu_suspend(unsigned int power_state,
|
||||||
PMF_NO_CACHE_MAINT);
|
PMF_NO_CACHE_MAINT);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
PMF_CAPTURE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_ENTER_HW_LOW_PWR,
|
||||||
|
PMF_NO_CACHE_MAINT);
|
||||||
|
#endif
|
||||||
|
|
||||||
psci_plat_pm_ops->cpu_standby(cpu_pd_state);
|
psci_plat_pm_ops->cpu_standby(cpu_pd_state);
|
||||||
|
|
||||||
/* Upon exit from standby, set the state back to RUN. */
|
/* Upon exit from standby, set the state back to RUN. */
|
||||||
psci_set_cpu_local_state(PSCI_LOCAL_STATE_RUN);
|
psci_set_cpu_local_state(PSCI_LOCAL_STATE_RUN);
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
PMF_CAPTURE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_EXIT_HW_LOW_PWR,
|
||||||
|
PMF_NO_CACHE_MAINT);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if ENABLE_PSCI_STAT
|
#if ENABLE_PSCI_STAT
|
||||||
/* Capture time-stamp after CPU standby */
|
/* Capture time-stamp after CPU standby */
|
||||||
PMF_CAPTURE_TIMESTAMP(psci_svc, PSCI_STAT_ID_EXIT_LOW_PWR,
|
PMF_CAPTURE_TIMESTAMP(psci_svc, PSCI_STAT_ID_EXIT_LOW_PWR,
|
||||||
|
|
|
@ -33,6 +33,8 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
#include <platform.h>
|
#include <platform.h>
|
||||||
|
#include <pmf.h>
|
||||||
|
#include <runtime_instr.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "psci_private.h"
|
#include "psci_private.h"
|
||||||
|
|
||||||
|
@ -153,6 +155,19 @@ exit:
|
||||||
dsbish();
|
dsbish();
|
||||||
inv_cpu_data(psci_svc_cpu_data.aff_info_state);
|
inv_cpu_data(psci_svc_cpu_data.aff_info_state);
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Update the timestamp with cache off. We assume this
|
||||||
|
* timestamp can only be read from the current CPU and the
|
||||||
|
* timestamp cache line will be flushed before return to
|
||||||
|
* normal world on wakeup.
|
||||||
|
*/
|
||||||
|
PMF_CAPTURE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_ENTER_HW_LOW_PWR,
|
||||||
|
PMF_NO_CACHE_MAINT);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (psci_plat_pm_ops->pwr_domain_pwr_down_wfi) {
|
if (psci_plat_pm_ops->pwr_domain_pwr_down_wfi) {
|
||||||
/* This function must not return */
|
/* This function must not return */
|
||||||
psci_plat_pm_ops->pwr_domain_pwr_down_wfi(&state_info);
|
psci_plat_pm_ops->pwr_domain_pwr_down_wfi(&state_info);
|
||||||
|
|
|
@ -37,6 +37,8 @@
|
||||||
#include <cpu_data.h>
|
#include <cpu_data.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
#include <platform.h>
|
#include <platform.h>
|
||||||
|
#include <pmf.h>
|
||||||
|
#include <runtime_instr.h>
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "psci_private.h"
|
#include "psci_private.h"
|
||||||
|
|
||||||
|
@ -212,6 +214,19 @@ exit:
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (is_power_down_state) {
|
if (is_power_down_state) {
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Update the timestamp with cache off. We assume this
|
||||||
|
* timestamp can only be read from the current CPU and the
|
||||||
|
* timestamp cache line will be flushed before return to
|
||||||
|
* normal world on wakeup.
|
||||||
|
*/
|
||||||
|
PMF_CAPTURE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_ENTER_HW_LOW_PWR,
|
||||||
|
PMF_NO_CACHE_MAINT);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* The function calls below must not return */
|
/* The function calls below must not return */
|
||||||
if (psci_plat_pm_ops->pwr_domain_pwr_down_wfi)
|
if (psci_plat_pm_ops->pwr_domain_pwr_down_wfi)
|
||||||
psci_plat_pm_ops->pwr_domain_pwr_down_wfi(state_info);
|
psci_plat_pm_ops->pwr_domain_pwr_down_wfi(state_info);
|
||||||
|
@ -219,6 +234,12 @@ exit:
|
||||||
psci_power_down_wfi();
|
psci_power_down_wfi();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
PMF_CAPTURE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_ENTER_HW_LOW_PWR,
|
||||||
|
PMF_NO_CACHE_MAINT);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We will reach here if only retention/standby states have been
|
* We will reach here if only retention/standby states have been
|
||||||
* requested at multiple power levels. This means that the cpu
|
* requested at multiple power levels. This means that the cpu
|
||||||
|
@ -226,6 +247,12 @@ exit:
|
||||||
*/
|
*/
|
||||||
wfi();
|
wfi();
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
PMF_CAPTURE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_EXIT_HW_LOW_PWR,
|
||||||
|
PMF_NO_CACHE_MAINT);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* After we wake up from context retaining suspend, call the
|
* After we wake up from context retaining suspend, call the
|
||||||
* context retaining suspend finisher.
|
* context retaining suspend finisher.
|
||||||
|
|
|
@ -144,6 +144,11 @@ BL31_SOURCES += plat/arm/common/arm_bl31_setup.c \
|
||||||
plat/common/aarch64/platform_mp_stack.S \
|
plat/common/aarch64/platform_mp_stack.S \
|
||||||
plat/common/plat_psci_common.c
|
plat/common/plat_psci_common.c
|
||||||
|
|
||||||
|
ifeq (${ENABLE_PMF}, 1)
|
||||||
|
BL31_SOURCES += plat/arm/common/arm_sip_svc.c \
|
||||||
|
lib/pmf/pmf_smc.c
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq (${TRUSTED_BOARD_BOOT},0)
|
ifneq (${TRUSTED_BOARD_BOOT},0)
|
||||||
|
|
||||||
# By default, ARM platforms use RSA keys
|
# By default, ARM platforms use RSA keys
|
||||||
|
|
|
@ -0,0 +1,104 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2016, 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <arm_sip_svc.h>
|
||||||
|
#include <debug.h>
|
||||||
|
#include <pmf.h>
|
||||||
|
#include <runtime_svc.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <uuid.h>
|
||||||
|
|
||||||
|
|
||||||
|
/* ARM SiP Service UUID */
|
||||||
|
DEFINE_SVC_UUID(arm_sip_svc_uid,
|
||||||
|
0xe2756d55, 0x3360, 0x4bb5, 0xbf, 0xf3,
|
||||||
|
0x62, 0x79, 0xfd, 0x11, 0x37, 0xff);
|
||||||
|
|
||||||
|
static int arm_sip_setup(void)
|
||||||
|
{
|
||||||
|
if (pmf_setup() != 0)
|
||||||
|
return 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This function handles ARM defined SiP Calls
|
||||||
|
*/
|
||||||
|
static uintptr_t arm_sip_handler(unsigned int smc_fid,
|
||||||
|
u_register_t x1,
|
||||||
|
u_register_t x2,
|
||||||
|
u_register_t x3,
|
||||||
|
u_register_t x4,
|
||||||
|
void *cookie,
|
||||||
|
void *handle,
|
||||||
|
u_register_t flags)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Dispatch PMF calls to PMF SMC handler and return its return
|
||||||
|
* value
|
||||||
|
*/
|
||||||
|
if (is_pmf_fid(smc_fid)) {
|
||||||
|
return pmf_smc_handler(smc_fid, x1, x2, x3, x4, cookie,
|
||||||
|
handle, flags);
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (smc_fid) {
|
||||||
|
case ARM_SIP_SVC_CALL_COUNT:
|
||||||
|
/*
|
||||||
|
* Return the number of SiP Service Calls. PMF is the only
|
||||||
|
* SiP service implemented; so return number of PMF calls
|
||||||
|
*/
|
||||||
|
SMC_RET1(handle, PMF_NUM_SMC_CALLS);
|
||||||
|
|
||||||
|
case ARM_SIP_SVC_UID:
|
||||||
|
/* Return UID to the caller */
|
||||||
|
SMC_UUID_RET(handle, arm_sip_svc_uid);
|
||||||
|
|
||||||
|
case ARM_SIP_SVC_VERSION:
|
||||||
|
/* Return the version of current implementation */
|
||||||
|
SMC_RET2(handle, ARM_SIP_SVC_VERSION_MAJOR, ARM_SIP_SVC_VERSION_MINOR);
|
||||||
|
|
||||||
|
default:
|
||||||
|
WARN("Unimplemented ARM SiP Service Call: 0x%x \n", smc_fid);
|
||||||
|
SMC_RET1(handle, SMC_UNK);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Define a runtime service descriptor for fast SMC calls */
|
||||||
|
DECLARE_RT_SVC(
|
||||||
|
arm_sip_svc,
|
||||||
|
OEN_SIP_START,
|
||||||
|
OEN_SIP_END,
|
||||||
|
SMC_TYPE_FAST,
|
||||||
|
arm_sip_setup,
|
||||||
|
arm_sip_handler
|
||||||
|
);
|
|
@ -29,8 +29,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <cpu_data.h>
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
#include <pmf.h>
|
||||||
#include <psci.h>
|
#include <psci.h>
|
||||||
|
#include <runtime_instr.h>
|
||||||
#include <runtime_svc.h>
|
#include <runtime_svc.h>
|
||||||
#include <smcc_helpers.h>
|
#include <smcc_helpers.h>
|
||||||
#include <std_svc.h>
|
#include <std_svc.h>
|
||||||
|
@ -75,9 +78,25 @@ uintptr_t std_svc_smc_handler(uint32_t smc_fid,
|
||||||
* value
|
* value
|
||||||
*/
|
*/
|
||||||
if (is_psci_fid(smc_fid)) {
|
if (is_psci_fid(smc_fid)) {
|
||||||
SMC_RET1(handle,
|
uint64_t ret;
|
||||||
psci_smc_handler(smc_fid, x1, x2, x3, x4,
|
|
||||||
cookie, handle, flags));
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
PMF_WRITE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_ENTER_PSCI,
|
||||||
|
PMF_NO_CACHE_MAINT,
|
||||||
|
get_cpu_data(cpu_data_pmf_ts[CPU_DATA_PMF_TS0_IDX]));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
ret = psci_smc_handler(smc_fid, x1, x2, x3, x4,
|
||||||
|
cookie, handle, flags);
|
||||||
|
|
||||||
|
#if ENABLE_RUNTIME_INSTRUMENTATION
|
||||||
|
PMF_CAPTURE_TIMESTAMP(rt_instr_svc,
|
||||||
|
RT_INSTR_EXIT_PSCI,
|
||||||
|
PMF_NO_CACHE_MAINT);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
SMC_RET1(handle, ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (smc_fid) {
|
switch (smc_fid) {
|
||||||
|
|
Loading…
Reference in New Issue