Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-08 10:08:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spm-mm: Remove mm_svc.h header

Browse source 
The contents of this header have been merged into the spm_mm_svc.h
header file.

Change-Id: I01530b2e4ec1b4c091ce339758025e2216e740a4
Signed-off-by: Paul Beesley <paul.beesley@arm.com>
This commit is contained in:
Paul Beesley 2019-10-15 14:11:41 +00:00 • committed by Manish Pandey
parent 0bf9f567a7
commit 962c44e77c
4 changed files with 26 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

35
include/services/mm_svc.h
View file

@ -1,35 +0,0 @@
/*
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef MM_SVC_H
#define MM_SVC_H
#if SPM_MM
#include <lib/utils_def.h>
#define MM_VERSION_MAJOR U(1)
#define MM_VERSION_MAJOR_SHIFT 16
#define MM_VERSION_MAJOR_MASK U(0x7FFF)
#define MM_VERSION_MINOR U(0)
#define MM_VERSION_MINOR_SHIFT 0
#define MM_VERSION_MINOR_MASK U(0xFFFF)
#define MM_VERSION_FORM(major, minor) ((major << MM_VERSION_MAJOR_SHIFT) | (minor))
#define MM_VERSION_COMPILED MM_VERSION_FORM(MM_VERSION_MAJOR, MM_VERSION_MINOR)
/*
* SMC IDs defined in [1] for accessing MM services from the Non-secure world.
* These FIDs occupy the range 0x40 - 0x5f.
* [1] DEN0060A_ARM_MM_Interface_Specification.pdf
*/
#define MM_VERSION_AARCH32 U(0x84000040)
#define MM_COMMUNICATE_AARCH64 U(0xC4000041)
#define MM_COMMUNICATE_AARCH32 U(0x84000041)
#endif /* SPM_MM */
#endif /* MM_SVC_H */

26
include/services/spm_mm_svc.h
View file

@ -9,6 +9,23 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
/*
* The MM_VERSION_XXX definitions are used when responding to the
* MM_VERSION_AARCH32 service request. The version returned is different between
* this request and the SPM_MM_VERSION_AARCH32 request - both have been retained
* for compatibility.
*/
#define MM_VERSION_MAJOR U(1)
#define MM_VERSION_MAJOR_SHIFT 16
#define MM_VERSION_MAJOR_MASK U(0x7FFF)
#define MM_VERSION_MINOR U(0)
#define MM_VERSION_MINOR_SHIFT 0
#define MM_VERSION_MINOR_MASK U(0xFFFF)
#define MM_VERSION_FORM(major, minor) ((major << MM_VERSION_MAJOR_SHIFT) | \
(minor))
#define MM_VERSION_COMPILED MM_VERSION_FORM(MM_VERSION_MAJOR, \
MM_VERSION_MINOR)
#define SPM_MM_VERSION_MAJOR U(0) #define SPM_MM_VERSION_MAJOR U(0)
#define SPM_MM_VERSION_MAJOR_SHIFT 16 #define SPM_MM_VERSION_MAJOR_SHIFT 16
#define SPM_MM_VERSION_MAJOR_MASK U(0x7FFF) #define SPM_MM_VERSION_MAJOR_MASK U(0x7FFF)
@ -29,6 +46,15 @@
((((_fid) & SPM_MM_FID_MASK) >= SPM_MM_FID_MIN_VALUE) && \ ((((_fid) & SPM_MM_FID_MASK) >= SPM_MM_FID_MIN_VALUE) && \
(((_fid) & SPM_MM_FID_MASK) <= SPM_MM_FID_MAX_VALUE)) (((_fid) & SPM_MM_FID_MASK) <= SPM_MM_FID_MAX_VALUE))
/*
* SMC IDs defined in [1] for accessing MM services from the Non-secure world.
* These FIDs occupy the range 0x40 - 0x5f.
* [1] DEN0060A_ARM_MM_Interface_Specification.pdf
*/
#define MM_VERSION_AARCH32 U(0x84000040)
#define MM_COMMUNICATE_AARCH64 U(0xC4000041)
#define MM_COMMUNICATE_AARCH32 U(0x84000041)
/* /*
* SMC IDs defined for accessing services implemented by the Secure Partition * SMC IDs defined for accessing services implemented by the Secure Partition
* Manager from the Secure Partition(s). These services enable a partition to * Manager from the Secure Partition(s). These services enable a partition to

1
plat/arm/css/sgi/sgi_ras.c
View file

@ -12,7 +12,6 @@
#include <lib/extensions/ras.h> #include <lib/extensions/ras.h>
#include <plat/arm/common/arm_spm_def.h> #include <plat/arm/common/arm_spm_def.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <services/mm_svc.h>
#include <services/sdei.h> #include <services/sdei.h>
#include <services/spm_mm_svc.h> #include <services/spm_mm_svc.h>

1
services/std_svc/spm_mm/spm_main.c
View file

@ -18,7 +18,6 @@
#include <lib/utils.h> #include <lib/utils.h>
#include <lib/xlat_tables/xlat_tables_v2.h> #include <lib/xlat_tables/xlat_tables_v2.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <services/mm_svc.h>
#include <services/spm_mm_partition.h> #include <services/spm_mm_partition.h>
#include <services/spm_mm_svc.h> #include <services/spm_mm_svc.h>
#include <smccc_helpers.h> #include <smccc_helpers.h>