From c5cb7c90bff980ab0ba0128ac7aaf548bfa04468 Mon Sep 17 00:00:00 2001 From: Kazuki Hashimoto Date: Thu, 12 May 2022 20:51:21 +0900 Subject: [PATCH] Revert "devfreq: memlat: track cpu during ipi to cluster" Gosh no. This reverts commit 92735374a16196d19ae7ff3c32c6cf5ec9561657. Signed-off-by: Kazuki Hashimoto Signed-off-by: UtsavBalar1231 Change-Id: I99d2f77c64e728ea949a4b8f4b08408648da0781 --- drivers/devfreq/arm-memlat-mon.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/devfreq/arm-memlat-mon.c b/drivers/devfreq/arm-memlat-mon.c index fd64b0b7c75d..4a92775d3b96 100644 --- a/drivers/devfreq/arm-memlat-mon.c +++ b/drivers/devfreq/arm-memlat-mon.c @@ -128,7 +128,6 @@ struct memlat_cpu_grp { cpumask_t cpus; unsigned int common_ev_ids[NUM_COMMON_EVS]; struct cpu_data *cpus_data; - int read_event_cpu; ktime_t last_update_ts; unsigned long last_ts_delta_us; @@ -185,11 +184,8 @@ static void update_counts(struct memlat_cpu_grp *cpu_grp) struct cpu_data *cpu_data = to_cpu_data(cpu_grp, cpu); struct event_data *common_evs = cpu_data->common_evs; - for (i = 0; i < NUM_COMMON_EVS; i++) { - cpu_grp->read_event_cpu = cpu; + for (i = 0; i < NUM_COMMON_EVS; i++) read_event(&common_evs[i]); - cpu_grp->read_event_cpu = -1; - } if (!common_evs[STALL_IDX].pevent) common_evs[STALL_IDX].last_delta = @@ -213,13 +209,11 @@ static void update_counts(struct memlat_cpu_grp *cpu_grp) for_each_cpu(cpu, &mon->cpus) { unsigned int mon_idx = cpu - cpumask_first(&mon->cpus); - cpu_grp->read_event_cpu = cpu; read_event(&mon->miss_ev[mon_idx]); if (mon->wb_ev_id && mon->access_ev_id) { read_event(&mon->wb_ev[mon_idx]); read_event(&mon->access_ev[mon_idx]); } - cpu_grp->read_event_cpu = -1; } } } @@ -573,8 +567,6 @@ static int memlat_cpu_grp_probe(struct platform_device *pdev) return -ENODEV; } - cpu_grp->read_event_cpu = -1; - num_mons = of_get_available_child_count(dev->of_node); if (!num_mons) {