From patchwork Fri Jan 27 15:32:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 9542101 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CC898601D7 for ; Fri, 27 Jan 2017 15:47:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEA0D2022B for ; Fri, 27 Jan 2017 15:47:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B33022621F; Fri, 27 Jan 2017 15:47:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 315872022B for ; Fri, 27 Jan 2017 15:47:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932928AbdA0Pnp (ORCPT ); Fri, 27 Jan 2017 10:43:45 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:34484 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933208AbdA0Pmk (ORCPT ); Fri, 27 Jan 2017 10:42:40 -0500 Received: by mail-wm0-f51.google.com with SMTP id p192so240460wme.1 for ; Fri, 27 Jan 2017 07:41:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9zTtu0TfdvIk6x/nK1Ph+6LNBvBcbq4uOvFfPbrzTFE=; b=XpyXRTO9IZNsMgQ0j6ajc2rTFaxi2Bxpuyf3nct/edmOsIxTAqwb1sQskqjNorHC/v FQ+/BO9XilCnmIrOyFLggkRYbx4Dq+7b8TTS/g2c51Z3EFcBIJgEX5p2sbpnUUUzusKP apt8sFrjt7iBW9Bw7HviXBPmhhcLvZW8k6HHo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9zTtu0TfdvIk6x/nK1Ph+6LNBvBcbq4uOvFfPbrzTFE=; b=KQBtEifrt5Fe5PQ/w6QB6HNGhWq9w3itl25N9DeSd63aTgS2exXVHyyOETWjb0migK sSplIvfn5w9j/Cd+JzWH7jBXjjVi7LM37sUZdWXlQNl9rQrpzQa18t0byyyolOZnRrRO b/lB408X62WyLJq4xBdXomil9FUWWUz6ypZftE2KrZH4V4KlCFmmc3tYfq9n+Y43W5aD km8gfUw02vIqtM1bFPLfHhdMBvEihufZKZQlpmK5woTsVGNsQiAFYpXaL281lPmPhVYZ UkK7RFEVQAgiG0s9TEG6iTNfpHG5J3kCK6cLzjoigwz1fqJpbaQfdZthXiTcUkbqpPCF +iRw== X-Gm-Message-State: AIkVDXIy1Q6J/zo96sC711SBcvhOnLTTENoW+3y4Jlizo/EfWs3e46ogFRBYHm3RdX/aF3VC X-Received: by 10.28.46.73 with SMTP id u70mr3494382wmu.54.1485531195555; Fri, 27 Jan 2017 07:33:15 -0800 (PST) Received: from mms-0440.qualcomm.mm-sol.com ([37.157.136.206]) by smtp.gmail.com with ESMTPSA id h75sm8447474wrh.37.2017.01.27.07.33.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 07:33:15 -0800 (PST) From: Stanimir Varbanov To: Ohad Ben-Cohen , Bjorn Andersson , Rob Herring Cc: Stephen Boyd , Andy Gross , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Stanimir Varbanov Subject: [PATCH v3 2/2] remoteproc: qcom: add Venus video core firmware loader driver Date: Fri, 27 Jan 2017 17:32:57 +0200 Message-Id: <1485531177-3543-3-git-send-email-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485531177-3543-1-git-send-email-stanimir.varbanov@linaro.org> References: <1485531177-3543-1-git-send-email-stanimir.varbanov@linaro.org> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This driver will load and authenticate the Venus firmware and bringing it core out of reset. Those two functionalities are via secure monitor calls to trusted environment. Signed-off-by: Stanimir Varbanov --- drivers/remoteproc/Kconfig | 12 +++ drivers/remoteproc/Makefile | 1 + drivers/remoteproc/qcom_venus_pil.c | 208 ++++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+) create mode 100644 drivers/remoteproc/qcom_venus_pil.c diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index a5e888043f1f..08ee26db9d2b 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -110,6 +110,18 @@ config QCOM_WCNSS_PIL Say y here to support the Peripheral Image Loader for the Qualcomm Wireless Connectivity Subsystem. +config QCOM_VENUS_PIL + tristate "Qualcomm Venus Peripheral Image Loader" + depends on OF && ARCH_QCOM + depends on QCOM_SCM + select QCOM_MDT_LOADER + select REMOTEPROC + help + Say y here to support Qualcomm Peripherial Image Loader for the + Venus remote processor. The Venus remote processor is a + micro-controller plus dedicated hardware for video acceleration + of video decoding and encoding operations. + config ST_REMOTEPROC tristate "ST remoteproc support" depends on ARCH_STI diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile index 0938ea3c41ba..9bb292e4bac4 100644 --- a/drivers/remoteproc/Makefile +++ b/drivers/remoteproc/Makefile @@ -17,5 +17,6 @@ obj-$(CONFIG_QCOM_Q6V5_PIL) += qcom_q6v5_pil.o obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o qcom_wcnss_pil-y += qcom_wcnss.o qcom_wcnss_pil-y += qcom_wcnss_iris.o +obj-$(CONFIG_QCOM_VENUS_PIL) += qcom_venus_pil.o obj-$(CONFIG_ST_REMOTEPROC) += st_remoteproc.o obj-$(CONFIG_ST_SLIM_REMOTEPROC) += st_slim_rproc.o diff --git a/drivers/remoteproc/qcom_venus_pil.c b/drivers/remoteproc/qcom_venus_pil.c new file mode 100644 index 000000000000..3057bc67cf72 --- /dev/null +++ b/drivers/remoteproc/qcom_venus_pil.c @@ -0,0 +1,208 @@ +/* + * Qualcomm Venus Peripheral Image Loader + * + * Copyright (C) 2017 Linaro Ltd + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "qcom_mdt_loader.h" +#include "remoteproc_internal.h" + +#define VENUS_FIRMWARE_NAME "venus.mdt" +#define VENUS_PAS_ID 9 +#define VENUS_FW_MEM_SIZE SZ_8M + +struct qcom_venus { + struct device *dev; + struct rproc *rproc; + phys_addr_t fw_addr; + phys_addr_t mem_phys; + void *mem_va; + size_t mem_size; +}; + +static int venus_load(struct rproc *rproc, const struct firmware *fw) +{ + struct qcom_venus *venus = rproc->priv; + phys_addr_t pa; + size_t fw_size; + bool relocate; + int ret; + + ret = qcom_scm_pas_init_image(VENUS_PAS_ID, fw->data, fw->size); + if (ret) { + dev_err(&rproc->dev, "invalid firmware metadata (%d)\n", ret); + return -EINVAL; + } + + ret = qcom_mdt_parse(fw, &venus->fw_addr, &fw_size, &relocate); + if (ret) { + dev_err(&rproc->dev, "failed to parse mdt header (%d)\n", ret); + return ret; + } + + if (fw_size > venus->mem_size) + return -ENOMEM; + + pa = relocate ? venus->mem_phys : venus->fw_addr; + + ret = qcom_scm_pas_mem_setup(VENUS_PAS_ID, pa, fw_size); + if (ret) { + dev_err(&rproc->dev, "unable to setup memory (%d)\n", ret); + return -EINVAL; + } + + return qcom_mdt_load(rproc, fw, VENUS_FIRMWARE_NAME); +} + +static const struct rproc_fw_ops venus_fw_ops = { + .find_rsc_table = qcom_mdt_find_rsc_table, + .load = venus_load, +}; + +static int venus_start(struct rproc *rproc) +{ + struct qcom_venus *venus = rproc->priv; + int ret; + + ret = qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); + if (ret) + dev_err(venus->dev, + "authentication image and release reset failed (%d)\n", + ret); + + return ret; +} + +static int venus_stop(struct rproc *rproc) +{ + struct qcom_venus *venus = rproc->priv; + int ret; + + ret = qcom_scm_pas_shutdown(VENUS_PAS_ID); + if (ret) + dev_err(venus->dev, "failed to shutdown: %d\n", ret); + + return ret; +} + +static void *venus_da_to_va(struct rproc *rproc, u64 da, int len) +{ + struct qcom_venus *venus = rproc->priv; + s64 offset; + + offset = da - venus->fw_addr; + + if (offset < 0 || offset + len > venus->mem_size) + return NULL; + + return venus->mem_va + offset; +} + +static const struct rproc_ops venus_ops = { + .start = venus_start, + .stop = venus_stop, + .da_to_va = venus_da_to_va, +}; + +static int venus_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct qcom_venus *venus; + struct rproc *rproc; + int ret; + + if (!qcom_scm_is_available()) + return -EPROBE_DEFER; + + ret = of_reserved_mem_device_init(dev); + if (ret) + return ret; + + rproc = rproc_alloc(dev, pdev->name, &venus_ops, VENUS_FIRMWARE_NAME, + sizeof(*venus)); + if (!rproc) { + dev_err(dev, "unable to allocate remoteproc\n"); + ret = -ENOMEM; + goto release_mem; + } + + rproc->auto_boot = false; + rproc->fw_ops = &venus_fw_ops; + venus = rproc->priv; + venus->dev = dev; + venus->rproc = rproc; + venus->mem_size = VENUS_FW_MEM_SIZE; + + platform_set_drvdata(pdev, venus); + + venus->mem_va = dma_alloc_coherent(dev, venus->mem_size, + &venus->mem_phys, GFP_KERNEL); + if (!venus->mem_va) { + ret = -ENOMEM; + goto free_rproc; + } + + ret = rproc_add(rproc); + if (ret) + goto free_mem; + + return 0; + +free_mem: + dma_free_coherent(dev, venus->mem_size, venus->mem_va, venus->mem_phys); +free_rproc: + rproc_put(rproc); +release_mem: + of_reserved_mem_device_release(dev); + + return ret; +} + +static int venus_remove(struct platform_device *pdev) +{ + struct qcom_venus *venus = platform_get_drvdata(pdev); + struct device *dev = venus->dev; + + rproc_del(venus->rproc); + dma_free_coherent(dev, venus->mem_size, venus->mem_va, venus->mem_phys); + of_reserved_mem_device_release(dev); + + return 0; +} + +static const struct of_device_id venus_of_match[] = { + { .compatible = "qcom,venus-pil" }, + { }, +}; +MODULE_DEVICE_TABLE(of, venus_of_match); + +static struct platform_driver venus_driver = { + .probe = venus_probe, + .remove = venus_remove, + .driver = { + .name = "qcom-venus-pil", + .of_match_table = venus_of_match, + }, +}; + +module_platform_driver(venus_driver); +MODULE_DESCRIPTION("Peripheral Image Loader for Venus"); +MODULE_LICENSE("GPL v2");