Commit 8df03872 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner

bus/arm-ccn: Use cpu-hp's multi instance support instead custom list

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: rt@linutronix.de
Link: http://lkml.kernel.org/r/1471024183-12666-6-git-send-email-bigeasy@linutronix.deSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b230f0db
...@@ -167,7 +167,7 @@ struct arm_ccn_dt { ...@@ -167,7 +167,7 @@ struct arm_ccn_dt {
struct hrtimer hrtimer; struct hrtimer hrtimer;
cpumask_t cpu; cpumask_t cpu;
struct list_head entry; struct hlist_node node;
struct pmu pmu; struct pmu pmu;
}; };
...@@ -189,9 +189,6 @@ struct arm_ccn { ...@@ -189,9 +189,6 @@ struct arm_ccn {
struct arm_ccn_dt dt; struct arm_ccn_dt dt;
}; };
static DEFINE_MUTEX(arm_ccn_mutex);
static LIST_HEAD(arm_ccn_list);
static int arm_ccn_node_to_xp(int node) static int arm_ccn_node_to_xp(int node)
{ {
return node / CCN_NUM_XP_PORTS; return node / CCN_NUM_XP_PORTS;
...@@ -1173,30 +1170,24 @@ static enum hrtimer_restart arm_ccn_pmu_timer_handler(struct hrtimer *hrtimer) ...@@ -1173,30 +1170,24 @@ static enum hrtimer_restart arm_ccn_pmu_timer_handler(struct hrtimer *hrtimer)
} }
static int arm_ccn_pmu_offline_cpu(unsigned int cpu) static int arm_ccn_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)
{ {
struct arm_ccn_dt *dt; struct arm_ccn_dt *dt = hlist_entry_safe(node, struct arm_ccn_dt, node);
unsigned int target;
mutex_lock(&arm_ccn_mutex);
list_for_each_entry(dt, &arm_ccn_list, entry) {
struct arm_ccn *ccn = container_of(dt, struct arm_ccn, dt); struct arm_ccn *ccn = container_of(dt, struct arm_ccn, dt);
unsigned int target;
if (!cpumask_test_and_clear_cpu(cpu, &dt->cpu)) if (!cpumask_test_and_clear_cpu(cpu, &dt->cpu))
continue; return 0;
target = cpumask_any_but(cpu_online_mask, cpu); target = cpumask_any_but(cpu_online_mask, cpu);
if (target >= nr_cpu_ids) if (target >= nr_cpu_ids)
continue; return 0;
perf_pmu_migrate_context(&dt->pmu, cpu, target); perf_pmu_migrate_context(&dt->pmu, cpu, target);
cpumask_set_cpu(target, &dt->cpu); cpumask_set_cpu(target, &dt->cpu);
if (ccn->irq) if (ccn->irq)
WARN_ON(irq_set_affinity_hint(ccn->irq, &dt->cpu) != 0); WARN_ON(irq_set_affinity_hint(ccn->irq, &dt->cpu) != 0);
}
mutex_unlock(&arm_ccn_mutex);
return 0; return 0;
} }
static DEFINE_IDA(arm_ccn_pmu_ida); static DEFINE_IDA(arm_ccn_pmu_ida);
static int arm_ccn_pmu_init(struct arm_ccn *ccn) static int arm_ccn_pmu_init(struct arm_ccn *ccn)
...@@ -1278,9 +1269,8 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) ...@@ -1278,9 +1269,8 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn)
if (err) if (err)
goto error_pmu_register; goto error_pmu_register;
mutex_lock(&arm_ccn_mutex); cpuhp_state_add_instance_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE,
list_add(&ccn->dt.entry, &arm_ccn_list); &ccn->dt.node);
mutex_unlock(&arm_ccn_mutex);
return 0; return 0;
error_pmu_register: error_pmu_register:
...@@ -1296,10 +1286,8 @@ static void arm_ccn_pmu_cleanup(struct arm_ccn *ccn) ...@@ -1296,10 +1286,8 @@ static void arm_ccn_pmu_cleanup(struct arm_ccn *ccn)
{ {
int i; int i;
mutex_lock(&arm_ccn_mutex); cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE,
list_del(&ccn->dt.entry); &ccn->dt.node);
mutex_unlock(&arm_ccn_mutex);
if (ccn->irq) if (ccn->irq)
irq_set_affinity_hint(ccn->irq, NULL); irq_set_affinity_hint(ccn->irq, NULL);
for (i = 0; i < ccn->num_xps; i++) for (i = 0; i < ccn->num_xps; i++)
...@@ -1527,7 +1515,7 @@ static int __init arm_ccn_init(void) ...@@ -1527,7 +1515,7 @@ static int __init arm_ccn_init(void)
{ {
int i, ret; int i, ret;
ret = cpuhp_setup_state_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE, ret = cpuhp_setup_state_multi(CPUHP_AP_PERF_ARM_CCN_ONLINE,
"AP_PERF_ARM_CCN_ONLINE", NULL, "AP_PERF_ARM_CCN_ONLINE", NULL,
arm_ccn_pmu_offline_cpu); arm_ccn_pmu_offline_cpu);
if (ret) if (ret)
...@@ -1541,7 +1529,7 @@ static int __init arm_ccn_init(void) ...@@ -1541,7 +1529,7 @@ static int __init arm_ccn_init(void)
static void __exit arm_ccn_exit(void) static void __exit arm_ccn_exit(void)
{ {
cpuhp_remove_state_nocalls(CPUHP_AP_PERF_ARM_CCN_ONLINE); cpuhp_remove_multi_state(CPUHP_AP_PERF_ARM_CCN_ONLINE);
platform_driver_unregister(&arm_ccn_driver); platform_driver_unregister(&arm_ccn_driver);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment