sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/common: Rename functions for consistent naming

Browse Source 
Below changes are done:
1. Rename below functions to have consistent naming:
	set_host_ready() -> cse_set_host_ready()
        wait_cse_sec_override_mode() -> cse_wait_sec_override_mode()
	send_hmrfpo_enable_msg()     -> cse_hmrfpo_enable()
	send_hmrfpo_get_status_msg() -> cse_hmrfpo_get_status()

2. Additional debug messages are added in cse_wait_sec_override_mode().

TEST=Build and Boot hatch board.

Change-Id: Icfcf1631cc37faacdea9ad84be55f5710104bad5
Signed-off-by: Rizwan Qureshi <rizwan.qureshi@intel.com>
Signed-off-by: Sridhar Siricilla <sridhar.siricilla@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37282
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Sridhar Siricilla
2019-11-27 14:55:16 +05:30
committed by Patrick Georgi
parent 8e4654527e
commit ff072e6ebf
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/soc/intel/common/block/cse/cse.c
View File

@ -271,7 +271,7 @@ bool cse_is_hfs1_com_soft_temp_disable(void)
} }
/* Makes the host ready to communicate with CSE */ /* Makes the host ready to communicate with CSE */
void set_host_ready(void) void cse_set_host_ready(void)
{ {
uint32_t csr; uint32_t csr;
csr = read_host_csr(); csr = read_host_csr();
@ -280,17 +280,20 @@ void set_host_ready(void)
write_host_csr(csr); write_host_csr(csr);
} }
/* Polls for ME state 'HECI_OP_MODE_SEC_OVERRIDE' for 15 seconds */ /* Polls for ME mode ME_HFS1_COM_SECOVER_MEI_MSG for 15 seconds */
uint8_t wait_cse_sec_override_mode(void) uint8_t cse_wait_sec_override_mode(void)
{ {
struct stopwatch sw; struct stopwatch sw;
stopwatch_init_msecs_expire(&sw, HECI_DELAY_READY); stopwatch_init_msecs_expire(&sw, HECI_DELAY_READY);
while (!cse_is_hfs1_com_secover_mei_msg()) { while (!cse_is_hfs1_com_secover_mei_msg()) {
udelay(HECI_DELAY); udelay(HECI_DELAY);
if (stopwatch_expired(&sw)) if (stopwatch_expired(&sw)) {
printk(BIOS_ERR, "HECI: Timed out waiting for SEC_OVERRIDE mode!\n");
return 0; return 0;
}
} }
printk(BIOS_DEBUG, "HECI: CSE took %lu ms to enter security override mode\n",
stopwatch_duration_msecs(&sw));
return 1; return 1;
} }
@ -544,7 +547,7 @@ int heci_reset(void)
if (wait_heci_ready()) { if (wait_heci_ready()) {
/* Device is back on its imaginary feet, clear reset */ /* Device is back on its imaginary feet, clear reset */
set_host_ready(); cse_set_host_ready();
return 1; return 1;
} }
@ -622,7 +625,7 @@ int send_heci_reset_req_message(uint8_t rst_type)
} }
/* Sends HMRFPO Enable command to CSE */ /* Sends HMRFPO Enable command to CSE */
int send_hmrfpo_enable_msg(void) int cse_hmrfpo_enable(void)
{ {
struct hmrfpo_enable_msg { struct hmrfpo_enable_msg {
struct mkhi_hdr hdr; struct mkhi_hdr hdr;
@ -682,7 +685,7 @@ failed:
* Sends HMRFPO Get Status command to CSE to get the HMRFPO status. * Sends HMRFPO Get Status command to CSE to get the HMRFPO status.
* The status can be DISABLES/LOCKED/ENABLED * The status can be DISABLES/LOCKED/ENABLED
*/ */
int send_hmrfpo_get_status_msg(void) int cse_hmrfpo_get_status(void)
{ {
struct hmrfpo_get_status_msg { struct hmrfpo_get_status_msg {
struct mkhi_hdr hdr; struct mkhi_hdr hdr;

12
src/soc/intel/common/block/include/intelblocks/cse.h
View File

@ -51,7 +51,7 @@ enum {
PCI_ME_HFSTS6 = 0x6C, PCI_ME_HFSTS6 = 0x6C,
}; };
/* HECI Message Header */ /* MKHI Message Header */
struct mkhi_hdr { struct mkhi_hdr {
uint8_t group_id; uint8_t group_id;
uint8_t command:7; uint8_t command:7;
@ -103,14 +103,14 @@ uint32_t me_read_config32(int offset);
*/ */
bool is_cse_enabled(void); bool is_cse_enabled(void);
/* Makes the host ready to communicate with CSE*/ /* Makes the host ready to communicate with CSE */
void set_host_ready(void); void cse_set_host_ready(void);
/* /*
* Polls for ME state 'HECI_OP_MODE_SEC_OVERRIDE' for 15 seconds. * Polls for ME state 'HECI_OP_MODE_SEC_OVERRIDE' for 15 seconds.
* Returns 0 on failure and 1 on success. * Returns 0 on failure and 1 on success.
*/ */
uint8_t wait_cse_sec_override_mode(void); uint8_t cse_wait_sec_override_mode(void);
/* /*
* Sends GLOBAL_RESET_REQ cmd to CSE.The reset type can be * Sends GLOBAL_RESET_REQ cmd to CSE.The reset type can be
@ -123,14 +123,14 @@ int send_heci_reset_req_message(uint8_t rst_type);
* Send HMRFPO_ENABLE command. * Send HMRFPO_ENABLE command.
* returns 0 on failure and 1 on success. * returns 0 on failure and 1 on success.
*/ */
int send_hmrfpo_enable_msg(void); int cse_hmrfpo_enable(void);
/* /*
* Send HMRFPO_GET_STATUS command. * Send HMRFPO_GET_STATUS command.
* returns -1 on failure and 0 (DISABLED)/ 1 (LOCKED)/ 2 (ENABLED) * returns -1 on failure and 0 (DISABLED)/ 1 (LOCKED)/ 2 (ENABLED)
* on success. * on success.
*/ */
int send_hmrfpo_get_status_msg(void); int cse_hmrfpo_get_status(void);
/* Fixed Address MEI Header's Host Address field value */ /* Fixed Address MEI Header's Host Address field value */
#define BIOS_HOST_ADDR 0x00 #define BIOS_HOST_ADDR 0x00