diff options
3 files changed, 12 insertions, 13 deletions
diff --git a/drivers/staging/vc04_services/interface/TODO b/drivers/staging/vc04_services/interface/TODO index 57a2d6761f9b..05eb5140d096 100644 --- a/drivers/staging/vc04_services/interface/TODO +++ b/drivers/staging/vc04_services/interface/TODO @@ -16,6 +16,13 @@ some of the ones we want: to manage these buffers as dmabufs so that we can zero-copy import camera images into vc4 for rendering/display. +* Fix kernel module support + +Even the VPU firmware doesn't support a VCHI re-connect, the driver +should properly handle a module unload. This also includes that all +resources must be freed (kthreads, debugfs entries, ...) and global +variables avoided. + * Documentation A short top-down description of this driver's architecture (function of diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 1d21f9cfbfe5..ad506016fc93 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -726,9 +726,8 @@ void free_bulk_waiter(struct vchiq_instance *instance) int vchiq_shutdown(struct vchiq_instance *instance) { - struct vchiq_state *state = instance->state; - struct vchiq_arm_state *arm_state; int status = 0; + struct vchiq_state *state = instance->state; if (mutex_lock_killable(&state->mutex)) return -EAGAIN; @@ -740,9 +739,6 @@ int vchiq_shutdown(struct vchiq_instance *instance) dev_dbg(state->dev, "core: (%p): returning %d\n", instance, status); - arm_state = vchiq_platform_get_arm_state(state); - kthread_stop(arm_state->ka_thread); - free_bulk_waiter(instance); kfree(instance); @@ -1314,7 +1310,7 @@ vchiq_keepalive_thread_func(void *v) goto shutdown; } - while (!kthread_should_stop()) { + while (1) { long rc = 0, uc = 0; if (wait_for_completion_interruptible(&arm_state->ka_evt)) { diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index 953ccd87f425..76c27778154a 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -1936,7 +1936,7 @@ slot_handler_func(void *v) DEBUG_INITIALISE(local); - while (!kthread_should_stop()) { + while (1) { DEBUG_COUNT(SLOT_HANDLER_COUNT); DEBUG_TRACE(SLOT_HANDLER_LINE); remote_event_wait(&state->trigger_event, &local->trigger); @@ -1978,7 +1978,7 @@ recycle_func(void *v) if (!found) return -ENOMEM; - while (!kthread_should_stop()) { + while (1) { remote_event_wait(&state->recycle_event, &local->recycle); process_free_queue(state, found, length); @@ -1997,7 +1997,7 @@ sync_func(void *v) state->remote->slot_sync); int svc_fourcc; - while (!kthread_should_stop()) { + while (1) { struct vchiq_service *service; int msgid, size; int type; @@ -2844,10 +2844,6 @@ vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instan (void)vchiq_remove_service(instance, service->handle); vchiq_service_put(service); } - - kthread_stop(state->sync_thread); - kthread_stop(state->recycle_thread); - kthread_stop(state->slot_handler_thread); } int |