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

Commit bc0baeac authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Split system low power mode state id for sdxpoorwills"

parents d22cfb7d 198bfe24

arch/arm/boot/dts/qcom/sdxpoorwills-pm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
			qcom,pm-cluster-level@1 {

				reg = <1>;

				label = "cx_min";

				qcom,psci-mode = <0x0>;

				qcom,psci-mode = <0x4>;

				qcom,latency-us = <285>;

				qcom,ss-power = <442>;

				qcom,energy-overhead = <306621>;
@@ -81,7 +81,7 @@ 
				qcom,pm-cpu-level@2 {

					reg = <2>;

					label = "system-pc";

					qcom,psci-cpu-mode = <0x8>;

					qcom,psci-cpu-mode = <0x4>;

					qcom,latency-us = <270>;

					qcom,ss-power = <455>;

					qcom,energy-overhead = <270621>;

drivers/cpuidle/lpm-levels.c

+4 −4
Original line number Diff line number Diff line
@@ -1256,13 +1256,13 @@ static int get_cluster_id(struct lpm_cluster *cluster, int *aff_lvl, 
				&cluster->child_cpus))

		goto unlock_and_return;



	state_id |= get_cluster_id(cluster->parent, aff_lvl, from_idle);

	state_id += get_cluster_id(cluster->parent, aff_lvl, from_idle);



	if (cluster->last_level != cluster->default_level) {

		struct lpm_cluster_level *level

			= &cluster->levels[cluster->last_level];



		state_id |= (level->psci_id & cluster->psci_mode_mask)

		state_id += (level->psci_id & cluster->psci_mode_mask)

					<< cluster->psci_mode_shift;



		/*
@@ -1272,7 +1272,7 @@ static int get_cluster_id(struct lpm_cluster *cluster, int *aff_lvl, 
		if (level->notify_rpm)

			if (sys_pm_ops && sys_pm_ops->update_wakeup)

				sys_pm_ops->update_wakeup(from_idle);

		if (level->psci_id)

		if (cluster->psci_mode_shift)

			(*aff_lvl)++;

	}

unlock_and_return:
@@ -1303,7 +1303,7 @@ static bool psci_enter_sleep(struct lpm_cpu *cpu, int idx, bool from_idle) 
	state_id = get_cluster_id(cpu->parent, &affinity_level, from_idle);

	power_state = PSCI_POWER_STATE(cpu->levels[idx].is_reset);

	affinity_level = PSCI_AFFINITY_LEVEL(affinity_level);

	state_id |= power_state | affinity_level | cpu->levels[idx].psci_id;

	state_id += power_state + affinity_level + cpu->levels[idx].psci_id;



	update_debug_pc_event(CPU_ENTER, state_id,

			0xdeaffeed, 0xdeaffeed, from_idle);