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

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

Merge "msm: pm: Add support to selectively flush L1/L2 cache"

parents 6e3f47f6 cac50d06

Documentation/devicetree/bindings/arm/msm/pm.txt

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ The optional properties are: 
- qcom,synced-clocks: Indicates that all cpus running off a single clock source and to

	instantiate the necessary clock source.

- qcom,pc-resets-timer: Indicates that the timer gets reset during power collapse.

- qcom,tz-flushes-cache: Indicates that TZ flushes all of the cache during

power collapse. MSM PM can decide to not perform cache flush operations to

reduce latency associated with L2 PC.



Example:

drivers/power/qcom/msm-pm.c

+18 −9
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ enum msm_pc_count_offsets { 
};



static bool msm_pm_ldo_retention_enabled = true;

static bool msm_pm_tz_flushes_cache;

static bool msm_no_ramp_down_pc;

static struct msm_pm_sleep_status_data *msm_pm_slp_sts;

DEFINE_PER_CPU(struct clk *, cpu_clks);
@@ -183,10 +184,12 @@ static bool msm_pm_pc_hotplug(void) 


	flag = lpm_cpu_pre_pc_cb(cpu);



	if (!msm_pm_tz_flushes_cache) {

		if (flag == MSM_SCM_L2_OFF)

			flush_cache_all();

		else if (msm_pm_is_L1_writeback())

			flush_cache_louis();

	}



	msm_pc_inc_debug_count(cpu, MSM_PC_ENTRY_COUNTER);
@@ -214,11 +217,12 @@ int msm_pm_collapse(unsigned long unused) 


	flag = lpm_cpu_pre_pc_cb(cpu);



	if (!msm_pm_tz_flushes_cache) {

		if (flag == MSM_SCM_L2_OFF)

			flush_cache_all();

		else if (msm_pm_is_L1_writeback())

			flush_cache_louis();



	}

	msm_pc_inc_debug_count(cpu, MSM_PC_ENTRY_COUNTER);



	if (is_scm_armv8()) {
@@ -812,6 +816,7 @@ static int msm_cpu_pm_probe(struct platform_device *pdev) 
	struct resource *res = NULL;

	int ret = 0;

	void __iomem *msm_pc_debug_counters_imem;

	char *key;

	int alloc_size = (MAX_NUM_CLUSTER * MAX_CPUS_PER_CLUSTER

					* MSM_PC_NUM_COUNTERS

					* sizeof(*msm_pc_debug_counters));
@@ -845,6 +850,10 @@ static int msm_cpu_pm_probe(struct platform_device *pdev) 
	}

skip_save_imem:

	if (pdev->dev.of_node) {

		key = "qcom,tz-flushes-cache";

		msm_pm_tz_flushes_cache =

				of_property_read_bool(pdev->dev.of_node, key);



		ret = msm_pm_clk_init(pdev);

		if (ret) {

			pr_info("msm_pm_clk_init returned error\n");