mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2026-01-10 01:21:49 +00:00
79a1e2072d
With introduction of encryption it is becoming impossible to read
NVMEM contents directly from flash. Decrypting the contents each time
there is a read request creates a significant performance hit. NVMEM
needs to be rearchitecture such that there is no need to run
decryption each time NVMEM read is performed.
This patch does just that, implementation details are described in the
header comment in common/nvmem.c.
To reduce memory impact the size of NVMEM is being decreased from 16K
to 12K. This is acceptable because eviction objects stored in NVMEM
serialized now, which dramatically reduces NVMEM size requirements.
The TPM2 NVMEM size definition must be kept in sync.
Another optimization this change introduces is bypassing writing into
the flash if NVMEM contents did not change, which is verified by
examining the hash of the cached storage.
A test is added to verify that the new commit scheme works as
expected, and the nvmem test is re-introduced to the list of test ran
on each 'make buildall'.
CQ-DEPEND=CL:433839
BRANCH=none
BUG=chrome-os-partner:62260,chrome-os-partner:62421
BUG=chrome-os-partner:62437
TEST=ran the following tests, all succeeded
make buildall -j
TEST_LIST_HOST=nvmem make runtests
tcg test suite
corp enroll on reef, reboot a few times, verify that enrollment sticks
Change-Id: I177daa3ceb4fd7aac299ca26b4506b863e31b946
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/433184
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
227 lines
5.3 KiB
C
227 lines
5.3 KiB
C
/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
/* Per-test config flags */
|
|
|
|
#ifndef __TEST_TEST_CONFIG_H
|
|
#define __TEST_TEST_CONFIG_H
|
|
|
|
/* Test config flags only apply for test builds */
|
|
#ifdef TEST_BUILD
|
|
|
|
/* Host commands are sorted. */
|
|
#define CONFIG_HOSTCMD_SECTION_SORTED
|
|
|
|
/* Don't compile features unless specifically testing for them */
|
|
#undef CONFIG_VBOOT_HASH
|
|
#undef CONFIG_USB_PD_LOGGING
|
|
|
|
#ifdef TEST_BKLIGHT_LID
|
|
#define CONFIG_BACKLIGHT_LID
|
|
#endif
|
|
|
|
#ifdef TEST_BKLIGHT_PASSTHRU
|
|
#define CONFIG_BACKLIGHT_LID
|
|
#define CONFIG_BACKLIGHT_REQ_GPIO GPIO_PCH_BKLTEN
|
|
#endif
|
|
|
|
#ifdef TEST_KB_8042
|
|
#define CONFIG_KEYBOARD_PROTOCOL_8042
|
|
#endif
|
|
|
|
#ifdef TEST_KB_MKBP
|
|
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
|
|
#define CONFIG_MKBP_EVENT
|
|
#endif
|
|
|
|
#ifdef TEST_KB_SCAN
|
|
#define CONFIG_KEYBOARD_PROTOCOL_MKBP
|
|
#define CONFIG_MKBP_EVENT
|
|
#endif
|
|
|
|
#ifdef TEST_MATH_UTIL
|
|
#define CONFIG_MATH_UTIL
|
|
#endif
|
|
|
|
#ifdef TEST_MOTION_LID
|
|
#define CONFIG_LID_ANGLE
|
|
#define CONFIG_LID_ANGLE_INVALID_CHECK
|
|
#define CONFIG_LID_ANGLE_TABLET_MODE
|
|
#define CONFIG_LID_ANGLE_SENSOR_BASE 0
|
|
#define CONFIG_LID_ANGLE_SENSOR_LID 1
|
|
#define CONFIG_TABLET_MODE
|
|
#endif
|
|
|
|
#ifdef TEST_RSA
|
|
#define CONFIG_RSA
|
|
#define CONFIG_RSA_KEY_SIZE 2048
|
|
#endif
|
|
|
|
#ifdef TEST_RSA3
|
|
#define CONFIG_RSA
|
|
#define CONFIG_RSA_KEY_SIZE 2048
|
|
#define CONFIG_RSA_EXPONENT_3
|
|
#endif
|
|
|
|
#ifdef TEST_SBS_CHARGING
|
|
#define CONFIG_BATTERY_MOCK
|
|
#define CONFIG_BATTERY_SMART
|
|
#define CONFIG_CHARGER
|
|
#define CONFIG_CHARGER_V1
|
|
#define CONFIG_CHARGER_INPUT_CURRENT 4032
|
|
#define CONFIG_CHARGER_DISCHARGE_ON_AC
|
|
#define CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM
|
|
#define CONFIG_I2C
|
|
#define CONFIG_I2C_MASTER
|
|
int board_discharge_on_ac(int enabled);
|
|
#define I2C_PORT_MASTER 0
|
|
#define I2C_PORT_BATTERY 0
|
|
#define I2C_PORT_CHARGER 0
|
|
#endif
|
|
|
|
#ifdef TEST_SHMALLOC
|
|
#define CONFIG_MALLOC
|
|
#endif
|
|
|
|
#ifdef TEST_SBS_CHARGING_V2
|
|
#define CONFIG_BATTERY_MOCK
|
|
#define CONFIG_BATTERY_SMART
|
|
#define CONFIG_CHARGER
|
|
#define CONFIG_CHARGER_V2
|
|
#define CONFIG_CHARGER_PROFILE_OVERRIDE
|
|
#define CONFIG_CHARGER_INPUT_CURRENT 4032
|
|
#define CONFIG_CHARGER_DISCHARGE_ON_AC
|
|
#define CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM
|
|
#define CONFIG_I2C
|
|
#define CONFIG_I2C_MASTER
|
|
int board_discharge_on_ac(int enabled);
|
|
#define I2C_PORT_MASTER 0
|
|
#define I2C_PORT_BATTERY 0
|
|
#define I2C_PORT_CHARGER 0
|
|
#endif
|
|
|
|
#ifdef TEST_THERMAL
|
|
#define CONFIG_CHIPSET_CAN_THROTTLE
|
|
#define CONFIG_FANS 1
|
|
#define CONFIG_I2C
|
|
#define CONFIG_I2C_MASTER
|
|
#define CONFIG_TEMP_SENSOR
|
|
#define CONFIG_THROTTLE_AP
|
|
#define CONFIG_THERMISTOR_NCP15WB
|
|
#define I2C_PORT_THERMAL 0
|
|
int ncp15wb_calculate_temp(uint16_t adc);
|
|
#endif
|
|
|
|
#ifdef TEST_FAN
|
|
#define CONFIG_FANS 1
|
|
#endif
|
|
|
|
#ifdef TEST_BUTTON
|
|
#define CONFIG_BUTTON_COUNT 2
|
|
#define CONFIG_KEYBOARD_PROTOCOL_8042
|
|
#endif
|
|
|
|
#ifdef TEST_BATTERY_GET_PARAMS_SMART
|
|
#define CONFIG_BATTERY_MOCK
|
|
#define CONFIG_BATTERY_SMART
|
|
#define CONFIG_CHARGER_INPUT_CURRENT 4032
|
|
#define CONFIG_I2C
|
|
#define CONFIG_I2C_MASTER
|
|
#define I2C_PORT_MASTER 0
|
|
#define I2C_PORT_BATTERY 0
|
|
#define I2C_PORT_CHARGER 0
|
|
#endif
|
|
|
|
#ifdef TEST_LIGHTBAR
|
|
#define CONFIG_I2C
|
|
#define CONFIG_I2C_MASTER
|
|
#define I2C_PORT_LIGHTBAR 0
|
|
#define CONFIG_ALS_LIGHTBAR_DIMMING 0
|
|
#endif
|
|
|
|
#if defined(TEST_USB_PD) || defined(TEST_USB_PD_GIVEBACK)
|
|
#define CONFIG_USB_POWER_DELIVERY
|
|
#define CONFIG_USB_PD_CUSTOM_VDM
|
|
#define CONFIG_USB_PD_DUAL_ROLE
|
|
#define CONFIG_USB_PD_PORT_COUNT 2
|
|
#define CONFIG_USB_PD_TCPC
|
|
#define CONFIG_USB_PD_TCPM_STUB
|
|
#define CONFIG_SHA256
|
|
#define CONFIG_SW_CRC
|
|
#ifdef TEST_USB_PD_GIVEBACK
|
|
#define CONFIG_USB_PD_GIVE_BACK
|
|
#endif
|
|
#endif /* TEST_USB_PD || TEST_USB_PD_GIVEBACK */
|
|
|
|
#ifdef TEST_CHARGE_MANAGER
|
|
#define CONFIG_CHARGE_MANAGER
|
|
#undef CONFIG_CHARGE_MANAGER_DRP_CHARGING
|
|
#define CONFIG_USB_PD_DUAL_ROLE
|
|
#define CONFIG_USB_PD_PORT_COUNT 2
|
|
#endif
|
|
|
|
#ifdef TEST_CHARGE_MANAGER_DRP_CHARGING
|
|
#define CONFIG_CHARGE_MANAGER
|
|
#define CONFIG_CHARGE_MANAGER_DRP_CHARGING
|
|
#define CONFIG_USB_PD_DUAL_ROLE
|
|
#define CONFIG_USB_PD_PORT_COUNT 2
|
|
#endif
|
|
|
|
#ifdef TEST_CHARGE_RAMP
|
|
#define CONFIG_CHARGE_RAMP
|
|
#define CONFIG_USB_PD_PORT_COUNT 2
|
|
#endif
|
|
|
|
#ifdef TEST_NVMEM
|
|
#define CONFIG_FLASH_NVMEM
|
|
#define CONFIG_FLASH_NVMEM_OFFSET_A 0x1000
|
|
#define CONFIG_FLASH_NVMEM_OFFSET_B 0x4000
|
|
#define CONFIG_FLASH_NVMEM_BASE_A (CONFIG_PROGRAM_MEMORY_BASE + \
|
|
CONFIG_FLASH_NVMEM_OFFSET_A)
|
|
#define CONFIG_FLASH_NVMEM_BASE_B (CONFIG_PROGRAM_MEMORY_BASE + \
|
|
CONFIG_FLASH_NVMEM_OFFSET_B)
|
|
#define CONFIG_FLASH_NVMEM_SIZE 0x4000
|
|
#define CONFIG_SW_CRC
|
|
|
|
#define NVMEM_PARTITION_SIZE \
|
|
(CONFIG_FLASH_NVMEM_SIZE / NVMEM_NUM_PARTITIONS)
|
|
/* User buffer definitions for test purposes */
|
|
#define NVMEM_USER_2_SIZE 0x201
|
|
#define NVMEM_USER_1_SIZE 0x402
|
|
#define NVMEM_USER_0_SIZE (NVMEM_PARTITION_SIZE - \
|
|
NVMEM_USER_2_SIZE - NVMEM_USER_1_SIZE - \
|
|
sizeof(struct nvmem_tag))
|
|
|
|
#ifndef __ASSEMBLER__
|
|
enum nvmem_users {
|
|
NVMEM_USER_0,
|
|
NVMEM_USER_1,
|
|
NVMEM_USER_2,
|
|
NVMEM_NUM_USERS
|
|
};
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef TEST_NVMEM_VARS
|
|
#define NVMEM_PARTITION_SIZE 0x3000
|
|
#define CONFIG_FLASH_NVMEM_VARS
|
|
#ifndef __ASSEMBLER__
|
|
/* Define the user region numbers */
|
|
enum nvmem_users {
|
|
CONFIG_FLASH_NVMEM_VARS_USER_NUM,
|
|
NVMEM_NUM_USERS
|
|
};
|
|
#endif
|
|
#define CONFIG_FLASH_NVMEM_VARS_USER_SIZE 600
|
|
#endif /* TEST_NVMEM_VARS */
|
|
|
|
#ifndef __ASSEMBLER__
|
|
/* Callback function from charge_manager to send host event */
|
|
static inline void pd_send_host_event(int mask) { }
|
|
#endif
|
|
|
|
#endif /* TEST_BUILD */
|
|
#endif /* __TEST_TEST_CONFIG_H */
|