Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp3581138imm; Mon, 8 Oct 2018 06:25:19 -0700 (PDT) X-Google-Smtp-Source: ACcGV601fsvNGp7cgSAqHdPViJdJU+8WVcg3hwdDyVj5F4ytG2VXM8OufVdxDyWrtwG7oDM4n1W0 X-Received: by 2002:a62:939d:: with SMTP id r29-v6mr25273396pfk.55.1539005118947; Mon, 08 Oct 2018 06:25:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539005118; cv=none; d=google.com; s=arc-20160816; b=ksN25T4A+jSpi8egqUJjmaxlfhDvDaewYeYMVkeqY4npHZnaPSNKDMB/C0Sk/7xNV+ xK9EPa5ImhIttT2XqHSdxTeGJ08TilvhRlV+SJtfJ0Fpspl5obFZB6PAt4ANambcIg0r 9SX/COo6iR0iXYfoQDAhc4qZr5VHeIuiuyORR6WDzYzMWOBJY/GZ4TZ8qTt5Zrtpk0Fl 17YsPL5olNLviykAlfDO0QVeUXzilujbmBzbj1BajY+c54L+eVj6Bigkfrg2XU+3beyl 2due1FBA77QZcPjZ6+N1D0XFkJg6IL/72p1l/ubfw31jXQFXst8MwP/1DS5ktyy9JxUJ ed0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature:dkim-signature; bh=jfb6Z1OTmb+sqsfPbX/XSuC+Tc8IW2o8zj/sq27wJ2A=; b=luR4DUn5L11f4vGmcfqBv06vCKa6P1+SCV0WIGe3TkHULZf+7T9t7bAa3ey8pu4s+Q zEFpPgNiUJ4eaiXEPfc4XfWiA/k2qsSX4rnJGQN3AXOqgv5AYFIZYhShv4Yg54YSCWop y/Bdbxa42R8wwGBnt2NCoNa0r/5j9C879yTqRCvznDJVYTyAmCqc4xkzoCIfmkTjnPcz axr4D7Iw9KOhdtHGUp1ryI+kJd9kXgQu6Gf2OVt+fUpMwd4WlLb3wH67HbweNVVUXR/r nHLDMb6QvPXrRSXUPgy5B9U6W0QTpoqOHl9604vmuYnpdcfgI5IMzoHcy9wrl5KoCFf6 SJhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=nuLo5+fc; dkim=pass header.i=@codeaurora.org header.s=default header.b=F7ypVunO; 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 y30-v6si17582636pge.142.2018.10.08.06.25.03; Mon, 08 Oct 2018 06:25:18 -0700 (PDT) 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; dkim=pass header.i=@codeaurora.org header.s=default header.b=nuLo5+fc; dkim=pass header.i=@codeaurora.org header.s=default header.b=F7ypVunO; 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 S1726691AbeJHUfJ (ORCPT + 99 others); Mon, 8 Oct 2018 16:35:09 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:38090 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726014AbeJHUfJ (ORCPT ); Mon, 8 Oct 2018 16:35:09 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id B1EAF60C1D; Mon, 8 Oct 2018 13:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539005005; bh=au+DdCLnjRnVoVQ1LSmOAwNGCxOeoC4eB7lxO6mPKQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nuLo5+fc9gEVBlDuCEGbhSaD1qiKoTJbDcvm7qAH8X3z2nx4CDtmrLRRZ9ZK/1jPG G1KwLSr4KyiqHlYVuvnLEVvSwxhOruLx8bxYfY1WJav9PlP4YrM5vEjKu7BAtnQoVN cQPNHjCS/tSzZZeOv6wQ6pMZ10mZ6nUSt3qHyOSg= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from vgarodia-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: vgarodia@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 13F0660C5F; Mon, 8 Oct 2018 13:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539005004; bh=au+DdCLnjRnVoVQ1LSmOAwNGCxOeoC4eB7lxO6mPKQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F7ypVunOo9IqAye69WeV0FnT71u0BcPdIvZ/LQ7C/FDpm1GWIWJR64CXVcKrtnOH+ Wy8J4K/HMcuwMLLmZBfoi4jwUzLvEyOyItBg2CuAeEy39zcGqpntyEyKSWhQsn81eL xLT2oUFCHwZJOZOWyYVUNJpfpUeQx7a5wZz7uLHU= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 13F0660C5F Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=vgarodia@codeaurora.org From: Vikash Garodia To: stanimir.varbanov@linaro.org, hverkuil@xs4all.nl, mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, acourbot@chromium.org, vgarodia@codeaurora.org Subject: [PATCH v10 2/5] venus: firmware: move load firmware in a separate function Date: Mon, 8 Oct 2018 18:52:59 +0530 Message-Id: <1539004982-32555-3-git-send-email-vgarodia@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1539004982-32555-1-git-send-email-vgarodia@codeaurora.org> References: <1539004982-32555-1-git-send-email-vgarodia@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Separate firmware loading part into a new function. Signed-off-by: Vikash Garodia --- drivers/media/platform/qcom/venus/core.c | 4 +- drivers/media/platform/qcom/venus/firmware.c | 55 ++++++++++++++++++---------- drivers/media/platform/qcom/venus/firmware.h | 2 +- 3 files changed, 38 insertions(+), 23 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index bb6add9..75b9785 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -84,7 +84,7 @@ static void venus_sys_error_handler(struct work_struct *work) pm_runtime_get_sync(core->dev); - ret |= venus_boot(core->dev, core->res->fwname); + ret |= venus_boot(core); ret |= hfi_core_resume(core, true); @@ -284,7 +284,7 @@ static int venus_probe(struct platform_device *pdev) if (ret < 0) goto err_runtime_disable; - ret = venus_boot(dev, core->res->fwname); + ret = venus_boot(core); if (ret) goto err_runtime_disable; diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 0e21a90..1d4f066 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -60,20 +60,18 @@ int venus_set_hw_state(struct venus_core *core, bool resume) return 0; } -int venus_boot(struct device *dev, const char *fwname) +static int venus_load_fw(struct venus_core *core, const char *fwname, + phys_addr_t *mem_phys, size_t *mem_size) { const struct firmware *mdt; struct device_node *node; - phys_addr_t mem_phys; + struct device *dev; struct resource r; ssize_t fw_size; - size_t mem_size; void *mem_va; int ret; - if (!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) || !qcom_scm_is_available()) - return -EPROBE_DEFER; - + dev = core->dev; node = of_parse_phandle(dev->of_node, "memory-region", 0); if (!node) { dev_err(dev, "no memory-region specified\n"); @@ -84,16 +82,16 @@ int venus_boot(struct device *dev, const char *fwname) if (ret) return ret; - mem_phys = r.start; - mem_size = resource_size(&r); + *mem_phys = r.start; + *mem_size = resource_size(&r); - if (mem_size < VENUS_FW_MEM_SIZE) + if (*mem_size < VENUS_FW_MEM_SIZE) return -EINVAL; - mem_va = memremap(r.start, mem_size, MEMREMAP_WC); + mem_va = memremap(r.start, *mem_size, MEMREMAP_WC); if (!mem_va) { dev_err(dev, "unable to map memory region: %pa+%zx\n", - &r.start, mem_size); + &r.start, *mem_size); return -ENOMEM; } @@ -108,23 +106,40 @@ int venus_boot(struct device *dev, const char *fwname) goto err_unmap; } - ret = qcom_mdt_load(dev, mdt, fwname, VENUS_PAS_ID, mem_va, mem_phys, - mem_size, NULL); + if (core->use_tz) + ret = qcom_mdt_load(dev, mdt, fwname, VENUS_PAS_ID, + mem_va, *mem_phys, *mem_size, NULL); + else + ret = qcom_mdt_load_no_init(dev, mdt, fwname, VENUS_PAS_ID, + mem_va, *mem_phys, *mem_size, NULL); release_firmware(mdt); - if (ret) - goto err_unmap; - - ret = qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); - if (ret) - goto err_unmap; - err_unmap: memunmap(mem_va); return ret; } +int venus_boot(struct venus_core *core) +{ + struct device *dev = core->dev; + phys_addr_t mem_phys; + size_t mem_size; + int ret; + + if (!IS_ENABLED(CONFIG_QCOM_MDT_LOADER) || + (core->use_tz && !qcom_scm_is_available())) + return -EPROBE_DEFER; + + ret = venus_load_fw(core, core->res->fwname, &mem_phys, &mem_size); + if (ret) { + dev_err(dev, "fail to load video firmware\n"); + return -EINVAL; + } + + return qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); +} + int venus_shutdown(struct device *dev) { return qcom_scm_pas_shutdown(VENUS_PAS_ID); diff --git a/drivers/media/platform/qcom/venus/firmware.h b/drivers/media/platform/qcom/venus/firmware.h index 397570c..1343747 100644 --- a/drivers/media/platform/qcom/venus/firmware.h +++ b/drivers/media/platform/qcom/venus/firmware.h @@ -16,7 +16,7 @@ struct device; -int venus_boot(struct device *dev, const char *fwname); +int venus_boot(struct venus_core *core); int venus_shutdown(struct device *dev); int venus_set_hw_state(struct venus_core *core, bool suspend); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project