From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F340AEB64D7 for ; Wed, 28 Jun 2023 22:45:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Message-ID:Date:To:Cc:From:Subject: References:In-Reply-To:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TrSWcrKUPQXlC+UUaLWXmHdjq+R+EYvngYDS41gnRH4=; b=sC6HsDVJ/p5eqZ 8+MsrulB/LdtzMEGs0lzl9xODoBYCVWdZkGp/TImdbU2NvpUk3QhxisjHM7QHtb3uXtVO73+OU71L KK0puwFristEQ3t6+2UALv78zGgAzegS4MIbOKmQ0/2j2qqIcSPI+UzaJBTgNdqM+JG2IQmSw4kdc zQx4jftzRbiiMjioXxdX7X9FowR+gvvUglxKGhMaLpwjwFfEKuhtWigWJ1RU6AScHlQPaX09QlKqr X5mYGEOPJApIL5P4jXnmMuO4R5IcVWIwvwZoy8rg+18YBd5tVmexYmArfJqOUP50Fx+83nzVv+KuQ PaNS2X1TNG5OEQ+aYERQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qEdtw-00GvmO-27; Wed, 28 Jun 2023 22:44:40 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qEdtt-00GvlT-18; Wed, 28 Jun 2023 22:44:39 +0000 Received: from pendragon.ideasonboard.com (aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net [82.37.23.78]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2139C905; Thu, 29 Jun 2023 00:43:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1687992234; bh=8kUftu7lYSaZy3TqVKWV5nfS/HXx3yf+27+tAyJIkyk=; h=In-Reply-To:References:Subject:From:Cc:To:Date:From; b=iJ6U8CHr0KCHygB+rhCg58KJj/2gAUDwcbI9GZA/3cbYVkCDbLNSPNJUxRiMOBxL3 6QXplw2JoYKR1UHRlsFcIzvHMwb7eoxrf01EKEtVm0T6qZI2y2Pw1JRea8swrf7opv B20v0j+nvh6J8xT2iNTjwNljt9CnWsDOkTD0aplY= MIME-Version: 1.0 In-Reply-To: <20230627201628.207483-4-umang.jain@ideasonboard.com> References: <20230627201628.207483-1-umang.jain@ideasonboard.com> <20230627201628.207483-4-umang.jain@ideasonboard.com> Subject: Re: [PATCH v8 3/5] staging: bcm2835-camera: Register bcm2835-camera with vchiq_bus_type From: Kieran Bingham Cc: stefan.wahren@i2se.com, gregkh@linuxfoundation.org, f.fainelli@gmail.com, athierry@redhat.com, error27@gmail.com, dave.stevenson@raspberrypi.com, laurent.pinchart@ideasonboard.com, Umang Jain To: Umang Jain , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-staging@lists.linux.dev Date: Wed, 28 Jun 2023 23:44:31 +0100 Message-ID: <168799227183.3298351.12365161998104715465@Monstersaurus> User-Agent: alot/0.10 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230628_154437_562465_7222B2A4 X-CRM114-Status: GOOD ( 27.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Quoting Umang Jain (2023-06-27 21:16:26) > Register the bcm2835-camera with the vchiq_bus_type instead of using > platform driver/device. > > Also the VCHIQ firmware doesn't support device enumeration, hence > one has to maintain a list of devices to be registered in the interface. > > Signed-off-by: Umang Jain > --- > .../bcm2835-camera/bcm2835-camera.c | 16 +++++++------- > .../interface/vchiq_arm/vchiq_arm.c | 21 ++++++++++++++++--- > 2 files changed, 26 insertions(+), 11 deletions(-) > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > index 346d00df815a..f37b2a881d92 100644 > --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > @@ -24,8 +24,9 @@ > #include > #include > #include > -#include > > +#include "../interface/vchiq_arm/vchiq_arm.h" > +#include "../interface/vchiq_arm/vchiq_device.h" > #include "../vchiq-mmal/mmal-common.h" > #include "../vchiq-mmal/mmal-encodings.h" > #include "../vchiq-mmal/mmal-vchiq.h" > @@ -1841,7 +1842,7 @@ static struct v4l2_format default_v4l2_format = { > .fmt.pix.sizeimage = 1024 * 768, > }; > > -static int bcm2835_mmal_probe(struct platform_device *pdev) > +static int bcm2835_mmal_probe(struct vchiq_device *device) > { > int ret; > struct bcm2835_mmal_dev *dev; > @@ -1896,7 +1897,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) > &camera_instance); > ret = v4l2_device_register(NULL, &dev->v4l2_dev); > if (ret) { > - dev_err(&pdev->dev, "%s: could not register V4L2 device: %d\n", > + dev_err(&device->dev, "%s: could not register V4L2 device: %d\n", > __func__, ret); > goto free_dev; > } > @@ -1976,7 +1977,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev) > return ret; > } > > -static void bcm2835_mmal_remove(struct platform_device *pdev) > +static void bcm2835_mmal_remove(struct vchiq_device *device) > { > int camera; > struct vchiq_mmal_instance *instance = gdev[0]->instance; > @@ -1988,17 +1989,16 @@ static void bcm2835_mmal_remove(struct platform_device *pdev) > vchiq_mmal_finalise(instance); > } > > -static struct platform_driver bcm2835_camera_driver = { > +static struct vchiq_driver bcm2835_camera_driver = { > .probe = bcm2835_mmal_probe, > - .remove_new = bcm2835_mmal_remove, > + .remove = bcm2835_mmal_remove, > .driver = { > .name = "bcm2835-camera", > }, > }; > > -module_platform_driver(bcm2835_camera_driver) > +module_vchiq_driver(bcm2835_camera_driver) > > MODULE_DESCRIPTION("Broadcom 2835 MMAL video capture"); > MODULE_AUTHOR("Vincent Sanders"); > MODULE_LICENSE("GPL"); > -MODULE_ALIAS("platform:bcm2835-camera"); This bit worries me. I think that's how module autoloading is handled. Can you check into the details of MODULE_ALIAS and follow the rabbit hole for a bit? It's a few years since I last went down there so I can't remember the specifics right now. Except for that, I think this looks good. > 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 e8d40f891449..79d4d0eeb5fb 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > @@ -67,7 +67,6 @@ int vchiq_susp_log_level = VCHIQ_LOG_ERROR; > DEFINE_SPINLOCK(msg_queue_spinlock); > struct vchiq_state g_state; > > -static struct platform_device *bcm2835_camera; > static struct platform_device *bcm2835_audio; > > struct vchiq_drvdata { > @@ -134,6 +133,15 @@ struct vchiq_pagelist_info { > unsigned int scatterlist_mapped; > }; > > +/* > + * The devices implemented in the VCHIQ firmware are not discoverable, > + * so we need to maintain a list of them in order to register them with > + * the interface. > + */ > +static const char *const vchiq_devices[] = { > + "bcm2835-camera", > +}; > + > static void __iomem *g_regs; > /* This value is the size of the L2 cache lines as understood by the > * VPU firmware, which determines the required alignment of the > @@ -1798,6 +1806,7 @@ static int vchiq_probe(struct platform_device *pdev) > struct device_node *fw_node; > const struct of_device_id *of_id; > struct vchiq_drvdata *drvdata; > + unsigned int i; > int err; > > of_id = of_match_node(vchiq_of_match, pdev->dev.of_node); > @@ -1840,9 +1849,15 @@ static int vchiq_probe(struct platform_device *pdev) > goto error_exit; > } > > - bcm2835_camera = vchiq_register_child(pdev, "bcm2835-camera"); > bcm2835_audio = vchiq_register_child(pdev, "bcm2835_audio"); > > + for (i = 0; i < ARRAY_SIZE(vchiq_devices); i++) { > + err = vchiq_device_register(&pdev->dev, vchiq_devices[i]); > + if (err) > + dev_err(&pdev->dev, "Failed to register %s vchiq device\n", > + vchiq_devices[i]); > + } > + > return 0; > > failed_platform_init: > @@ -1854,7 +1869,7 @@ static int vchiq_probe(struct platform_device *pdev) > static void vchiq_remove(struct platform_device *pdev) > { > platform_device_unregister(bcm2835_audio); > - platform_device_unregister(bcm2835_camera); > + bus_for_each_dev(&vchiq_bus_type, NULL, NULL, vchiq_device_unregister); > vchiq_debugfs_deinit(); > vchiq_deregister_chrdev(); > } > -- > 2.39.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel