Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c89b78c2 authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy
Browse files

power: qpnp-fg-gen4: Update whitelisting values for profile integrity bit 



Profile integrity word holds the data that indicates whether the
bootloader or HLOS has loaded the profile or an SOC estimate is
done etc. So far bits 0:3 are used for indicating this. Bit 4 is
added to represent whether the profile is loaded for the first
time. This can be used later to clear SOH data stored by the
userspace.

Change-Id: I9bb39d2df3d948fe4253b4241a02db28053d8346
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent 71644d76

drivers/power/supply/qcom/qpnp-fg-gen4.c

+18 −4
Original line number Diff line number Diff line
@@ -1579,12 +1579,20 @@ static void clear_battery_profile(struct fg_dev *fg) 
#define BOOTLOADER_LOAD_BIT	BIT(1)

#define BOOTLOADER_RESTART_BIT	BIT(2)

#define HLOS_RESTART_BIT	BIT(3)

#define FIRST_PROFILE_LOAD_BIT	BIT(4)

static bool is_profile_load_required(struct fg_gen4_chip *chip)

{

	struct fg_dev *fg = &chip->fg;

	u8 buf[PROFILE_COMP_LEN], val;

	bool profiles_same = false;

	int rc;

	bool profiles_same = false, valid_integrity = false;

	int rc, i;

	u8 white_list_values[] = {

		HLOS_RESTART_BIT,

		BOOTLOADER_LOAD_BIT,

		BOOTLOADER_LOAD_BIT | BOOTLOADER_RESTART_BIT,

		BOOTLOADER_RESTART_BIT | HLOS_RESTART_BIT,

		BOOTLOADER_LOAD_BIT | FIRST_PROFILE_LOAD_BIT,

	};



	rc = fg_sram_read(fg, PROFILE_INTEGRITY_WORD,

			PROFILE_INTEGRITY_OFFSET, &val, 1, FG_IMA_DEFAULT);
@@ -1599,8 +1607,14 @@ static bool is_profile_load_required(struct fg_gen4_chip *chip) 


		/* Whitelist the values */

		val &= ~PROFILE_LOAD_BIT;

		if (val != HLOS_RESTART_BIT && val != BOOTLOADER_LOAD_BIT &&

			val != (BOOTLOADER_LOAD_BIT | BOOTLOADER_RESTART_BIT)) {

		for (i = 0; i < ARRAY_SIZE(white_list_values); i++)  {

			if (val == white_list_values[i]) {

				valid_integrity = true;

				break;

			}

		}



		if (!valid_integrity) {

			val |= PROFILE_LOAD_BIT;

			pr_warn("Garbage value in profile integrity word: 0x%x\n",

				val);