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

Commit 8ae7d9c5 authored by Xiaozhe Shi's avatar Xiaozhe Shi Committed by Abhijeet Dharmapurikar
Browse files

power: qpnp-smbcharger: add PR_MISC as a debug_mask level 



Deprecate some of the older and more spammy debug logs into a separate
PR_MISC debug_mask level to not interfere with normal debugging.

Also, add a PR_STATUS in the external_power_changed function for
whenever the USB current actually is changed. Deprecate the old one that
prints the USB current whenever a power supply changed is called into
the new PR_MISC category.

Change-Id: Ibfedd04b6f0ff706fde80449af173d8f92047790
Signed-off-by: default avatarXiaozhe Shi <xiaozhes@codeaurora.org>
parent 1da9cd04

drivers/power/qpnp-smbcharger.c

+12 −9
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ enum print_reason { 
	PR_STATUS = BIT(2),

	PR_DUMP = BIT(3),

	PR_PM = BIT(4),

	PR_MISC = BIT(5),

};



enum wake_reason {
@@ -573,7 +574,7 @@ static int get_prop_batt_status(struct smbchg_chip *chip) 
	else

		status = POWER_SUPPLY_STATUS_CHARGING;

out:

	pr_smb_rt(PR_STATUS, "CHGR_STS = 0x%02x\n", reg);

	pr_smb_rt(PR_MISC, "CHGR_STS = 0x%02x\n", reg);

	return status;

}
@@ -1684,7 +1685,7 @@ static int smbchg_calc_max_flash_current(struct smbchg_chip *chip) 
	total_flash_power_fw = FLASH_V_THRESHOLD * ibat_flash_ua

			* BUCK_EFFICIENCY;

	total_flash_ua = div64_s64(total_flash_power_fw, VIN_FLASH_UV * 1000LL);

	pr_smb(PR_STATUS,

	pr_smb(PR_MISC,

		"ibat_flash=%lld\n, ocv=%d, ibat=%d, rbatt=%d t_flash=%lld\n",

		ibat_flash_ua, ocv_uv, ibat_ua, rbatt_uohm, total_flash_ua);

	return (int)total_flash_ua;
@@ -1939,7 +1940,7 @@ static void smbchg_external_power_changed(struct power_supply *psy) 
					== POWER_SUPPLY_STATUS_NOT_CHARGING))

			smbchg_restart_charging(chip);

		else if (chip->resume_soc_threshold >= 0)

			pr_smb(PR_STATUS,

			pr_smb(PR_MISC,

				"not resuming, soc: %d - %d, status = %d\n",

				get_prop_batt_capacity(chip),

				chip->resume_soc_threshold,
@@ -1949,7 +1950,7 @@ static void smbchg_external_power_changed(struct power_supply *psy) 
	rc = chip->usb_psy->get_property(chip->usb_psy,

				POWER_SUPPLY_PROP_CHARGING_ENABLED, &prop);

	if (rc < 0)

		pr_smb(PR_STATUS, "could not read USB charge_en, rc=%d\n",

		pr_smb(PR_MISC, "could not read USB charge_en, rc=%d\n",

				rc);

	else

		smbchg_usb_en(chip, prop.intval, REASON_POWER_SUPPLY);
@@ -1961,10 +1962,12 @@ static void smbchg_external_power_changed(struct power_supply *psy) 
			"could not read USB current_max property, rc=%d\n", rc);

	else

		current_limit = prop.intval / 1000;

	pr_smb(PR_STATUS, "current_limit = %d\n", current_limit);



	pr_smb(PR_MISC, "current_limit = %d\n", current_limit);

	mutex_lock(&chip->current_change_lock);

	if (current_limit != chip->usb_target_current_ma) {

		pr_smb(PR_STATUS, "changed current_limit = %d\n",

				current_limit);

		chip->usb_target_current_ma = current_limit;

		rc = smbchg_set_thermal_limited_usb_current_max(chip,

				current_limit);
@@ -2520,9 +2523,9 @@ static void handle_usb_removal(struct smbchg_chip *chip) 
	struct power_supply *parallel_psy = get_parallel_psy(chip);



	if (chip->usb_psy) {

		pr_smb(PR_STATUS, "setting usb psy type = %d\n",

		pr_smb(PR_MISC, "setting usb psy type = %d\n",

				POWER_SUPPLY_TYPE_UNKNOWN);

		pr_smb(PR_STATUS, "setting usb psy present = %d\n",

		pr_smb(PR_MISC, "setting usb psy present = %d\n",

				chip->usb_present);

		power_supply_set_supply_type(chip->usb_psy,

				POWER_SUPPLY_TYPE_UNKNOWN);
@@ -2552,10 +2555,10 @@ static void handle_usb_insertion(struct smbchg_chip *chip) 
	pr_smb(PR_STATUS, "inserted %s, usb psy type = %d stat_5 = 0x%02x\n",

			usb_type_name, usb_supply_type, reg);

	if (chip->usb_psy) {

		pr_smb(PR_STATUS, "setting usb psy type = %d\n",

		pr_smb(PR_MISC, "setting usb psy type = %d\n",

				usb_supply_type);

		power_supply_set_supply_type(chip->usb_psy, usb_supply_type);

		pr_smb(PR_STATUS, "setting usb psy present = %d\n",

		pr_smb(PR_MISC, "setting usb psy present = %d\n",

				chip->usb_present);

		power_supply_set_present(chip->usb_psy, chip->usb_present);

		schedule_work(&chip->usb_set_online_work);