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

ec/google/chromeec: Deprecate dev_index from google_chromeec_reboot

Browse Source 
This removes the dev_index argument from the google_chromeec_reboot
API. It's always set to 0, so don't bother passing it.

BUG=b:258126464
BRANCH=none
TEST=none

Change-Id: Iadc3d7c6c1e048e4b1ab8f8cec3cb8eb8db38e6a
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69373
Reviewed-by: Yu-Ping Wu <yupingso@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Caveh Jalali 2022-11-01 02:02:56 -07:00 committed by Martin L Roth
parent 675de7524c
commit 603de3f763
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ec/google/chromeec/ec.c
View File

@ -790,7 +790,7 @@ int rtc_get(struct rtc_time *time)
} }
#endif #endif
int google_chromeec_reboot(int dev_idx, enum ec_reboot_cmd type, uint8_t flags) int google_chromeec_reboot(enum ec_reboot_cmd type, uint8_t flags)
{ {
struct ec_params_reboot_ec params = { struct ec_params_reboot_ec params = {
.cmd = type, .cmd = type,
@ -804,7 +804,7 @@ int google_chromeec_reboot(int dev_idx, enum ec_reboot_cmd type, uint8_t flags)
.cmd_data_out = &resp, .cmd_data_out = &resp,
.cmd_size_in = sizeof(params), .cmd_size_in = sizeof(params),
.cmd_size_out = 0, /* ignore response, if any */ .cmd_size_out = 0, /* ignore response, if any */
.cmd_dev_index = dev_idx, .cmd_dev_index = 0,
}; };
return google_chromeec_command(&cmd); return google_chromeec_command(&cmd);

2
src/ec/google/chromeec/ec.h
View File

@ -88,7 +88,7 @@ int google_chromeec_vstore_write(int slot, uint8_t *data, size_t size);
/* Issue reboot command to EC with specified type and flags. Returns 0 on /* Issue reboot command to EC with specified type and flags. Returns 0 on
success, < 0 otherwise. */ success, < 0 otherwise. */
int google_chromeec_reboot(int dev_idx, enum ec_reboot_cmd type, uint8_t flags); int google_chromeec_reboot(enum ec_reboot_cmd type, uint8_t flags);
/** /**
* Get data from Cros Board Info * Get data from Cros Board Info

2
src/mainboard/google/herobrine/reset.c
View File

@ -7,5 +7,5 @@
but this works well enough for our purposes. */ but this works well enough for our purposes. */
void do_board_reset(void) void do_board_reset(void)
{ {
google_chromeec_reboot(0, EC_REBOOT_COLD, 0); google_chromeec_reboot(EC_REBOOT_COLD, 0);
} }

2
src/mainboard/google/trogdor/reset.c
View File

@ -7,5 +7,5 @@
but this works well enough for our purposes. */ but this works well enough for our purposes. */
void do_board_reset(void) void do_board_reset(void)
{ {
google_chromeec_reboot(0, EC_REBOOT_COLD, 0); google_chromeec_reboot(EC_REBOOT_COLD, 0);
} }

8
src/security/vboot/ec_sync.c
View File

@ -56,7 +56,7 @@ void vboot_sync_ec(void)
case VB2_REQUEST_REBOOT_EC_TO_RO: case VB2_REQUEST_REBOOT_EC_TO_RO:
printk(BIOS_INFO, "EC Reboot requested. Doing cold reboot\n"); printk(BIOS_INFO, "EC Reboot requested. Doing cold reboot\n");
if (google_chromeec_reboot(0, EC_REBOOT_COLD, 0)) if (google_chromeec_reboot(EC_REBOOT_COLD, 0))
printk(BIOS_EMERG, "Failed to get EC to cold reboot\n"); printk(BIOS_EMERG, "Failed to get EC to cold reboot\n");
halt(); halt();
@ -65,7 +65,7 @@ void vboot_sync_ec(void)
/* Only for EC-EFS */ /* Only for EC-EFS */
case VB2_REQUEST_REBOOT_EC_SWITCH_RW: case VB2_REQUEST_REBOOT_EC_SWITCH_RW:
printk(BIOS_INFO, "Switch EC slot requested. Doing cold reboot\n"); printk(BIOS_INFO, "Switch EC slot requested. Doing cold reboot\n");
if (google_chromeec_reboot(0, EC_REBOOT_COLD, if (google_chromeec_reboot(EC_REBOOT_COLD,
EC_REBOOT_FLAG_SWITCH_RW_SLOT)) EC_REBOOT_FLAG_SWITCH_RW_SLOT))
printk(BIOS_EMERG, "Failed to get EC to cold reboot\n"); printk(BIOS_EMERG, "Failed to get EC to cold reboot\n");
@ -510,7 +510,7 @@ vb2_error_t vb2ex_ec_get_expected_image_hash(enum vb2_firmware_selection select,
*/ */
vb2_error_t vb2ex_ec_disable_jump(void) vb2_error_t vb2ex_ec_disable_jump(void)
{ {
if (google_chromeec_reboot(0, EC_REBOOT_DISABLE_JUMP, 0)) if (google_chromeec_reboot(EC_REBOOT_DISABLE_JUMP, 0))
return VB2_ERROR_UNKNOWN; return VB2_ERROR_UNKNOWN;
return VB2_SUCCESS; return VB2_SUCCESS;
@ -531,7 +531,7 @@ vb2_error_t vb2ex_ec_jump_to_rw(void)
{ {
struct stopwatch sw; struct stopwatch sw;
if (google_chromeec_reboot(0, EC_REBOOT_JUMP_RW, 0)) if (google_chromeec_reboot(EC_REBOOT_JUMP_RW, 0))
return VB2_ERROR_UNKNOWN; return VB2_ERROR_UNKNOWN;
/* Give the EC 3 seconds to sysjump */ /* Give the EC 3 seconds to sysjump */