From patchwork Thu Nov 30 16:46:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Pallardy X-Patchwork-Id: 120247 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp23813qgn; Thu, 30 Nov 2017 08:49:24 -0800 (PST) X-Google-Smtp-Source: AGs4zMYP0pg50cxrFlB3mMjdR/oKzbbuk0PVGAiQ+MRNKae5VDEk6+kGJC7UHFioN9laUctBmN5S X-Received: by 10.99.97.78 with SMTP id v75mr2950988pgb.60.1512060564614; Thu, 30 Nov 2017 08:49:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512060564; cv=none; d=google.com; s=arc-20160816; b=HxwYe7zqici9M9BPcmyX7ukOXYmgd05ZEDkSYoSje15W7o2CerI0fncyi6XZ54kOCV LDzQOw0lBTy8lwxkIce4VgxNBfBsgmqCkyV0jomR7/miLvQJ3g3KCVoVWN3WLNtL2a3D hoehHA2WtfzT5L5Xf5UwMsFwvBxEmhpWPZ16uEgML+v+5YElqhKp70YnrEMhBKlQeVie BHWq6GnA3eOBGUykiT/WOkjX14rXLrdTNnZgmgyuc9ypOWomecLQJ6oCuTcxHBZPnV3R NZKqo/+vbE89vCIwDZlWbxsrzsWMCbcCZfD17q8B51c8EzI0Im41naIx1Qyxr5imA+Ks 9Ibw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=uQd9qz5UoWXth8nFFMzUnzE4icdOnfkkdNQRg1M1Uys=; b=k2k+CknDe4+wpB5kWHxNlkTNzeQe9mHWF7synDAVRsRLYj04wgi3mTUjLd9YQ3rzS3 PTgaSsdk+GfUxiaTOiidX2u1yL9fLN1UVBFEvXp/M4qIMnYiy5dHmzhgl2XjP31/O7tp 23kkTzNubMK2FOFvgLxoiHzX/P0tBs69usFPmqiUJYWJ7IcDSbMoU7Ov+uzzffBl54fQ UcaouhYu+YQ762u/tbf/rGXqbTVHnvtD+2l57MGv5DqsOj7mFllcploKmX7xruSMvDoY tDr/ZoNxSRs35cdjRC0rxoRapQBRKFpnmGo1efyYUGQ2kukgwXNYDfZ7uzYEzzWRcXbM KvSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t3si3237393pgf.710.2017.11.30.08.49.24; Thu, 30 Nov 2017 08:49:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753681AbdK3QtV (ORCPT + 28 others); Thu, 30 Nov 2017 11:49:21 -0500 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:40986 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753489AbdK3QrU (ORCPT ); Thu, 30 Nov 2017 11:47:20 -0500 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx08-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vAUGiRAP017805; Thu, 30 Nov 2017 17:47:18 +0100 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2ef09hkt59-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 30 Nov 2017 17:47:18 +0100 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id DD3E338; Thu, 30 Nov 2017 16:47:17 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag7node2.st.com [10.75.127.20]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id C1991537A; Thu, 30 Nov 2017 16:47:17 +0000 (GMT) Received: from localhost (10.75.127.47) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Thu, 30 Nov 2017 17:47:17 +0100 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH v2 09/16] remoteproc: add memory device management support Date: Thu, 30 Nov 2017 17:46:44 +0100 Message-ID: <1512060411-729-10-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1512060411-729-1-git-send-email-loic.pallardy@st.com> References: <1512060411-729-1-git-send-email-loic.pallardy@st.com> MIME-Version: 1.0 X-Originating-IP: [10.75.127.47] X-ClientProxiedBy: SFHDAG4NODE2.st.com (10.75.127.11) To SFHDAG7NODE2.st.com (10.75.127.20) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-30_05:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch add functions to create and delete some remoteproc sub-devices with dedicated dma coherent region. These "memory devices" are identified by their name and will be used for carveout, vring, buffers allocation in specific memory region. Signed-off-by: Loic Pallardy --- drivers/remoteproc/remoteproc_core.c | 134 ++++++++++++++++++++++++++++++++--- 1 file changed, 123 insertions(+), 11 deletions(-) -- 1.9.1 diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index cc53247..76d54bf 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -69,6 +69,127 @@ static const char *rproc_crash_to_string(enum rproc_crash_type type) return "unknown"; } +static phys_addr_t rproc_va_to_pa(void *cpu_addr) +{ + if (is_vmalloc_addr(cpu_addr)) { + return page_to_phys(vmalloc_to_page(cpu_addr)) + + offset_in_page(cpu_addr); + } + + WARN_ON(!virt_addr_valid(cpu_addr)); + return virt_to_phys(cpu_addr); +} + +struct rproc_memdev { + struct device dev; + struct rproc *rproc; + struct rproc_mem_entry *mem; +}; + +#define to_memdevice(d) container_of(d, struct rproc_memdev, dev) + +/** + * rproc_memdev_release() - release the existence of a memdevice + * + * @dev: the subdevice's dev + */ +static void rproc_memdev_release(struct device *dev) +{ + struct rproc_memdev *memd = to_memdevice(dev); + + kfree(memd); +} + +/** + * rproc_memdev_add() - add a memory-device on remote processor + * + * @rproc: the parent remote processor + * @mem: memory resource entry allow to define the dma coherent memory of memory-device + * + * This function add a memory-device child on rproc parent. This memory-device allow + * to define a new dma coherent memory area. When the rproc would alloc a + * dma coherent memory it's find the memory-device that match with physical memory + * asked (if there is no children that match, the rproc is the default device) + * + * Returns the memory-device handle on success, and error on failure. + */ +static struct rproc_memdev *rproc_memdev_add(struct rproc *rproc, + struct rproc_mem_entry *mem) +{ + struct rproc_memdev *memd; + int ret; + + if (!mem || strlen(mem->name) == 0) { + ret = -EINVAL; + goto err; + } + + memd = kzalloc(sizeof(*memd), GFP_KERNEL); + if (!memd) { + ret = -ENOMEM; + goto err; + } + + memd->rproc = rproc; + memd->mem = mem; + memd->dev.parent = rproc->dev.parent; + memd->dev.release = rproc_memdev_release; + dev_set_name(&memd->dev, "%s#%s", dev_name(memd->dev.parent), mem->name); + dev_set_drvdata(&memd->dev, memd); + + ret = device_register(&memd->dev); + if (ret) + goto err_dev; + + ret = dmam_declare_coherent_memory(&memd->dev, + rproc_va_to_pa(mem->va), mem->da, + mem->len, + DMA_MEMORY_EXCLUSIVE); + if (ret < 0) + goto err_dev; + + return memd; + +err_dev: + put_device(&memd->dev); +err: + dev_err(&rproc->dev, "unable to register subdev %s, err = %d\n", + (mem && strlen(mem->name)) ? mem->name : "unnamed", ret); + return ERR_PTR(ret); +} + +/** + * rproc_memdev_del() - delete a memory-device of remote processor + * + * @memdev: rproc memory-device + */ +static void rproc_memdev_del(struct rproc_memdev *memdev) +{ + if (get_device(&memdev->dev)) { + device_unregister(&memdev->dev); + put_device(&memdev->dev); + } +} + +/** + * rproc_memdev_unregister() - unregister memory-device of remote processor + * + * @dev: rproc memory-device + * @data: Not use (just to be compliant with device_for_each_child) + * + * This function is called by device_for_each_child function when unregister + * remote processor. + */ +static int rproc_memdev_unregister(struct device *dev, void *data) +{ + struct rproc_memdev *memd = to_memdevice(dev); + struct rproc *rproc = data; + + if (dev != &rproc->dev) + rproc_memdev_del(memd); + return 0; +} + /* * This is the IOMMU fault handler we register with the IOMMU API * (when relevant; not all remote processors access memory through @@ -139,17 +260,6 @@ static void rproc_disable_iommu(struct rproc *rproc) iommu_domain_free(domain); } -static phys_addr_t rproc_va_to_pa(void *cpu_addr) -{ - if (is_vmalloc_addr(cpu_addr)) { - return page_to_phys(vmalloc_to_page(cpu_addr)) + - offset_in_page(cpu_addr); - } - - WARN_ON(!virt_addr_valid(cpu_addr)); - return virt_to_phys(cpu_addr); -} - /** * rproc_da_to_va() - lookup the kernel virtual address for a remoteproc address * @rproc: handle of a remote processor @@ -1678,6 +1788,8 @@ int rproc_del(struct rproc *rproc) rproc_delete_debug_dir(rproc); + device_for_each_child(rproc->dev.parent, rproc, + rproc_memdev_unregister); /* the rproc is downref'ed as soon as it's removed from the klist */ mutex_lock(&rproc_list_mutex); list_del(&rproc->node);