github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-26 15:31:35 +00:00
Code Issues Projects Releases Wiki Activity

hv: seed: refine header file

Browse Source 
1. move seed_info structure from trusty.h to seed.h
2. replace "#include <hypervisor.h>" with necessary including headers
   in seed.c/seed_abl.c/seed_sbl.c

Tracked-On: #2777
Signed-off-by: Qi Yadong <yadong.qi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Qi Yadong 2019-03-15 10:21:21 +08:00 committed by wenlingz
parent 0fb21cfa4a
commit 21d3dc6863
5 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hypervisor/arch/x86/seed/seed.c
View File

@ -3,8 +3,14 @@
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <hypervisor.h>
#include <types.h>
#include <cpu.h>
#include <pgtable.h>
#include <rtl.h>
#include <mmu.h>
#include <sprintf.h>
#include <ept.h>
#include <logmsg.h>
#include <multiboot.h>
#include <crypto_api.h>
#include <seed.h>

5
hypervisor/arch/x86/seed/seed_abl.c
View File

@ -4,7 +4,10 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <hypervisor.h>
#include <types.h>
#include <cpu.h>
#include <pgtable.h>
#include <rtl.h>
#include <seed.h>
#include "seed_abl.h"

6
hypervisor/arch/x86/seed/seed_sbl.c
View File

@ -4,7 +4,11 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <hypervisor.h>
#include <types.h>
#include <cpu.h>
#include <pgtable.h>
#include <rtl.h>
#include <logmsg.h>
#include <seed.h>
#include "seed_sbl.h"

11
hypervisor/include/arch/x86/guest/trusty.h
View File

@ -7,11 +7,10 @@
#ifndef TRUSTY_H_
#define TRUSTY_H_
#include <acrn_hv_defs.h>
#include <seed.h>
#define BOOTLOADER_SEED_MAX_ENTRIES 10U
#define RPMB_MAX_PARTITION_NUMBER 6U
#define MMC_PROD_NAME_WITH_PSN_LEN 15U
#define BUP_MKHI_BOOTLOADER_SEED_LEN 64U
#define TRUSTY_RAM_SIZE (16UL * 1024UL * 1024UL) /* 16 MB for now */
@ -23,14 +22,6 @@
struct acrn_vcpu;
struct acrn_vm;
/* Structure of seed info */
struct seed_info {
uint8_t cse_svn;
uint8_t bios_svn;
uint8_t padding[2];
uint8_t seed[BUP_MKHI_BOOTLOADER_SEED_LEN];
};
/* Structure of key info */
struct trusty_key_info {
uint32_t size_of_this_struct;

12
hypervisor/include/arch/x86/seed.h
View File

@ -7,6 +7,18 @@
#ifndef SEED_H_
#define SEED_H_
#define BOOTLOADER_SEED_MAX_ENTRIES 10U
#define BUP_MKHI_BOOTLOADER_SEED_LEN 64U
/* Structure of seed info */
struct seed_info {
uint8_t cse_svn;
uint8_t bios_svn;
uint8_t padding[2];
uint8_t seed[BUP_MKHI_BOOTLOADER_SEED_LEN];
};
/* Structure of physical seed */
struct physical_seed {
struct seed_info seed_list[BOOTLOADER_SEED_MAX_ENTRIES];
uint32_t num_seeds;