From patchwork Mon Nov 21 21:47:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 24038 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1852626wrr; Mon, 21 Nov 2022 13:51:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ugIvXTNOlQdCOh1y6KKomqv8Nq5dlZThY2ryCBqBKPTHhN149acjSIqriR6HLx2EVcaHz X-Received: by 2002:a65:4c85:0:b0:46f:59bd:6125 with SMTP id m5-20020a654c85000000b0046f59bd6125mr19391136pgt.147.1669067507604; Mon, 21 Nov 2022 13:51:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669067507; cv=none; d=google.com; s=arc-20160816; b=owWVuX5CODy6sW7F94Ztg9YNVddjtsQshBMS80QIIOKtDy7ZHvBWPFiuUjjS5OMcsT m9KZZaWmnV+MQM1YSCFwgyGKEbAIp8wuBtP0G+YCmo/enOlcMqEbdhBULBNgdsqmSCJP MsUEwBMGbNqCnkWn5AF2X8ZPRMfs8zuv/o0YfkGczKbG4ABFp6llxDQuQ1nyIuVvcZAg c2URp2us5IrE3xXZFcgyTf7naSgdpO7y0HQf7naMsq2lmUXJhH0h9AxkVm5sZA0iyL1e pRwum86xoqcdyJ4yFk03G4s/XKcMV2nj9VN7UHneaN3F3eB7cPLUWOc2lqyWFqOuSu0u dmSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ch9Srndi55WdrHCtEpDfcJBldoxhwiQlv4pTw3iPHtE=; b=AN7fzZHFRpo+418gvSaDTdy7Xfq2481pq9+grdPxuY3D+9/XuHJpNcHDSVdxl5wx7K da0QAfz9sm/EJ8ZrYRQlN7vHvVAnkq8aS9gDIAQc1XesWaRPh8DzkPiX18/3WB93/LhA nuo1Jc55NZaaxh2VaGMYpeVMNYRck7ze20E41iQxZBYJ3NkRJg59wP9980g8X2lPJ1VF dyl9j0e8X9Ft3O30fDHhZeEWCaKtJBtiW/nCSbEYZNIU8FW2xN9apR0mwycjoLIf9lIT AnQfcpL2RD5w9qUStVcmQcshWskDod2XruWopepzOUY33Fwwzo6HUj9jWS+MWREriScO Vwuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=ZxnExgSd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b10-20020a6541ca000000b0046fea833b07si12365133pgq.123.2022.11.21.13.51.34; Mon, 21 Nov 2022 13:51:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=ZxnExgSd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232019AbiKUVvE (ORCPT + 99 others); Mon, 21 Nov 2022 16:51:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232002AbiKUVuO (ORCPT ); Mon, 21 Nov 2022 16:50:14 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 353DEDDFBB; Mon, 21 Nov 2022 13:50:12 -0800 (PST) Received: from umang.jainideasonboard.com (unknown [103.86.18.138]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BDBA174C; Mon, 21 Nov 2022 22:50:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1669067410; bh=htuzsCjo2x6ULFR7bLoW8GPfSx+imW25FBjXo1ReDtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZxnExgSdyZOP5iRLFAfGeQ9Od0cD9KTlvhLhHqWszWZO+RrpWjk31fvqhikuXjz5z yF/3fv2Fn3b9sbgroSpLclSWmerMilncVuADCNESO00ro2cWExsEsvJRkPbDwWPGoq gbxSDrY5uh6GzvpgrvaYmSn1Ou+K1TMiLBZH4y+g= From: Umang Jain To: linux-media@vger.kernel.org, kernel-list@raspberrypi.com, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev, Broadcom internal kernel review list Cc: Dave Stevenson , Florian Fainelli , Naushir Patuck , David Plowman , Kieran Bingham , Laurent Pinchart , Umang Jain Subject: [PATCH 12/14] staging: vc04_services: bcm2835_isp: Allow multiple users Date: Tue, 22 Nov 2022 03:17:20 +0530 Message-Id: <20221121214722.22563-13-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221121214722.22563-1-umang.jain@ideasonboard.com> References: <20221121214722.22563-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750144130714843024?= X-GMAIL-MSGID: =?utf-8?q?1750144130714843024?= From: Naushir Patuck Add a second (identical) set of device nodes to allow concurrent use of the bcm2835-isp hardware by another user. This change effectively creates a second state structure (struct bcm2835_isp_dev) to maintain independent state for the second user. Node and media entity names are appened with the instance index appropriately. Further users can be added by changing the BCM2835_ISP_NUM_INSTANCES define. Signed-off-by: Naushir Patuck Signed-off-by: Umang Jain --- .../bcm2835-isp/bcm2835-v4l2-isp.c | 77 +++++++++++++++---- 1 file changed, 61 insertions(+), 16 deletions(-) diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c index cb7cdba76682..0dbcb25595e7 100644 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -28,13 +28,19 @@ MODULE_IMPORT_NS(DMA_BUF); +/* + * We want to instantiate 2 independent instances allowing 2 simultaneous users + * of the ISP hardware. + */ +#define BCM2835_ISP_NUM_INSTANCES 2 + static unsigned int debug; module_param(debug, uint, 0644); MODULE_PARM_DESC(debug, "activates debug info"); -static unsigned int video_nr = 13; -module_param(video_nr, uint, 0644); -MODULE_PARM_DESC(video_nr, "base video device number"); +static unsigned int video_nr[BCM2835_ISP_NUM_INSTANCES] = { 13, 20 }; +module_param_array(video_nr, uint, NULL, 0644); +MODULE_PARM_DESC(video_nr, "base video device numbers"); #define BCM2835_ISP_NAME "bcm2835-isp" #define BCM2835_ISP_ENTITY_NAME_LEN 32 @@ -1286,6 +1292,7 @@ static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node) * or output nodes. */ static int register_node(struct bcm2835_isp_dev *dev, + unsigned int instance, struct bcm2835_isp_node *node, int index) { @@ -1447,7 +1454,7 @@ static int register_node(struct bcm2835_isp_dev *dev, snprintf(vfd->name, sizeof(node->vfd.name), "%s-%s%d", BCM2835_ISP_NAME, node->name, node->id); - ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr + index); + ret = video_register_device(vfd, VFL_TYPE_VIDEO, video_nr[instance]); if (ret) { v4l2_err(&dev->v4l2_dev, "Failed to register video %s[%d] device node\n", @@ -1668,9 +1675,8 @@ static int media_controller_register(struct bcm2835_isp_dev *dev) return ret; } -static int bcm2835_isp_remove(struct platform_device *pdev) +static void bcm2835_isp_remove_instance(struct bcm2835_isp_dev *dev) { - struct bcm2835_isp_dev *dev = platform_get_drvdata(pdev); unsigned int i; media_controller_unregister(dev); @@ -1685,11 +1691,11 @@ static int bcm2835_isp_remove(struct platform_device *pdev) dev->component); vchiq_mmal_finalise(dev->mmal_instance); - - return 0; } -static int bcm2835_isp_probe(struct platform_device *pdev) +static int bcm2835_isp_probe_instance(struct platform_device *pdev, + struct bcm2835_isp_dev **dev_int, + unsigned int instance) { struct bcm2835_isp_dev *dev; unsigned int i; @@ -1699,6 +1705,7 @@ static int bcm2835_isp_probe(struct platform_device *pdev) if (!dev) return -ENOMEM; + *dev_int = dev; dev->dev = &pdev->dev; ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev); @@ -1716,7 +1723,7 @@ static int bcm2835_isp_probe(struct platform_device *pdev) if (ret) { v4l2_err(&dev->v4l2_dev, "%s: failed to create ril.isp component\n", __func__); - goto error; + return ret; } if (dev->component->inputs < BCM2835_ISP_NUM_OUTPUTS || @@ -1728,7 +1735,7 @@ static int bcm2835_isp_probe(struct platform_device *pdev) BCM2835_ISP_NUM_OUTPUTS, dev->component->outputs, BCM2835_ISP_NUM_CAPTURES + BCM2835_ISP_NUM_METADATA); - goto error; + return -EINVAL; } atomic_set(&dev->num_streaming, 0); @@ -1736,17 +1743,55 @@ static int bcm2835_isp_probe(struct platform_device *pdev) for (i = 0; i < BCM2835_ISP_NUM_NODES; i++) { struct bcm2835_isp_node *node = &dev->node[i]; - ret = register_node(dev, node, i); + ret = register_node(dev, instance, node, i); if (ret) - goto error; + return ret; } ret = media_controller_register(dev); if (ret) - goto error; + return ret; + + return 0; +} + +static int bcm2835_isp_remove(struct platform_device *pdev) +{ + struct bcm2835_isp_dev **bcm2835_isp_instances; + unsigned int i; + + bcm2835_isp_instances = platform_get_drvdata(pdev); + for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) { + if (bcm2835_isp_instances[i]) + bcm2835_isp_remove_instance(bcm2835_isp_instances[i]); + } + + return 0; +} + +static int bcm2835_isp_probe(struct platform_device *pdev) +{ + struct bcm2835_isp_dev **bcm2835_isp_instances; + unsigned int i; + int ret; + + bcm2835_isp_instances = devm_kzalloc(&pdev->dev, + sizeof(bcm2835_isp_instances) * + BCM2835_ISP_NUM_INSTANCES, + GFP_KERNEL); + if (!bcm2835_isp_instances) + return -ENOMEM; + + platform_set_drvdata(pdev, bcm2835_isp_instances); + + for (i = 0; i < BCM2835_ISP_NUM_INSTANCES; i++) { + ret = bcm2835_isp_probe_instance(pdev, + &bcm2835_isp_instances[i], i); + if (ret) + goto error; + } - platform_set_drvdata(pdev, dev); - v4l2_info(&dev->v4l2_dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME); + dev_info(&pdev->dev, "Loaded V4L2 %s\n", BCM2835_ISP_NAME); return 0; error: