Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp1121132pxb; Fri, 1 Oct 2021 04:05:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy3jW5gsoabQkqhFjnt82Mha5f7nk/neR/MadHMt6J33qPhuZkE0rgjzOoGi8o3BYGXfm+n X-Received: by 2002:aa7:97bc:0:b0:44c:53f:fbd with SMTP id d28-20020aa797bc000000b0044c053f0fbdmr6002420pfq.19.1633086345811; Fri, 01 Oct 2021 04:05:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633086345; cv=none; d=google.com; s=arc-20160816; b=VLc9UNQopeiLZz5V9Bn7Ul4nrtrvsdozY6R17AG0WmHfB1u1frkuvJU26QnoxatNtl EDLXjXN+9DzMJVaTcht6cXrq8jL6SUvy4Sv4Y530QI3heTPSuUnQaFTSjnU/j8pi/km0 50lZNPk/H3VIjQhtpYPJvpEU78os6GMAj/tPTOMYvWJpov+ZjJmaVv2wMbL68DWbo+Zr kQbPGi1kdZvC3jkT73Yhmp5uLBbfVsBWrrD9QfiE+5CTwfCZfU62CaoeiCxOAlQ87vjc 86yrdHBvXFxcCa0h91AnQ/1ksUMSNZtfcquoQJJjsEbXPQLBwEsOY0Y7fW8tLMRaDNZx PoSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=k5eZoy/Oi0pd8rrnAh553nooZA4WeP9CiI99yZeGReQ=; b=PPlh/d6tYmmMnIbS/SrfGXlXtJfpdHn1Z7pj0cyrFcf0rpZorgu6qVTL3brUkRRD8G 65Tlu6UUdcXvLJUC6V5Ez9od11bzsLIUjQKotyGPCJL0ud7KBJhoX/moBnqTxmTUVmx1 IssOpLH/Hy/4wY9hCRNZdXQ1+duPffYbauxE5nclEO+pzIKHsXswXVNqJBQyzOcaGxWj qcmcSpP0TZ7wfqKvw+ACooNWZD1C5tzKFWRq7HAebRsg/q8LvFrtWyg4xBcFwAju2K98 Nxm2HuC9mHJm4GgZX5yN7SJXFWQ3wbo8UcSyHpLRtyveGt/XvUEWLp7/0KIBuqj1jkPo We8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=YdBfRDRd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h8si7767156pjq.130.2021.10.01.04.05.19; Fri, 01 Oct 2021 04:05:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=YdBfRDRd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353561AbhJAKQt (ORCPT + 99 others); Fri, 1 Oct 2021 06:16:49 -0400 Received: from mx07-00178001.pphosted.com ([185.132.182.106]:59222 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353532AbhJAKQo (ORCPT ); Fri, 1 Oct 2021 06:16:44 -0400 Received: from pps.filterd (m0241204.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1916jZGB023307; Fri, 1 Oct 2021 12:12:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=selector1; bh=k5eZoy/Oi0pd8rrnAh553nooZA4WeP9CiI99yZeGReQ=; b=YdBfRDRdo3ebDqlp43jG0bqw/YH4C4ARtHGVvmy2nQ8SFQ9AnaOBF92Jr3QJvOASX+DW OJDYz0QH7LpZUPtoE0LJ0+WhyJ2hVkYn8f3JyoCdlfzhBXKNqB788JUr6WCTQhv8pzW+ zu/V1Pb1AOmdRUgaYYh+VUEqdZtVwivfId/piyuU2FV6ywMtcsrzjBA4eSCsAzsXXh3K B83/IeTQTDhuQLK7jpl8wRKuyDg92439ptNI+OUboLsA0csKu0dw4P5aMl5DREeW9nXE AocXyM1sqvDp7fZ1aByHvwszjfHj4kj8FjjeBn1nyQe31/szseiToHLkIrOPkXMgh8st TA== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 3bdwbjh77f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 01 Oct 2021 12:12:54 +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 8F1F4100038; Fri, 1 Oct 2021 12:12:49 +0200 (CEST) Received: from Webmail-eu.st.com (sfhdag2node2.st.com [10.75.127.5]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 84D92226FDD; Fri, 1 Oct 2021 12:12:49 +0200 (CEST) Received: from localhost (10.75.127.48) by SFHDAG2NODE2.st.com (10.75.127.5) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Fri, 1 Oct 2021 12:12:48 +0200 From: Arnaud Pouliquen To: Bjorn Andersson , Ohad Ben-Cohen , Mathieu Poirier CC: , , , Rob Herring , Christoph Hellwig , Stefano Stabellini , Bruce Ashfield , Subject: [RFC PATCH 7/7] remoteproc: Instantiate the new remoteproc virtio platform device Date: Fri, 1 Oct 2021 12:12:34 +0200 Message-ID: <20211001101234.4247-8-arnaud.pouliquen@foss.st.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211001101234.4247-1-arnaud.pouliquen@foss.st.com> References: <20211001101234.4247-1-arnaud.pouliquen@foss.st.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.75.127.48] X-ClientProxiedBy: SFHDAG1NODE2.st.com (10.75.127.2) To SFHDAG2NODE2.st.com (10.75.127.5) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.391,FMLib:17.0.607.475 definitions=2021-10-01_01,2021-10-01_01,2020-04-07_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Migrate from the rvdev device to the rvdev platform device. From this patch, when a vdev resource is found in the resource table the remoteproc core register a platform device. All reference to the rvdev->dev has been updated to rvdev-pdev->dev The use of kref counter is replaced by get/put_device on the remoteproc virtio device. Signed-off-by: Arnaud Pouliquen --- drivers/remoteproc/remoteproc_core.c | 49 +++++++------ drivers/remoteproc/remoteproc_internal.h | 16 ---- drivers/remoteproc/remoteproc_virtio.c | 93 ++++++------------------ include/linux/remoteproc.h | 4 - 4 files changed, 50 insertions(+), 112 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 67ccd088db8f..d9256db8b130 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -467,6 +467,8 @@ static int rproc_handle_vdev(struct rproc *rproc, void *ptr, { struct fw_rsc_vdev *rsc = ptr; struct device *dev = &rproc->dev; + struct rproc_vdev_data vdev_data; + struct platform_device *pdev; struct rproc_vdev *rvdev; int i, ret; @@ -486,28 +488,34 @@ static int rproc_handle_vdev(struct rproc *rproc, void *ptr, dev_dbg(dev, "vdev rsc: id %d, dfeatures 0x%x, cfg len %d, %d vrings\n", rsc->id, rsc->dfeatures, rsc->config_len, rsc->num_of_vrings); - /* we currently support only two vrings per rvdev */ - if (rsc->num_of_vrings > ARRAY_SIZE(rvdev->vring)) { - dev_err(dev, "too many vrings: %d\n", rsc->num_of_vrings); - return -EINVAL; - } + /* platform data of the new rvdev platform */ + vdev_data.rsc_offset = offset; + vdev_data.id = rsc->id; + vdev_data.index = rproc->nb_vdev; - rvdev = kzalloc(sizeof(*rvdev), GFP_KERNEL); - if (!rvdev) - return -ENOMEM; - - kref_init(&rvdev->refcount); - - rvdev->id = rsc->id; - rvdev->rproc = rproc; - rvdev->index = rproc->nb_vdev; + pdev = rproc_virtio_register_device(rproc, &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); + } - ret = rproc_rvdev_add_device(rvdev); - if (ret) - return ret; + /* If we made it to this point the remote proc virtio platform at been probed */ + rvdev = platform_get_drvdata(pdev); + if (WARN_ON(!rvdev)) { + ret = -EINVAL; + goto free_rvdev; + } rproc->nb_vdev++; + /* we currently support only two vrings per rvdev */ + if (rsc->num_of_vrings > ARRAY_SIZE(rvdev->vring)) { + dev_err(dev, "too many vrings: %d\n", rsc->num_of_vrings); + ret = -EINVAL; + goto free_rvdev; + } + /* parse the vrings */ for (i = 0; i < rsc->num_of_vrings; i++) { ret = rproc_parse_vring(rvdev, rsc, i); @@ -515,9 +523,6 @@ static int rproc_handle_vdev(struct rproc *rproc, void *ptr, goto free_rvdev; } - /* remember the resource offset*/ - rvdev->rsc_offset = offset; - /* allocate the vring resources */ for (i = 0; i < rsc->num_of_vrings; i++) { ret = rproc_alloc_vring(rvdev, i); @@ -531,7 +536,7 @@ static int rproc_handle_vdev(struct rproc *rproc, void *ptr, for (i--; i >= 0; i--) rproc_free_vring(&rvdev->vring[i]); free_rvdev: - device_unregister(&rvdev->dev); + rproc_virtio_unregister_device(rvdev); return ret; } @@ -1270,7 +1275,7 @@ void rproc_resource_cleanup(struct rproc *rproc) /* clean up remote vdev entries */ list_for_each_entry_safe(rvdev, rvtmp, &rproc->rvdevs, node) - kref_put(&rvdev->refcount, rproc_vdev_release); + rproc_virtio_unregister_device(rvdev); rproc_coredump_cleanup(rproc); } diff --git a/drivers/remoteproc/remoteproc_internal.h b/drivers/remoteproc/remoteproc_internal.h index 0bb1b14e5136..2f68e7380c77 100644 --- a/drivers/remoteproc/remoteproc_internal.h +++ b/drivers/remoteproc/remoteproc_internal.h @@ -38,12 +38,10 @@ int rproc_of_parse_firmware(struct device *dev, int index, /* from remoteproc_virtio.c */ #if IS_ENABLED(CONFIG_REMOTEPROC_VIRTIO) -int rproc_rvdev_add_device(struct rproc_vdev *rvdev); struct platform_device * rproc_virtio_register_device(struct rproc *rproc, struct rproc_vdev_data *vdev_data); void rproc_virtio_unregister_device(struct rproc_vdev *rvdev); irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id); -void rproc_vdev_release(struct kref *ref); #else @@ -59,14 +57,6 @@ static inline void rproc_virtio_unregister_device(struct rproc_vdev *rvdev) WARN_ON(1); } -int rproc_rvdev_add_device(struct rproc_vdev *rvdev) -{ - /* This shouldn't be possible */ - WARN_ON(1); - - return -ENXIO; -} - static inline irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id) { /* This shouldn't be possible */ @@ -75,12 +65,6 @@ static inline irqreturn_t rproc_vq_interrupt(struct rproc *rproc, int vq_id) return IRQ_NONE; } -static inline void rproc_vdev_release(struct kref *ref) -{ - /* This shouldn't be possible */ - WARN_ON(1); -} - #endif /* from remoteproc_debugfs.c */ diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c index 7188fb8ce40f..34781a2136e6 100644 --- a/drivers/remoteproc/remoteproc_virtio.c +++ b/drivers/remoteproc/remoteproc_virtio.c @@ -29,7 +29,11 @@ static struct rproc_vdev *vdev_to_rvdev(struct virtio_device *vdev) { - return container_of(vdev->dev.parent, struct rproc_vdev, dev); + struct platform_device *pdev; + + pdev = container_of(vdev->dev.parent, struct platform_device, dev); + + return platform_get_drvdata(pdev); } static struct rproc *vdev_to_rproc(struct virtio_device *vdev) @@ -343,13 +347,10 @@ static void rproc_virtio_dev_release(struct device *dev) { struct virtio_device *vdev = dev_to_virtio(dev); struct rproc_vdev *rvdev = vdev_to_rvdev(vdev); - struct rproc *rproc = vdev_to_rproc(vdev); kfree(vdev); - kref_put(&rvdev->refcount, rproc_vdev_release); - - put_device(&rproc->dev); + put_device(&rvdev->pdev->dev); } /** @@ -365,7 +366,7 @@ static void rproc_virtio_dev_release(struct device *dev) static int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id) { struct rproc *rproc = rvdev->rproc; - struct device *dev = &rvdev->dev; + struct device *dev = &rvdev->pdev->dev; struct virtio_device *vdev; struct rproc_mem_entry *mem; int ret; @@ -436,17 +437,15 @@ static int rproc_add_virtio_dev(struct rproc_vdev *rvdev, int id) vdev->dev.release = rproc_virtio_dev_release; /* - * We're indirectly making a non-temporary copy of the rproc pointer + * We're indirectly making a non-temporary copy of the rvdev pointer * here, because drivers probed with this vdev will indirectly * access the wrapping rproc. * - * Therefore we must increment the rproc refcount here, and decrement + * Therefore we must increment the rvdev refcount here, and decrement * it _only_ when the vdev is released. */ - get_device(&rproc->dev); + get_device(dev); - /* Reference the vdev and vring allocations */ - kref_get(&rvdev->refcount); ret = register_virtio_device(vdev); if (ret) { @@ -488,57 +487,33 @@ static int rproc_vdev_do_start(struct rproc_subdev *subdev) static void rproc_vdev_do_stop(struct rproc_subdev *subdev, bool crashed) { struct rproc_vdev *rvdev = container_of(subdev, struct rproc_vdev, subdev); + struct device *dev = &rvdev->pdev->dev; int ret; - ret = device_for_each_child(&rvdev->dev, NULL, rproc_remove_virtio_dev); + ret = device_for_each_child(dev, NULL, rproc_remove_virtio_dev); if (ret) - dev_warn(&rvdev->dev, "can't remove vdev child device: %d\n", ret); -} - -/** - * rproc_rvdev_release() - release the existence of a rvdev - * - * @dev: the subdevice's dev - */ -static void rproc_rvdev_release(struct device *dev) -{ - struct rproc_vdev *rvdev = container_of(dev, struct rproc_vdev, dev); - - of_reserved_mem_device_release(dev); - - kfree(rvdev); + dev_warn(dev, "can't remove vdev child device: %d\n", ret); } -int rproc_rvdev_add_device(struct rproc_vdev *rvdev) +static int rproc_rvdev_add_device(struct rproc_vdev *rvdev) { struct rproc *rproc = rvdev->rproc; - char name[16]; + struct device *dev = &rvdev->pdev->dev; int ret; - snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index); - rvdev->dev.parent = &rproc->dev; - ret = copy_dma_range_map(&rvdev->dev, rproc->dev.parent); + ret = copy_dma_range_map(dev, rproc->dev.parent); if (ret) return ret; - rvdev->dev.release = rproc_rvdev_release; - dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name); - dev_set_drvdata(&rvdev->dev, rvdev); - ret = device_register(&rvdev->dev); - if (ret) { - put_device(&rvdev->dev); - return ret; - } /* Make device dma capable by inheriting from parent's capabilities */ - set_dma_ops(&rvdev->dev, get_dma_ops(rproc->dev.parent)); + set_dma_ops(dev, get_dma_ops(rproc->dev.parent)); - ret = dma_coerce_mask_and_coherent(&rvdev->dev, - dma_get_mask(rproc->dev.parent)); + ret = dma_coerce_mask_and_coherent(dev, dma_get_mask(rproc->dev.parent)); if (ret) { - dev_warn(&rvdev->dev, - "Failed to set DMA mask %llx. Trying to continue... %x\n", + dev_warn(dev, "Failed to set DMA mask %llx. Trying to continue... %x\n", dma_get_mask(rproc->dev.parent), ret); + return ret; } rproc_register_rvdev(rvdev); @@ -548,30 +523,9 @@ int rproc_rvdev_add_device(struct rproc_vdev *rvdev) rproc_add_subdev(rproc, &rvdev->subdev); - return 0; -} - -static void rproc_rvdev_remove_device(struct rproc_vdev *rvdev) -{ - struct rproc *rproc = rvdev->rproc; - - rproc_remove_subdev(rproc, &rvdev->subdev); - rproc_unregister_rvdev(rvdev); - device_unregister(&rvdev->dev); -} - -void rproc_vdev_release(struct kref *ref) -{ - struct rproc_vdev *rvdev = container_of(ref, struct rproc_vdev, refcount); - struct rproc_vring *rvring; - int id; + dev_dbg(dev, "virtio dev %d added\n", rvdev->index); - for (id = 0; id < ARRAY_SIZE(rvdev->vring); id++) { - rvring = &rvdev->vring[id]; - rproc_free_vring(rvring); - } - - rproc_rvdev_remove_device(rvdev); + return 0; } /** @@ -590,8 +544,7 @@ rproc_virtio_register_device(struct rproc *rproc, struct rproc_vdev_data *vdev_d pdev = platform_device_register_data(dev, "rproc-virtio", vdev_data->index, vdev_data, sizeof(*vdev_data)); if (PTR_ERR_OR_ZERO(pdev)) { - dev_err(rproc->dev.parent, - "failed to create rproc-virtio device\n"); + dev_err(rproc->dev.parent, "failed to create rproc-virtio device\n"); } return pdev; diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h index 542a3d4664f2..7951a3e2b62a 100644 --- a/include/linux/remoteproc.h +++ b/include/linux/remoteproc.h @@ -614,10 +614,8 @@ struct rproc_vring { /** * struct rproc_vdev - remoteproc state for a supported virtio device - * @refcount: reference counter for the vdev and vring allocations * @subdev: handle for registering the vdev as a rproc subdevice * @pdev: remoteproc virtio platform device - * @dev: device struct used for reference count semantics * @id: virtio device id (as in virtio_ids.h) * @node: list node * @rproc: the rproc handle @@ -626,11 +624,9 @@ struct rproc_vring { * @index: vdev position versus other vdev declared in resource table */ struct rproc_vdev { - struct kref refcount; struct rproc_subdev subdev; struct platform_device *pdev; - struct device dev; unsigned int id; struct list_head node; -- 2.17.1