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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 AD4C0C2BB85 for ; Thu, 16 Apr 2020 16:14:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8594B22243 for ; Thu, 16 Apr 2020 16:14:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="IPix+z6b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2895271AbgDPQOy (ORCPT ); Thu, 16 Apr 2020 12:14:54 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:61124 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2636521AbgDPQO2 (ORCPT ); Thu, 16 Apr 2020 12:14:28 -0400 Received: from pps.filterd (m0046668.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03GGDEcC005340; Thu, 16 Apr 2020 18:14:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=STMicroelectronics; bh=x/YFvpKguyxR4K0R9rEA/U7cUeNFm3Fzc4388HJ8uh8=; b=IPix+z6bgetGW5L+Zp0JYcGILP6KJi7xFb+o9q4/8rfLr9NUaRWMAhtlYrpio5SHaDIs 6C01weLAHT4VP7NuIHu4tNaLnWxqWMizwWaQcvlg0Ut5Pcfm2IHUD8NtLO4vxtM+XVQa +F9TePZ+nEsnwnlbsCJqljZPecVNnDrF4pbOvhafYGku7TQgpm9LLpC00xCwXNafG8ZH QMOIpWGIIvvSOAsyQVMxwFnfA+WUbal3aEPBvtEjYGvbijvXrykG+KjbtGFVURgtEaky nx8VPaPda3jBC2Gnri8jE7D1nLvarrTjwr66b25eGrIWluCYydIepRG/xKOyVAJsIMS+ GA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 30dn6t3ncs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 16 Apr 2020 18:14:24 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 6041310002A; Thu, 16 Apr 2020 18:14:24 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag3node1.st.com [10.75.127.7]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 5361A2B2D2A; Thu, 16 Apr 2020 18:14:24 +0200 (CEST) Received: from localhost (10.75.127.45) by SFHDAG3NODE1.st.com (10.75.127.7) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 16 Apr 2020 18:14:23 +0200 From: Arnaud Pouliquen To: Bjorn Andersson , Ohad Ben-Cohen , Mathieu Poirier CC: , , , Subject: [RFC 12/18] remoteproc: Support of pre-registered virtio device Date: Thu, 16 Apr 2020 18:13:25 +0200 Message-ID: <20200416161331.7606-13-arnaud.pouliquen@st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200416161331.7606-1-arnaud.pouliquen@st.com> References: <20200416161331.7606-1-arnaud.pouliquen@st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.45] X-ClientProxiedBy: SFHDAG5NODE1.st.com (10.75.127.13) To SFHDAG3NODE1.st.com (10.75.127.7) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.676 definitions=2020-04-16_06:2020-04-14,2020-04-16 signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Management of the virtio device declared in the devicetree as a sub device of the remoteproc. Instead of creating a new platform device, we parse first the rvdevs list to look for a pre-registered rvdev with an index, that matches with the vdev instance of the resource table. If no pre-registered vdev is found a new platform device is created. Signed-off-by: Arnaud Pouliquen --- drivers/remoteproc/remoteproc_core.c | 51 +++++++++++++++++----------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index ecb36f64b1a0..9238aa292644 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -383,8 +383,8 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, { struct device *dev = &rproc->dev; struct rproc_vdev_data vdev_data; + struct rproc_vdev *rvdev = NULL, *tmp_rvdev; struct platform_device *pdev; - int ret; /* make sure resource isn't truncated */ if (struct_size(rsc, vring, rsc->num_of_vrings) + rsc->config_len > @@ -399,27 +399,40 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, return -EINVAL; } - vdev_data.rsc_offset = offset; - vdev_data.rsc = rsc; - vdev_data.id = rsc->id; - vdev_data.index = rproc->nb_vdev; + /* Try to find a pre-registered rproc virtio device */ + list_for_each_entry(tmp_rvdev, &rproc->rvdevs, node) { + if (tmp_rvdev->index == rproc->nb_vdev) { + rvdev = tmp_rvdev; + break; + } + } - dev_dbg(dev, "%s: rsc_offset = %d rsc = %p id = %d\n", - __func__, vdev_data.rsc_offset, vdev_data.rsc, vdev_data.id); + if (rvdev) { + /* assign the resource offset */ + rvdev->rsc_offset = offset; + rvdev->rsc = rsc; + rvdev->id = rsc->id; - pdev = platform_device_register_data(dev, "rproc-virtio", - rproc->nb_vdev, &vdev_data, - sizeof(vdev_data)); - ret = PTR_ERR_OR_ZERO(pdev); - if (ret) { - dev_err(rproc->dev.parent, - "failed to create rproc-virtio device\n"); - return ret; + } else { + /* no rproc vdev found, register one */ + vdev_data.rsc_offset = offset; + vdev_data.rsc = rsc; + vdev_data.id = rsc->id; + vdev_data.index = rproc->nb_vdev; + + pdev = platform_device_register_data(dev, "rproc-virtio", + rproc->nb_vdev, &vdev_data, + sizeof(vdev_data)); + if (PTR_ERR_OR_ZERO(pdev)) { + dev_err(rproc->dev.parent, + "failed to create rproc-virtio device\n"); + return PTR_ERR_OR_ZERO(pdev); + } + /* register a component associated to the virtio platform */ + component_match_add_release(&pdev->dev, &rproc->match, + rproc_release_of, rproc_compare_of, + &pdev->dev); } - /* register a component associated to the virtio platform */ - component_match_add_release(&pdev->dev, &rproc->match, - rproc_release_of, rproc_compare_of, - &pdev->dev); rproc->nb_vdev++; return 0; -- 2.17.1