staging: mmal-vchiq: Fix client_component for 64 bit kernel

The MMAL client_component field is used with the event
mechanism to allow the client to identify the component for
which the event is generated.
The field is only 32bits in size, therefore we can't use a
pointer to the component in a 64 bit kernel.

Component handles are already held in an array per VCHI
instance, so use the array index as the client_component handle
to avoid having to create a new IDR for this purpose.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-5-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
index 6404d4e..3bc04f2 100644 (file)
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
@@ -943,7 +943,7 @@ static int create_component(struct vchiq_mmal_instance *instance,
 
        /* build component create message */
        m.h.type = MMAL_MSG_TYPE_COMPONENT_CREATE;
-       m.u.component_create.client_component = (u32)(unsigned long)component;
+       m.u.component_create.client_component = component->client_component;
        strncpy(m.u.component_create.name, name,
                sizeof(m.u.component_create.name));
 
@@ -1662,6 +1662,12 @@ int vchiq_mmal_component_init(struct vchiq_mmal_instance *instance,
                goto unlock;
        }
 
+       /* We need a handle to reference back to our component structure.
+        * Use the array index in instance->component rather than rolling
+        * another IDR.
+        */
+       component->client_component = idx;
+
        ret = create_component(instance, component, name);
        if (ret < 0) {
                pr_err("%s: failed to create component %d (Not enough GPU mem?)\n",

diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
index df60858..1dc81ec 100644 (file)
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
@@ -92,6 +92,7 @@ struct vchiq_mmal_component {
        struct vchiq_mmal_port input[MAX_PORT_COUNT]; /* input ports */
        struct vchiq_mmal_port output[MAX_PORT_COUNT]; /* output ports */
        struct vchiq_mmal_port clock[MAX_PORT_COUNT]; /* clock ports */
+       u32 client_component;   /* Used to ref back to client struct */
 };
 
 int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance);