scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-27 18:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

i2c: Lock out i2c passthru except for desired ports

Browse Source 
Lock out all non-essential i2c passthru ports when system is protected.

BUG=chrome-os-partner:58859
BRANCH=gru
TEST='ectool i2cxfer 0 0 0 0' on locked system, verify that "ACCESS
DENIED" is returned.

Change-Id: If4119bbb319aa491d0e79a9ed80c94daa7950c2f
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/403543
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Philip Chen <philipchen@chromium.org>
Commit-Queue: Philip Chen <philipchen@chromium.org>
(cherry picked from commit d29fdb5484b994937c6586a50dd2818028f15f3f)
Reviewed-on: https://chromium-review.googlesource.com/415493
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
This commit is contained in:
Shawn Nematbakhsh
2016-10-26 16:11:45 -07:00
committed by chrome-bot
parent 2c1626eb45
commit 5602f4d515
5 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
board/kevin/board.c
View File

@@ -752,3 +752,8 @@ static void pwm_displight_preserve_state(void)
sizeof(pwm_displight_duty), &pwm_displight_duty);
}
DECLARE_HOOK(HOOK_SYSJUMP, pwm_displight_preserve_state, HOOK_PRIO_DEFAULT);
int board_allow_i2c_passthru(int port)
{
return (port == I2C_PORT_VIRTUAL_BATTERY);
}

1
board/kevin/board.h
View File

@@ -17,6 +17,7 @@
#define CONFIG_I2C
#define CONFIG_I2C_MASTER
#define CONFIG_I2C_VIRTUAL_BATTERY
#define CONFIG_I2C_PASSTHRU_RESTRICTED
#define CONFIG_LED_COMMON
#define CONFIG_LOW_POWER_IDLE
#define CONFIG_POWER_COMMON

5
board/rambi/board.c
View File

@@ -103,3 +103,8 @@ const struct temp_sensor_t temp_sensors[] = {
{"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4},
};
BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
int board_allow_i2c_passthru(int port)
{
return 0;
}

15
common/i2c.c
View File

@@ -542,11 +542,6 @@ static int i2c_command_passthru(struct host_cmd_handler_args *args)
uint8_t batt_param = 0;
#endif
#ifdef CONFIG_I2C_PASSTHRU_RESTRICTED
if (system_is_locked())
return EC_RES_ACCESS_DENIED;
#endif
#ifdef CONFIG_BATTERY_CUT_OFF
/*
* Some batteries would wake up after cut-off if we talk to it.
@@ -624,9 +619,17 @@ static int i2c_command_passthru(struct host_cmd_handler_args *args)
"write_len=%x, data=%p, read_len=%x, flags=%x",
params->port, addr, out, write_len,
&resp->data[in_len], read_len, xferflags);
if (rv)
if (rv) {
#ifdef CONFIG_I2C_PASSTHRU_RESTRICTED
if (system_is_locked() &&
!board_allow_i2c_passthru(params->port)) {
i2c_lock(params->port, 0);
return EC_RES_ACCESS_DENIED;
}
#endif
rv = i2c_xfer(params->port, addr, out, write_len,
&resp->data[in_len], read_len, xferflags);
}
if (rv) {
/* Driver will have sent a stop bit here */

9
include/i2c.h
View File

@@ -324,4 +324,13 @@ int i2c_set_response(int port, uint8_t *buf, int len);
*/
void i2cm_init(void);
/**
* Board-level function to determine whether i2c passthru should be allowed
* on a given port.
*
* @parm port I2C port
*
* @return true, if passthru should be allowed on the port.
*/
int board_allow_i2c_passthru(int port);
#endif /* __CROS_EC_I2C_H */