|
@@ -2443,39 +2443,21 @@ struct cgr_comp {
|
|
struct completion completion;
|
|
struct completion completion;
|
|
};
|
|
};
|
|
|
|
|
|
-static int qman_delete_cgr_thread(void *p)
|
|
|
|
|
|
+static void qman_delete_cgr_smp_call(void *p)
|
|
{
|
|
{
|
|
- struct cgr_comp *cgr_comp = (struct cgr_comp *)p;
|
|
|
|
- int ret;
|
|
|
|
-
|
|
|
|
- ret = qman_delete_cgr(cgr_comp->cgr);
|
|
|
|
- complete(&cgr_comp->completion);
|
|
|
|
-
|
|
|
|
- return ret;
|
|
|
|
|
|
+ qman_delete_cgr((struct qman_cgr *)p);
|
|
}
|
|
}
|
|
|
|
|
|
void qman_delete_cgr_safe(struct qman_cgr *cgr)
|
|
void qman_delete_cgr_safe(struct qman_cgr *cgr)
|
|
{
|
|
{
|
|
- struct task_struct *thread;
|
|
|
|
- struct cgr_comp cgr_comp;
|
|
|
|
-
|
|
|
|
preempt_disable();
|
|
preempt_disable();
|
|
if (qman_cgr_cpus[cgr->cgrid] != smp_processor_id()) {
|
|
if (qman_cgr_cpus[cgr->cgrid] != smp_processor_id()) {
|
|
- init_completion(&cgr_comp.completion);
|
|
|
|
- cgr_comp.cgr = cgr;
|
|
|
|
- thread = kthread_create(qman_delete_cgr_thread, &cgr_comp,
|
|
|
|
- "cgr_del");
|
|
|
|
-
|
|
|
|
- if (IS_ERR(thread))
|
|
|
|
- goto out;
|
|
|
|
-
|
|
|
|
- kthread_bind(thread, qman_cgr_cpus[cgr->cgrid]);
|
|
|
|
- wake_up_process(thread);
|
|
|
|
- wait_for_completion(&cgr_comp.completion);
|
|
|
|
|
|
+ smp_call_function_single(qman_cgr_cpus[cgr->cgrid],
|
|
|
|
+ qman_delete_cgr_smp_call, cgr, true);
|
|
preempt_enable();
|
|
preempt_enable();
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-out:
|
|
|
|
|
|
+
|
|
qman_delete_cgr(cgr);
|
|
qman_delete_cgr(cgr);
|
|
preempt_enable();
|
|
preempt_enable();
|
|
}
|
|
}
|