github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-29 18:35:01 +00:00
Code Issues Projects Releases Wiki Activity

dm: cmos: move cmos storage out of vmctx

Browse Source 
The whole vmctx will be cleared during cold reset.
cmos data should not be cleared during cold reset.
Move cmos data out of vmctx.

Tracked-On: #1118
Signed-off-by: Binbin Wu <binbin.wu@intel.com>
Acked-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Binbin Wu 2018-08-29 14:32:08 +08:00 committed by lijinxia
parent fa7eb1f6ae
commit a8ac452edb
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devicemodel/hw/platform/cmos_io.c
View File

@ -42,6 +42,11 @@
#define CMOS_VRPMB_START 0x20
#define CMOS_VRPMB_END 0x9F
/* cmos buffer used to store write/read contents,
* and it should not be cleared when reboot
*/
static uint8_t cmos_buffer[CMOS_BUF_SIZE];
/* #define CMOS_DEBUG */
#ifdef CMOS_DEBUG
static FILE * dbg_file;
@ -90,14 +95,14 @@ cmos_io_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
}
if (in) {
*eax = ctx->cmos_buffer[buf_offset];
*eax = cmos_buffer[buf_offset];
/* read to clear for Key range */
if ((buf_offset >= CMOS_VRPMB_START) &&
(buf_offset <= CMOS_VRPMB_END))
ctx->cmos_buffer[buf_offset] = 0;
cmos_buffer[buf_offset] = 0;
}
else
ctx->cmos_buffer[buf_offset] = (uint8_t)*eax;
cmos_buffer[buf_offset] = (uint8_t)*eax;
next_ops = 0;
}
@ -110,7 +115,7 @@ INOUT_PORT(cmos_io, CMOS_DATA, IOPORT_F_INOUT, cmos_io_handler);
int init_cmos_vrpmb(struct vmctx *ctx)
{
uint8_t *vrpmb_buffer = &ctx->cmos_buffer[CMOS_VRPMB_START];
uint8_t *vrpmb_buffer = &cmos_buffer[CMOS_VRPMB_START];
/* get vrpmb key, and store it to cmos buffer */
if (!get_vrpmb_key(vrpmb_buffer, RPMB_KEY_LEN)) {

4
devicemodel/include/vmmapi.h
View File

@ -63,10 +63,6 @@ struct vmctx {
void *atkbdc_base;
void *vrtc;
void *ioc_dev;
/* cmos buffer used to store write/read contents,
* and it should not be cleared when reboot
*/
uint8_t cmos_buffer[CMOS_BUF_SIZE];
};
/*