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 X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C50B3C4CECF for ; Mon, 16 Sep 2019 00:40:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 769FD2067D for ; Mon, 16 Sep 2019 00:40:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568594418; bh=M3Nml7dFsdzOkJrbaF8Hqp4T069pPezTgHFDixE4zfE=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-ID:From; b=1VPuQvv9MEjRY5J1cY23h99XOeJebOw+Kvd5C6TQphk3N3JlYCfWTMplZNyjwRydq X4RzToKft9b1iD8DLsYSC40aZKkY7mz7I0uU1Saqi2c103uiPrwUVyydwh7y1lJfj5 tFXsljTepp9Ug9+JlTUyuly0CxNwKRIwnoQfk9nI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728927AbfIPAkR (ORCPT ); Sun, 15 Sep 2019 20:40:17 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:41709 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728872AbfIPAkR (ORCPT ); Sun, 15 Sep 2019 20:40:17 -0400 Received: by mail-io1-f67.google.com with SMTP id r26so74660790ioh.8 for ; Sun, 15 Sep 2019 17:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=TJ7x+ATkaf9hoOXq0Ni+nF8JuefIB1eeJSkPBtueVSs=; b=Guo2b6MFL5gAyGha8F4OMCkkYt4duUYymaX1pLlYzEVy7rv6MpYXLXKAcGhiWvwmV2 IWct09ZCDtBhmJco6gpzl+6bLVcG7+jFAYjkZNpEjDrqiPTrlfTClL01YTfJz71vx7X5 g7Ah+TXgVgFFt5Rjya1af9G+v3n+GUTgzOyso= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=TJ7x+ATkaf9hoOXq0Ni+nF8JuefIB1eeJSkPBtueVSs=; b=U2ZsMbbLvEKi/J0bceMjjHNPwOyX4R3Hc0G9Z89mYHKtuttHQJ/lxHZ5ITEpmi0HiE uIF3a9pqDf3kRz0/hryqe2kC5pO7pUMUvg4PYieUhx1OCHq9VZW84gPSvtXB1A6TyBsJ ULnb+LvuMWqruKJCNv9GjeJrgSvRB73HqmGbaS7W1cJfKLRF+LX4PrNNL5tOuhOFW4Cj 4oSkdyUWPy/P2Uu7R2hBGHqu7FWykuD5wbEb+IUh31fPS/qAJhrn9sUmijG7VeIGZaHk FnnKLFIA0WCEC8Zr2xbV4uvpeKVZ1rVaWUttC0aeY37bi4//qWGCXCtIcRJfcCdUig03 jGcw== X-Gm-Message-State: APjAAAXllXziWDQ4RpTUkE/CRlm+UC7QWIKHREM3du2ZJTL6fCCC6JNU YH6pkyL4eKI8yP1dIIzqHRQw04tgI8o= X-Google-Smtp-Source: APXvYqwMJS/T+f4vHy4+KXph/OXJgrll+zjYx/xLH5lJFjiEIs7R8jOCIo1Z0D78xAyDatIBRf2SCw== X-Received: by 2002:a6b:8b8b:: with SMTP id n133mr12818833iod.34.1568594413917; Sun, 15 Sep 2019 17:40:13 -0700 (PDT) Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id k11sm23150523ioa.20.2019.09.15.17.40.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Sep 2019 17:40:12 -0700 (PDT) Subject: Re: [PATCH v4 1/5] media: vimc: Collapse component structure into a single monolithic driver To: Helen Koike , mchehab@kernel.org, andrealmeid@collabora.com, dafna.hirschfeld@collabora.com, hverkuil-cisco@xs4all.nl Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Shuah Khan References: <5ce80bf232dd43f4678e7dde7f7ff2d6a6374211.1567822793.git.skhan@linuxfoundation.org> <7868ac1a-5060-d1a2-a854-bf95b887b6e4@collabora.com> From: Shuah Khan Message-ID: Date: Sun, 15 Sep 2019 18:40:11 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <7868ac1a-5060-d1a2-a854-bf95b887b6e4@collabora.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 9/15/19 1:25 PM, Helen Koike wrote: > Hi Shuah, > > Thanks for the patch. > > On 9/6/19 11:42 PM, Shuah Khan wrote: >> vimc uses Component API to split the driver into functional components. >> The real hardware resembles a monolith structure than component and >> component structure added a level of complexity making it hard to >> maintain without adding any real benefit. >> >> The sensor is one vimc component that would makes sense to be a separate >> module to closely align with the real hardware. It would be easier to >> collapse vimc into single monolithic driver first and then split the >> sensor off as a separate module. >> >> Collapse it into a single monolithic driver removing the Component API. >> This patch removes the component API and makes minimal changes to the >> code base preserving the functional division of the code structure. >> Preserving the functional structure allows us to split the sensor off >> as a separate module in the future. >> >> Major design elements in this change are: >> - Use existing struct vimc_ent_config and struct vimc_pipeline_config >> to drive the initialization of the functional components. >> - Make vimc_device and vimc_ent_config global by moving them to >> vimc-common.h >> - Add two new hooks add and rm to initialize and register, unregister >> and free subdevs. >> - All component API is now gone and bind and unbind hooks are modified >> to do "add" and "rm" with minimal changes to just add and rm subdevs. >> - vimc-core's bind and unbind are now register and unregister. >> - Add a new field to vimc_device structure for saving the pointers to >> struct vimc_ent_device(s) subdevs create in their "add" hooks. These >> get used to create links and removing the subdevs. vimc-core allocates >> this array which sized to number of entries in the topology defined in >> the vimc_pipeline_config structure. >> - vimc-core invokes "add" hooks from its vimc_register_devices(). >> The "add" hooks remain the same and register subdevs. They don't >> create platform devices of their own and use vimc's pdev.dev as >> their reference device. Each "add" hook returns pointer to its struct >> vimc_ent_device. This is saved in the vimc_device ent_devs array. >> - vimc-core invokes "rm" hooks from its unregister to unregister subdevs >> and cleanup. >> - vimc-core invokes "add" and "rm" hooks with pointer to struct vimc_device >> and the corresponding vimc_ent_device saved in the ent_devs. >> >> The following configure and stream test works on all devices. >> >> media-ctl -d platform:vimc -V '"Sensor A":0[fmt:SBGGR8_1X8/640x480]' >> media-ctl -d platform:vimc -V '"Debayer A":0[fmt:SBGGR8_1X8/640x480]' >> media-ctl -d platform:vimc -V '"Sensor B":0[fmt:SBGGR8_1X8/640x480]' >> media-ctl -d platform:vimc -V '"Debayer B":0[fmt:SBGGR8_1X8/640x480]' >> >> v4l2-ctl -z platform:vimc -d "RGB/YUV Capture" -v width=1920,height=1440 >> v4l2-ctl -z platform:vimc -d "Raw Capture 0" -v pixelformat=BA81 >> v4l2-ctl -z platform:vimc -d "Raw Capture 1" -v pixelformat=BA81 >> >> v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video1 >> v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video2 >> v4l2-ctl --stream-mmap --stream-count=100 -d /dev/video3 >> >> Signed-off-by: Shuah Khan >> --- >> drivers/media/platform/vimc/Makefile | 7 +- >> drivers/media/platform/vimc/vimc-capture.c | 81 ++------ >> drivers/media/platform/vimc/vimc-common.h | 54 ++++++ >> drivers/media/platform/vimc/vimc-core.c | 216 +++++++++------------ >> drivers/media/platform/vimc/vimc-debayer.c | 69 ++----- >> drivers/media/platform/vimc/vimc-scaler.c | 73 ++----- >> drivers/media/platform/vimc/vimc-sensor.c | 73 ++----- >> 7 files changed, 193 insertions(+), 380 deletions(-) >> >> diff --git a/drivers/media/platform/vimc/Makefile b/drivers/media/platform/vimc/Makefile >> index 96d06f030c31..a53b2b532e9f 100644 >> --- a/drivers/media/platform/vimc/Makefile >> +++ b/drivers/media/platform/vimc/Makefile >> @@ -1,5 +1,6 @@ >> # SPDX-License-Identifier: GPL-2.0 >> -vimc-y := vimc-core.o vimc-common.o vimc-streamer.o >> +vimc-y := vimc-core.o vimc-common.o vimc-streamer.o vimc-capture.o \ >> + vimc-debayer.o vimc-scaler.o vimc-sensor.o >> + >> +obj-$(CONFIG_VIDEO_VIMC) += vimc.o >> >> -obj-$(CONFIG_VIDEO_VIMC) += vimc.o vimc-capture.o vimc-debayer.o \ >> - vimc-scaler.o vimc-sensor.o >> diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c >> index 1d56b91830ba..602f80323031 100644 >> --- a/drivers/media/platform/vimc/vimc-capture.c >> +++ b/drivers/media/platform/vimc/vimc-capture.c >> @@ -5,10 +5,6 @@ >> * Copyright (C) 2015-2017 Helen Koike >> */ >> >> -#include >> -#include >> -#include >> -#include >> #include >> #include >> #include >> @@ -16,8 +12,6 @@ >> #include "vimc-common.h" >> #include "vimc-streamer.h" >> >> -#define VIMC_CAP_DRV_NAME "vimc-capture" >> - >> struct vimc_cap_device { >> struct vimc_ent_device ved; >> struct video_device vdev; >> @@ -340,13 +334,11 @@ static void vimc_cap_release(struct video_device *vdev) >> kfree(vcap); >> } >> >> -static void vimc_cap_comp_unbind(struct device *comp, struct device *master, >> - void *master_data) >> +void vimc_cap_rm(struct vimc_device *vimc, struct vimc_ent_device *ved) >> { >> - struct vimc_ent_device *ved = dev_get_drvdata(comp); >> - struct vimc_cap_device *vcap = container_of(ved, struct vimc_cap_device, >> - ved); >> + struct vimc_cap_device *vcap; >> >> + vcap = container_of(ved, struct vimc_cap_device, ved); >> vb2_queue_release(&vcap->queue); >> media_entity_cleanup(ved->ent); >> video_unregister_device(&vcap->vdev); >> @@ -391,11 +383,10 @@ static void *vimc_cap_process_frame(struct vimc_ent_device *ved, >> return NULL; >> } >> >> -static int vimc_cap_comp_bind(struct device *comp, struct device *master, >> - void *master_data) >> +struct vimc_ent_device *vimc_cap_add(struct vimc_device *vimc, >> + const char *vcfg_name) >> { >> - struct v4l2_device *v4l2_dev = master_data; >> - struct vimc_platform_data *pdata = comp->platform_data; >> + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; >> const struct vimc_pix_map *vpix; >> struct vimc_cap_device *vcap; >> struct video_device *vdev; >> @@ -405,7 +396,7 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, >> /* Allocate the vimc_cap_device struct */ >> vcap = kzalloc(sizeof(*vcap), GFP_KERNEL); >> if (!vcap) >> - return -ENOMEM; >> + return NULL; >> >> /* Allocate the pads */ >> vcap->ved.pads = >> @@ -416,7 +407,7 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, >> } >> >> /* Initialize the media entity */ >> - vcap->vdev.entity.name = pdata->entity_name; >> + vcap->vdev.entity.name = vcfg_name; >> vcap->vdev.entity.function = MEDIA_ENT_F_IO_V4L; >> ret = media_entity_pads_init(&vcap->vdev.entity, >> 1, vcap->ved.pads); >> @@ -440,8 +431,8 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, >> >> ret = vb2_queue_init(q); >> if (ret) { >> - dev_err(comp, "%s: vb2 queue init failed (err=%d)\n", >> - pdata->entity_name, ret); >> + dev_err(&vimc->pdev.dev, "%s: vb2 queue init failed (err=%d)\n", >> + vcfg_name, ret); >> goto err_clean_m_ent; >> } >> >> @@ -460,8 +451,7 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, >> vcap->ved.ent = &vcap->vdev.entity; >> vcap->ved.process_frame = vimc_cap_process_frame; >> vcap->ved.vdev_get_format = vimc_cap_get_format; >> - dev_set_drvdata(comp, &vcap->ved); >> - vcap->dev = comp; >> + vcap->dev = &vimc->pdev.dev; >> >> /* Initialize the video_device struct */ >> vdev = &vcap->vdev; >> @@ -474,18 +464,18 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, >> vdev->queue = q; >> vdev->v4l2_dev = v4l2_dev; >> vdev->vfl_dir = VFL_DIR_RX; >> - strscpy(vdev->name, pdata->entity_name, sizeof(vdev->name)); >> + strscpy(vdev->name, vcfg_name, sizeof(vdev->name)); >> video_set_drvdata(vdev, &vcap->ved); >> >> /* Register the video_device with the v4l2 and the media framework */ >> ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); >> if (ret) { >> - dev_err(comp, "%s: video register failed (err=%d)\n", >> + dev_err(&vimc->pdev.dev, "%s: video register failed (err=%d)\n", >> vcap->vdev.name, ret); >> goto err_release_queue; >> } >> >> - return 0; >> + return &vcap->ved; >> >> err_release_queue: >> vb2_queue_release(q); >> @@ -496,46 +486,5 @@ static int vimc_cap_comp_bind(struct device *comp, struct device *master, >> err_free_vcap: >> kfree(vcap); >> >> - return ret; >> -} >> - >> -static const struct component_ops vimc_cap_comp_ops = { >> - .bind = vimc_cap_comp_bind, >> - .unbind = vimc_cap_comp_unbind, >> -}; >> - >> -static int vimc_cap_probe(struct platform_device *pdev) >> -{ >> - return component_add(&pdev->dev, &vimc_cap_comp_ops); >> -} >> - >> -static int vimc_cap_remove(struct platform_device *pdev) >> -{ >> - component_del(&pdev->dev, &vimc_cap_comp_ops); >> - >> - return 0; >> + return NULL; >> } >> - >> -static const struct platform_device_id vimc_cap_driver_ids[] = { >> - { >> - .name = VIMC_CAP_DRV_NAME, >> - }, >> - { } >> -}; >> - >> -static struct platform_driver vimc_cap_pdrv = { >> - .probe = vimc_cap_probe, >> - .remove = vimc_cap_remove, >> - .id_table = vimc_cap_driver_ids, >> - .driver = { >> - .name = VIMC_CAP_DRV_NAME, >> - }, >> -}; >> - >> -module_platform_driver(vimc_cap_pdrv); >> - >> -MODULE_DEVICE_TABLE(platform, vimc_cap_driver_ids); >> - >> -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Capture"); >> -MODULE_AUTHOR("Helen Mae Koike Fornazier "); >> -MODULE_LICENSE("GPL"); >> diff --git a/drivers/media/platform/vimc/vimc-common.h b/drivers/media/platform/vimc/vimc-common.h >> index 9c2e0e216c6b..87ee84f78322 100644 >> --- a/drivers/media/platform/vimc/vimc-common.h >> +++ b/drivers/media/platform/vimc/vimc-common.h >> @@ -9,6 +9,7 @@ >> #define _VIMC_COMMON_H_ >> >> #include >> +#include > > This should go before linux/slab.h to keep in alphabetical order. Will do. > >> #include >> #include >> >> @@ -111,6 +112,59 @@ struct vimc_ent_device { >> struct v4l2_pix_format *fmt); >> }; >> >> +/** >> + * struct vimc_device - main device for vimc driver >> + * >> + * @pdev pointer to the platform device >> + * @pipe_cfg pointer to the vimc pipeline configuration structure >> + * @ent_devs arry of vimc_ent_device pointers > > s/arry/array > >> + * @mdev the associated media_device parent >> + * @v4l2_dev Internal v4l2 parent device >> + */ >> +struct vimc_device { >> + struct platform_device pdev; >> + const struct vimc_pipeline_config *pipe_cfg; >> + struct vimc_ent_device **ent_devs; >> + struct media_device mdev; >> + struct v4l2_device v4l2_dev; >> +}; >> + >> +/** >> + * struct vimc_ent_config Structure which describes individual >> + * configuration for each entity >> + * >> + * @name entity name >> + * @ved pointer to vimc_ent_device (a node in the >> + * topology) >> + * @add subdev add hook - initializes and registers >> + * subdev called from vimc-core >> + * @rm subdev rm hook - unregisters and frees >> + * subdev called from vimc-core >> + */ >> +struct vimc_ent_config { >> + const char *name; >> + struct vimc_ent_device *(*add)(struct vimc_device *vimc, >> + const char *vcfg_name); >> + void (*rm)(struct vimc_device *vimc, struct vimc_ent_device *ved); >> +}; >> + >> +/* prototypes for vimc_ent_config add and rm hooks */ >> +struct vimc_ent_device *vimc_cap_add(struct vimc_device *vimc, >> + const char *vcfg_name); >> +void vimc_cap_rm(struct vimc_device *vimc, struct vimc_ent_device *ved); >> + >> +struct vimc_ent_device *vimc_deb_add(struct vimc_device *vimc, >> + const char *vcfg_name); >> +void vimc_deb_rm(struct vimc_device *vimc, struct vimc_ent_device *ved); >> + >> +struct vimc_ent_device *vimc_sca_add(struct vimc_device *vimc, >> + const char *vcfg_name); >> +void vimc_sca_rm(struct vimc_device *vimc, struct vimc_ent_device *ved); >> + >> +struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc, >> + const char *vcfg_name); >> +void vimc_sen_rm(struct vimc_device *vimc, struct vimc_ent_device *ved); >> + >> /** >> * vimc_pads_init - initialize pads >> * >> diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c >> index 571c55aa0e16..a1218578cb9a 100644 >> --- a/drivers/media/platform/vimc/vimc-core.c >> +++ b/drivers/media/platform/vimc/vimc-core.c >> @@ -5,7 +5,6 @@ >> * Copyright (C) 2015-2017 Helen Koike >> */ >> >> -#include >> #include >> #include >> #include >> @@ -24,29 +23,6 @@ >> .flags = link_flags, \ >> } >> >> -struct vimc_device { >> - /* The platform device */ >> - struct platform_device pdev; >> - >> - /* The pipeline configuration */ >> - const struct vimc_pipeline_config *pipe_cfg; >> - >> - /* The Associated media_device parent */ >> - struct media_device mdev; >> - >> - /* Internal v4l2 parent device*/ >> - struct v4l2_device v4l2_dev; >> - >> - /* Subdevices */ >> - struct platform_device **subdevs; >> -}; >> - >> -/* Structure which describes individual configuration for each entity */ >> -struct vimc_ent_config { >> - const char *name; >> - const char *drv; >> -}; >> - >> /* Structure which describes links between entities */ >> struct vimc_ent_link { >> unsigned int src_ent; >> @@ -68,43 +44,52 @@ struct vimc_pipeline_config { >> * Topology Configuration >> */ >> >> -static const struct vimc_ent_config ent_config[] = { >> +static struct vimc_ent_config ent_config[] = { >> { >> .name = "Sensor A", >> - .drv = "vimc-sensor", >> + .add = vimc_sen_add, >> + .rm = vimc_sen_rm, >> }, >> { >> .name = "Sensor B", >> - .drv = "vimc-sensor", >> + .add = vimc_sen_add, >> + .rm = vimc_sen_rm, >> }, >> { >> .name = "Debayer A", >> - .drv = "vimc-debayer", >> + .add = vimc_deb_add, >> + .rm = vimc_deb_rm, >> }, >> { >> .name = "Debayer B", >> - .drv = "vimc-debayer", >> + .add = vimc_deb_add, >> + .rm = vimc_deb_rm, >> }, >> { >> .name = "Raw Capture 0", >> - .drv = "vimc-capture", >> + .add = vimc_cap_add, >> + .rm = vimc_cap_rm, >> }, >> { >> .name = "Raw Capture 1", >> - .drv = "vimc-capture", >> + .add = vimc_cap_add, >> + .rm = vimc_cap_rm, >> }, >> { >> - .name = "RGB/YUV Input", >> /* TODO: change this to vimc-input when it is implemented */ >> - .drv = "vimc-sensor", >> + .name = "RGB/YUV Input", >> + .add = vimc_sen_add, >> + .rm = vimc_sen_rm, >> }, >> { >> .name = "Scaler", >> - .drv = "vimc-scaler", >> + .add = vimc_sca_add, >> + .rm = vimc_sca_rm, >> }, >> { >> .name = "RGB/YUV Capture", >> - .drv = "vimc-capture", >> + .add = vimc_cap_add, >> + .rm = vimc_cap_rm, >> }, >> }; >> >> @@ -127,7 +112,7 @@ static const struct vimc_ent_link ent_links[] = { >> VIMC_ENT_LINK(7, 1, 8, 0, MEDIA_LNK_FL_ENABLED | MEDIA_LNK_FL_IMMUTABLE), >> }; >> >> -static const struct vimc_pipeline_config pipe_cfg = { >> +static struct vimc_pipeline_config pipe_cfg = { >> .ents = ent_config, >> .num_ents = ARRAY_SIZE(ent_config), >> .links = ent_links, >> @@ -136,6 +121,14 @@ static const struct vimc_pipeline_config pipe_cfg = { >> >> /* -------------------------------------------------------------------------- */ >> >> +static void vimc_rm_links(struct vimc_device *vimc) >> +{ >> + unsigned int i; >> + >> + for (i = 0; i < vimc->pipe_cfg->num_ents; i++) >> + media_entity_remove_links(vimc->ent_devs[i]->ent); >> +} >> + >> static int vimc_create_links(struct vimc_device *vimc) >> { >> unsigned int i; >> @@ -144,32 +137,58 @@ static int vimc_create_links(struct vimc_device *vimc) >> /* Initialize the links between entities */ >> for (i = 0; i < vimc->pipe_cfg->num_links; i++) { >> const struct vimc_ent_link *link = &vimc->pipe_cfg->links[i]; >> - /* >> - * TODO: Check another way of retrieving ved struct without >> - * relying on platform_get_drvdata >> - */ >> + >> struct vimc_ent_device *ved_src = >> - platform_get_drvdata(vimc->subdevs[link->src_ent]); >> + vimc->ent_devs[link->src_ent]; >> struct vimc_ent_device *ved_sink = >> - platform_get_drvdata(vimc->subdevs[link->sink_ent]); >> + vimc->ent_devs[link->sink_ent]; >> >> ret = media_create_pad_link(ved_src->ent, link->src_pad, >> ved_sink->ent, link->sink_pad, >> link->flags); >> if (ret) >> - return ret; >> + goto err_rm_links; >> } >> >> return 0; >> + >> +err_rm_links: >> + vimc_rm_links(vimc); >> + return ret; >> } >> >> -static int vimc_comp_bind(struct device *master) >> +static int vimc_add_subdevs(struct vimc_device *vimc) >> { >> - struct vimc_device *vimc = container_of(to_platform_device(master), >> - struct vimc_device, pdev); >> - int ret; >> + unsigned int i; >> + struct vimc_ent_device *ved; >> + >> + for (i = 0; i < vimc->pipe_cfg->num_ents; i++) { >> + dev_dbg(&vimc->pdev.dev, "new entity for %s\n", >> + vimc->pipe_cfg->ents[i].name); >> + ved = vimc->pipe_cfg->ents[i].add(vimc, >> + vimc->pipe_cfg->ents[i].name); >> + if (!ved) { >> + dev_err(&vimc->pdev.dev, "add new entity for %s\n", >> + vimc->pipe_cfg->ents[i].name); >> + return -1; > > return -EINVAL Will do. > >> + } >> + vimc->ent_devs[i] = ved; >> + } >> + return 0; >> +} >> + >> +static void vimc_rm_subdevs(struct vimc_device *vimc) >> +{ >> + unsigned int i; >> >> - dev_dbg(master, "bind"); >> + for (i = 0; i < vimc->pipe_cfg->num_ents; i++) >> + if (vimc->ent_devs[i]) >> + vimc->pipe_cfg->ents[i].rm(vimc, vimc->ent_devs[i]); >> +} >> + >> +static int vimc_register_devices(struct vimc_device *vimc) >> +{ >> + int ret; >> >> /* Register the v4l2 struct */ >> ret = v4l2_device_register(vimc->mdev.dev, &vimc->v4l2_dev); >> @@ -179,22 +198,30 @@ static int vimc_comp_bind(struct device *master) >> return ret; >> } >> >> - /* Bind subdevices */ >> - ret = component_bind_all(master, &vimc->v4l2_dev); >> - if (ret) >> + /* allocate ent_devs */ >> + vimc->ent_devs = kmalloc_array(vimc->pipe_cfg->num_ents, >> + sizeof(*vimc->ent_devs), >> + GFP_KERNEL); >> + if (!vimc->ent_devs) >> goto err_v4l2_unregister; >> >> + /* Invoke entity config hooks to initialize and register subdevs */ >> + ret = vimc_add_subdevs(vimc); >> + if (ret) >> + /* remove sundevs that got added */ >> + goto err_rm_subdevs; >> + >> /* Initialize links */ >> ret = vimc_create_links(vimc); >> if (ret) >> - goto err_comp_unbind_all; >> + goto err_rm_subdevs; >> >> /* Register the media device */ >> ret = media_device_register(&vimc->mdev); >> if (ret) { >> dev_err(vimc->mdev.dev, >> "media device register failed (err=%d)\n", ret); >> - goto err_comp_unbind_all; >> + goto err_rm_subdevs; >> } >> >> /* Expose all subdev's nodes*/ >> @@ -211,98 +238,32 @@ static int vimc_comp_bind(struct device *master) >> err_mdev_unregister: >> media_device_unregister(&vimc->mdev); >> media_device_cleanup(&vimc->mdev); >> -err_comp_unbind_all: >> - component_unbind_all(master, NULL); >> +err_rm_subdevs: >> + vimc_rm_subdevs(vimc); >> + kfree(vimc->ent_devs); >> err_v4l2_unregister: >> v4l2_device_unregister(&vimc->v4l2_dev); >> >> return ret; >> } >> >> -static void vimc_comp_unbind(struct device *master) >> +static void vimc_unregister(struct vimc_device *vimc) >> { >> - struct vimc_device *vimc = container_of(to_platform_device(master), >> - struct vimc_device, pdev); >> - >> - dev_dbg(master, "unbind"); >> - >> media_device_unregister(&vimc->mdev); >> media_device_cleanup(&vimc->mdev); >> - component_unbind_all(master, NULL); >> v4l2_device_unregister(&vimc->v4l2_dev); >> + kfree(vimc->ent_devs); >> } >> >> -static int vimc_comp_compare(struct device *comp, void *data) >> -{ >> - return comp == data; >> -} >> - >> -static struct component_match *vimc_add_subdevs(struct vimc_device *vimc) >> -{ >> - struct component_match *match = NULL; >> - struct vimc_platform_data pdata; >> - int i; >> - >> - for (i = 0; i < vimc->pipe_cfg->num_ents; i++) { >> - dev_dbg(&vimc->pdev.dev, "new pdev for %s\n", >> - vimc->pipe_cfg->ents[i].drv); >> - >> - strscpy(pdata.entity_name, vimc->pipe_cfg->ents[i].name, >> - sizeof(pdata.entity_name)); >> - >> - vimc->subdevs[i] = platform_device_register_data(&vimc->pdev.dev, >> - vimc->pipe_cfg->ents[i].drv, >> - PLATFORM_DEVID_AUTO, >> - &pdata, >> - sizeof(pdata)); >> - if (IS_ERR(vimc->subdevs[i])) { >> - match = ERR_CAST(vimc->subdevs[i]); >> - while (--i >= 0) >> - platform_device_unregister(vimc->subdevs[i]); >> - >> - return match; >> - } >> - >> - component_match_add(&vimc->pdev.dev, &match, vimc_comp_compare, >> - &vimc->subdevs[i]->dev); >> - } >> - >> - return match; >> -} >> - >> -static void vimc_rm_subdevs(struct vimc_device *vimc) >> -{ >> - unsigned int i; >> - >> - for (i = 0; i < vimc->pipe_cfg->num_ents; i++) >> - platform_device_unregister(vimc->subdevs[i]); >> -} >> - >> -static const struct component_master_ops vimc_comp_ops = { >> - .bind = vimc_comp_bind, >> - .unbind = vimc_comp_unbind, >> -}; >> - >> static int vimc_probe(struct platform_device *pdev) >> { >> struct vimc_device *vimc = container_of(pdev, struct vimc_device, pdev); >> - struct component_match *match = NULL; >> int ret; >> >> dev_dbg(&pdev->dev, "probe"); >> >> memset(&vimc->mdev, 0, sizeof(vimc->mdev)); >> >> - /* Create platform_device for each entity in the topology*/ >> - vimc->subdevs = devm_kcalloc(&vimc->pdev.dev, vimc->pipe_cfg->num_ents, >> - sizeof(*vimc->subdevs), GFP_KERNEL); >> - if (!vimc->subdevs) >> - return -ENOMEM; >> - >> - match = vimc_add_subdevs(vimc); >> - if (IS_ERR(match)) >> - return PTR_ERR(match); >> - >> /* Link the media device within the v4l2_device */ >> vimc->v4l2_dev.mdev = &vimc->mdev; >> >> @@ -314,12 +275,9 @@ static int vimc_probe(struct platform_device *pdev) >> vimc->mdev.dev = &pdev->dev; >> media_device_init(&vimc->mdev); >> >> - /* Add self to the component system */ >> - ret = component_master_add_with_match(&pdev->dev, &vimc_comp_ops, >> - match); >> + ret = vimc_register_devices(vimc); >> if (ret) { >> media_device_cleanup(&vimc->mdev); >> - vimc_rm_subdevs(vimc); >> return ret; >> } >> >> @@ -332,8 +290,8 @@ static int vimc_remove(struct platform_device *pdev) >> >> dev_dbg(&pdev->dev, "remove"); >> >> - component_master_del(&pdev->dev, &vimc_comp_ops); >> vimc_rm_subdevs(vimc); >> + vimc_unregister(vimc); >> >> return 0; >> } >> diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c >> index b72b8385067b..00850f2501ad 100644 >> --- a/drivers/media/platform/vimc/vimc-debayer.c >> +++ b/drivers/media/platform/vimc/vimc-debayer.c >> @@ -15,8 +15,6 @@ >> > > Could you also remove the following headers? > > #include· > #include· > #include· > #include· I will remove all the ones I can. I think I need module.h for the module_param() > >> #include "vimc-common.h" >> >> -#define VIMC_DEB_DRV_NAME "vimc-debayer" >> - >> static unsigned int deb_mean_win_size = 3; >> module_param(deb_mean_win_size, uint, 0000); >> MODULE_PARM_DESC(deb_mean_win_size, " the window size to calculate the mean.\n" >> @@ -491,44 +489,40 @@ static const struct v4l2_subdev_internal_ops vimc_deb_int_ops = { >> .release = vimc_deb_release, >> }; >> >> -static void vimc_deb_comp_unbind(struct device *comp, struct device *master, >> - void *master_data) >> +void vimc_deb_rm(struct vimc_device *vimc, struct vimc_ent_device *ved) >> { >> - struct vimc_ent_device *ved = dev_get_drvdata(comp); >> - struct vimc_deb_device *vdeb = container_of(ved, struct vimc_deb_device, >> - ved); >> + struct vimc_deb_device *vdeb; >> >> + vdeb = container_of(ved, struct vimc_deb_device, ved); >> vimc_ent_sd_unregister(ved, &vdeb->sd); >> } >> >> -static int vimc_deb_comp_bind(struct device *comp, struct device *master, >> - void *master_data) >> +struct vimc_ent_device *vimc_deb_add(struct vimc_device *vimc, >> + const char *vcfg_name) >> { >> - struct v4l2_device *v4l2_dev = master_data; >> - struct vimc_platform_data *pdata = comp->platform_data; >> + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; >> struct vimc_deb_device *vdeb; >> int ret; >> >> /* Allocate the vdeb struct */ >> vdeb = kzalloc(sizeof(*vdeb), GFP_KERNEL); >> if (!vdeb) >> - return -ENOMEM; >> + return NULL; >> >> /* Initialize ved and sd */ >> ret = vimc_ent_sd_register(&vdeb->ved, &vdeb->sd, v4l2_dev, >> - pdata->entity_name, >> + vcfg_name, >> MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV, 2, >> (const unsigned long[2]) {MEDIA_PAD_FL_SINK, >> MEDIA_PAD_FL_SOURCE}, >> &vimc_deb_int_ops, &vimc_deb_ops); >> if (ret) { >> kfree(vdeb); >> - return ret; >> + return NULL; >> } >> >> vdeb->ved.process_frame = vimc_deb_process_frame; >> - dev_set_drvdata(comp, &vdeb->ved); >> - vdeb->dev = comp; >> + vdeb->dev = &vimc->pdev.dev; >> >> /* Initialize the frame format */ >> vdeb->sink_fmt = sink_fmt_default; >> @@ -541,46 +535,5 @@ static int vimc_deb_comp_bind(struct device *comp, struct device *master, >> vdeb->src_code = MEDIA_BUS_FMT_RGB888_1X24; >> vdeb->set_rgb_src = vimc_deb_set_rgb_mbus_fmt_rgb888_1x24; >> >> - return 0; >> + return &vdeb->ved; >> } >> - >> -static const struct component_ops vimc_deb_comp_ops = { >> - .bind = vimc_deb_comp_bind, >> - .unbind = vimc_deb_comp_unbind, >> -}; >> - >> -static int vimc_deb_probe(struct platform_device *pdev) >> -{ >> - return component_add(&pdev->dev, &vimc_deb_comp_ops); >> -} >> - >> -static int vimc_deb_remove(struct platform_device *pdev) >> -{ >> - component_del(&pdev->dev, &vimc_deb_comp_ops); >> - >> - return 0; >> -} >> - >> -static const struct platform_device_id vimc_deb_driver_ids[] = { >> - { >> - .name = VIMC_DEB_DRV_NAME, >> - }, >> - { } >> -}; >> - >> -static struct platform_driver vimc_deb_pdrv = { >> - .probe = vimc_deb_probe, >> - .remove = vimc_deb_remove, >> - .id_table = vimc_deb_driver_ids, >> - .driver = { >> - .name = VIMC_DEB_DRV_NAME, >> - }, >> -}; >> - >> -module_platform_driver(vimc_deb_pdrv); >> - >> -MODULE_DEVICE_TABLE(platform, vimc_deb_driver_ids); >> - >> -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Debayer"); >> -MODULE_AUTHOR("Helen Mae Koike Fornazier "); >> -MODULE_LICENSE("GPL"); >> diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c >> index 49ab8d9dd9c9..28a947950a0b 100644 >> --- a/drivers/media/platform/vimc/vimc-scaler.c >> +++ b/drivers/media/platform/vimc/vimc-scaler.c >> @@ -5,18 +5,13 @@ >> * Copyright (C) 2015-2017 Helen Koike >> */ >> >> -#include >> #include > > You can remove this include as well. We need this for module_param stuff. > >> -#include >> -#include >> #include >> #include >> #include >> >> #include "vimc-common.h" >> >> -#define VIMC_SCA_DRV_NAME "vimc-scaler" >> - >> static unsigned int sca_mult = 3; >> module_param(sca_mult, uint, 0000); >> MODULE_PARM_DESC(sca_mult, " the image size multiplier"); >> @@ -350,89 +345,43 @@ static const struct v4l2_subdev_internal_ops vimc_sca_int_ops = { >> .release = vimc_sca_release, >> }; >> >> -static void vimc_sca_comp_unbind(struct device *comp, struct device *master, >> - void *master_data) >> +void vimc_sca_rm(struct vimc_device *vimc, struct vimc_ent_device *ved) >> { >> - struct vimc_ent_device *ved = dev_get_drvdata(comp); >> - struct vimc_sca_device *vsca = container_of(ved, struct vimc_sca_device, >> - ved); >> + struct vimc_sca_device *vsca; >> >> + vsca = container_of(ved, struct vimc_sca_device, ved); >> vimc_ent_sd_unregister(ved, &vsca->sd); >> } >> >> - >> -static int vimc_sca_comp_bind(struct device *comp, struct device *master, >> - void *master_data) >> +struct vimc_ent_device *vimc_sca_add(struct vimc_device *vimc, >> + const char *vcfg_name) >> { >> - struct v4l2_device *v4l2_dev = master_data; >> - struct vimc_platform_data *pdata = comp->platform_data; >> + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; >> struct vimc_sca_device *vsca; >> int ret; >> >> /* Allocate the vsca struct */ >> vsca = kzalloc(sizeof(*vsca), GFP_KERNEL); >> if (!vsca) >> - return -ENOMEM; >> + return NULL; >> >> /* Initialize ved and sd */ >> ret = vimc_ent_sd_register(&vsca->ved, &vsca->sd, v4l2_dev, >> - pdata->entity_name, >> + vcfg_name, >> MEDIA_ENT_F_PROC_VIDEO_SCALER, 2, >> (const unsigned long[2]) {MEDIA_PAD_FL_SINK, >> MEDIA_PAD_FL_SOURCE}, >> &vimc_sca_int_ops, &vimc_sca_ops); >> if (ret) { >> kfree(vsca); >> - return ret; >> + return NULL; >> } >> >> vsca->ved.process_frame = vimc_sca_process_frame; >> - dev_set_drvdata(comp, &vsca->ved); >> - vsca->dev = comp; >> + vsca->dev = &vimc->pdev.dev; >> >> /* Initialize the frame format */ >> vsca->sink_fmt = sink_fmt_default; >> >> - return 0; >> -} >> - >> -static const struct component_ops vimc_sca_comp_ops = { >> - .bind = vimc_sca_comp_bind, >> - .unbind = vimc_sca_comp_unbind, >> -}; >> - >> -static int vimc_sca_probe(struct platform_device *pdev) >> -{ >> - return component_add(&pdev->dev, &vimc_sca_comp_ops); >> + return &vsca->ved; >> } >> - >> -static int vimc_sca_remove(struct platform_device *pdev) >> -{ >> - component_del(&pdev->dev, &vimc_sca_comp_ops); >> - >> - return 0; >> -} >> - >> -static const struct platform_device_id vimc_sca_driver_ids[] = { >> - { >> - .name = VIMC_SCA_DRV_NAME, >> - }, >> - { } >> -}; >> - >> -static struct platform_driver vimc_sca_pdrv = { >> - .probe = vimc_sca_probe, >> - .remove = vimc_sca_remove, >> - .id_table = vimc_sca_driver_ids, >> - .driver = { >> - .name = VIMC_SCA_DRV_NAME, >> - }, >> -}; >> - >> -module_platform_driver(vimc_sca_pdrv); >> - >> -MODULE_DEVICE_TABLE(platform, vimc_sca_driver_ids); >> - >> -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Scaler"); >> -MODULE_AUTHOR("Helen Mae Koike Fornazier "); >> -MODULE_LICENSE("GPL"); >> diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c >> index 6c53b9fc1617..1f15637ca8bb 100644 >> --- a/drivers/media/platform/vimc/vimc-sensor.c >> +++ b/drivers/media/platform/vimc/vimc-sensor.c >> @@ -5,10 +5,6 @@ >> * Copyright (C) 2015-2017 Helen Koike >> */ >> >> -#include >> -#include >> -#include >> -#include >> #include >> #include >> #include >> @@ -18,8 +14,6 @@ >> >> #include "vimc-common.h" >> >> -#define VIMC_SEN_DRV_NAME "vimc-sensor" >> - >> struct vimc_sen_device { >> struct vimc_ent_device ved; >> struct v4l2_subdev sd; >> @@ -304,13 +298,11 @@ static const struct v4l2_subdev_internal_ops vimc_sen_int_ops = { >> .release = vimc_sen_release, >> }; >> >> -static void vimc_sen_comp_unbind(struct device *comp, struct device *master, >> - void *master_data) >> +void vimc_sen_rm(struct vimc_device *vimc, struct vimc_ent_device *ved) >> { >> - struct vimc_ent_device *ved = dev_get_drvdata(comp); >> - struct vimc_sen_device *vsen = >> - container_of(ved, struct vimc_sen_device, ved); >> + struct vimc_sen_device *vsen; >> >> + vsen = container_of(ved, struct vimc_sen_device, ved); >> vimc_ent_sd_unregister(ved, &vsen->sd); >> } >> >> @@ -331,18 +323,17 @@ static const struct v4l2_ctrl_config vimc_sen_ctrl_test_pattern = { >> .qmenu = tpg_pattern_strings, >> }; >> >> -static int vimc_sen_comp_bind(struct device *comp, struct device *master, >> - void *master_data) >> +struct vimc_ent_device *vimc_sen_add(struct vimc_device *vimc, >> + const char *vcfg_name) >> { >> - struct v4l2_device *v4l2_dev = master_data; >> - struct vimc_platform_data *pdata = comp->platform_data; >> + struct v4l2_device *v4l2_dev = &vimc->v4l2_dev; >> struct vimc_sen_device *vsen; >> int ret; >> >> /* Allocate the vsen struct */ >> vsen = kzalloc(sizeof(*vsen), GFP_KERNEL); >> if (!vsen) >> - return -ENOMEM; >> + return NULL; >> >> v4l2_ctrl_handler_init(&vsen->hdl, 4); >> >> @@ -368,7 +359,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, >> >> /* Initialize ved and sd */ >> ret = vimc_ent_sd_register(&vsen->ved, &vsen->sd, v4l2_dev, >> - pdata->entity_name, >> + vcfg_name, >> MEDIA_ENT_F_CAM_SENSOR, 1, >> (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE}, >> &vimc_sen_int_ops, &vimc_sen_ops); >> @@ -376,8 +367,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, >> goto err_free_hdl; >> >> vsen->ved.process_frame = vimc_sen_process_frame; >> - dev_set_drvdata(comp, &vsen->ved); >> - vsen->dev = comp; >> + vsen->dev = &vimc->pdev.dev; >> >> /* Initialize the frame format */ >> vsen->mbus_format = fmt_default; >> @@ -389,7 +379,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, >> if (ret) >> goto err_unregister_ent_sd; >> >> - return 0; >> + return &vsen->ved; >> >> err_unregister_ent_sd: >> vimc_ent_sd_unregister(&vsen->ved, &vsen->sd); >> @@ -398,46 +388,5 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master, >> err_free_vsen: >> kfree(vsen); >> >> - return ret; >> + return NULL; >> } >> - >> -static const struct component_ops vimc_sen_comp_ops = { >> - .bind = vimc_sen_comp_bind, >> - .unbind = vimc_sen_comp_unbind, >> -}; >> - >> -static int vimc_sen_probe(struct platform_device *pdev) >> -{ >> - return component_add(&pdev->dev, &vimc_sen_comp_ops); >> -} >> - >> -static int vimc_sen_remove(struct platform_device *pdev) >> -{ >> - component_del(&pdev->dev, &vimc_sen_comp_ops); >> - >> - return 0; >> -} >> - >> -static const struct platform_device_id vimc_sen_driver_ids[] = { >> - { >> - .name = VIMC_SEN_DRV_NAME, >> - }, >> - { } >> -}; >> - >> -static struct platform_driver vimc_sen_pdrv = { >> - .probe = vimc_sen_probe, >> - .remove = vimc_sen_remove, >> - .id_table = vimc_sen_driver_ids, >> - .driver = { >> - .name = VIMC_SEN_DRV_NAME, >> - }, >> -}; >> - >> -module_platform_driver(vimc_sen_pdrv); >> - >> -MODULE_DEVICE_TABLE(platform, vimc_sen_driver_ids); >> - >> -MODULE_DESCRIPTION("Virtual Media Controller Driver (VIMC) Sensor"); >> -MODULE_AUTHOR("Helen Mae Koike Fornazier "); >> -MODULE_LICENSE("GPL"); >> > > With these changes: I will send v5 with the suggested changes. > > Acked-by: Helen Koike > thanks, -- Shuah