Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp654324imm; Wed, 17 Oct 2018 06:20:48 -0700 (PDT) X-Google-Smtp-Source: ACcGV63jIRdZjlVEZYWKU6/50DvVTrHMPTLkJnDgm91cIZPElZL2UQTFJgvYajKX3hMaeSCbsZnC X-Received: by 2002:a65:56cc:: with SMTP id w12-v6mr1728776pgs.224.1539782447993; Wed, 17 Oct 2018 06:20:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539782447; cv=none; d=google.com; s=arc-20160816; b=taSqpRlNE0TAtckuIzu6ywGOh5dhGszbzzX8hSB4XcsBstKuwOyNz9n8Q2jmmskOlO uKAzX7IflKZdGBqWxd36vyhF/aFfze1k5Awvo9erCsaw/6rkUJvP6xywzpda0ApCkhGM 0zhQChNFJ+mUA/ZFv1f22NJW9BS+1mo/IuWemLkSm6OYP7Oxlu13d0PYoXUcOWw1pUNl VW65tC+9GUQeEFdiOSumkXYv69r8KYwn0WDxAUUZdxIJ5Xi2cTli8u2inVP4W/QefZFv zLDXHf7yRlXsQogdgqofB0V4RFnurJ0m25JBVjTZD3y4HDs3ZwXurZQJoCZ2fLwXa1dB PoaA== 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=UFQxfTyVtZP1n98Rv10YjYOyQLSH0z1Qa4yMLvHRNKM=; b=hkxhV8ZLmD205LBys85NDISa3PWH1njc8vJH06Pm/hgci7OIHfHTtb3p3zC5+ngXz3 n9qw0krIchCj27ulqaPASooTfclXHqM5IdJegTZOZjiKhuPpXMpDprsa+AiVXuKiO1KW hCvVjabl+bQ0vikGJdBs+ojZRkISSvwAtEbV/eI7HBR0N2WBtW4NGfxhtvo06FLfi6q/ LSctmCyamceK85k86dOaFTO4hJ6QeENKLICwhQhSOprVXj8zHTxt2GsRqZtj+lfI10Tw 6xCAcMH276cceYXDM0HAe0qdECDVKFXyzPF20/SBEDyiYoK2RHHTfv7enA0iNQvkFuXi PhHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=bkxHDlO2; dkim=pass header.i=@codeaurora.org header.s=default header.b=m1qinIyo; 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 w24-v6si17474896ply.370.2018.10.17.06.20.31; Wed, 17 Oct 2018 06:20:47 -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=bkxHDlO2; dkim=pass header.i=@codeaurora.org header.s=default header.b=m1qinIyo; 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 S1727482AbeJQVOo (ORCPT + 99 others); Wed, 17 Oct 2018 17:14:44 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:37754 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727053AbeJQVOn (ORCPT ); Wed, 17 Oct 2018 17:14:43 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 1A39361317; Wed, 17 Oct 2018 13:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539782340; bh=/A2AdOz+9FKcwXM8CF54LzSWPOaocbigTk21gObNMxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bkxHDlO2riL/TAqTnakXXlZuo09hPwQSM5AcyfX6rDqs6jZVswc9IHA6HQHF2vm/U /AwRpNYAUBScz/WISEpR3MxZdwK+xlbXMDhO/IurIeC4r9tA2VnBXiyfs5SBk2g5eZ wxrAUUCyfE3nuVQD/QWNKW1S25PydSHdd79/wtAg= 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 3340F6130B; Wed, 17 Oct 2018 13:18:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1539782338; bh=/A2AdOz+9FKcwXM8CF54LzSWPOaocbigTk21gObNMxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m1qinIyox9riVYHVnHoXhJP4lw3G5jp2+vYu6SFUSqIpl6rtKc83FsM0dz6BFFHAn /8R0havLL0tIYZn/46SlwFnoEcT/KkNttBV9oZtCudmRvK1+0vWDKJNs6EQWom1hi7 GWgYEHvrxIY2cVTXFwHvHIW743z3dPL1E9Tt3Oqo= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3340F6130B 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 v12 4/5] venus: firmware: add no TZ boot and shutdown routine Date: Wed, 17 Oct 2018 18:48:22 +0530 Message-Id: <1539782303-4091-5-git-send-email-vgarodia@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1539782303-4091-1-git-send-email-vgarodia@codeaurora.org> References: <1539782303-4091-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 Video hardware is mainly comprised of vcodec subsystem and video control subsystem. Video control has ARM9 which executes the video firmware instructions whereas vcodec does the video frame processing. This change adds support to load the video firmware and bring ARM9 out of reset for platforms which does not have trustzone. An iommu domain is associated and managed with the firmware device. Signed-off-by: Vikash Garodia --- drivers/media/platform/qcom/venus/core.c | 6 +- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/firmware.c | 94 +++++++++++++++++++++++- drivers/media/platform/qcom/venus/firmware.h | 2 +- drivers/media/platform/qcom/venus/hfi_venus_io.h | 1 + 5 files changed, 97 insertions(+), 7 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 440f25f..3bd3b8a 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -76,7 +76,7 @@ static void venus_sys_error_handler(struct work_struct *work) hfi_core_deinit(core, true); hfi_destroy(core); mutex_lock(&core->lock); - venus_shutdown(core->dev); + venus_shutdown(core); pm_runtime_put_sync(core->dev); @@ -327,7 +327,7 @@ static int venus_probe(struct platform_device *pdev) err_core_deinit: hfi_core_deinit(core, false); err_venus_shutdown: - venus_shutdown(dev); + venus_shutdown(core); err_runtime_disable: pm_runtime_set_suspended(dev); pm_runtime_disable(dev); @@ -348,7 +348,7 @@ static int venus_remove(struct platform_device *pdev) WARN_ON(ret); hfi_destroy(core); - venus_shutdown(dev); + venus_shutdown(core); of_platform_depopulate(dev); venus_firmware_deinit(core); diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index c629666..6382cea 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -133,6 +133,7 @@ struct venus_core { unsigned int use_tz; struct video_firmware { struct device *dev; + struct iommu_domain *iommu_domain; } fw; struct mutex lock; struct list_head instances; diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 98b3b16..c29acfd 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -122,6 +123,56 @@ static int venus_load_fw(struct venus_core *core, const char *fwname, return ret; } +static int venus_boot_no_tz(struct venus_core *core, phys_addr_t mem_phys, + size_t mem_size) +{ + struct iommu_domain *iommu; + struct device *dev; + int ret; + + dev = core->fw.dev; + if (!dev) + return -EPROBE_DEFER; + + iommu = core->fw.iommu_domain; + + ret = iommu_map(iommu, VENUS_FW_START_ADDR, mem_phys, mem_size, + IOMMU_READ | IOMMU_WRITE | IOMMU_PRIV); + if (ret) { + dev_err(dev, "could not map video firmware region\n"); + return ret; + } + + venus_reset_cpu(core); + + return 0; +} + +static int venus_shutdown_no_tz(struct venus_core *core) +{ + struct iommu_domain *iommu; + size_t unmapped; + u32 reg; + struct device *dev = core->fw.dev; + void __iomem *base = core->base; + + /* Assert the reset to ARM9 */ + reg = readl_relaxed(base + WRAPPER_A9SS_SW_RESET); + reg |= WRAPPER_A9SS_SW_RESET_BIT; + writel_relaxed(reg, base + WRAPPER_A9SS_SW_RESET); + + /* Make sure reset is asserted before the mapping is removed */ + mb(); + + iommu = core->fw.iommu_domain; + + unmapped = iommu_unmap(iommu, VENUS_FW_START_ADDR, VENUS_FW_MEM_SIZE); + if (unmapped != VENUS_FW_MEM_SIZE) + dev_err(dev, "failed to unmap firmware\n"); + + return 0; +} + int venus_boot(struct venus_core *core) { struct device *dev = core->dev; @@ -139,17 +190,30 @@ int venus_boot(struct venus_core *core) return -EINVAL; } - return qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); + if (core->use_tz) + ret = qcom_scm_pas_auth_and_reset(VENUS_PAS_ID); + else + ret = venus_boot_no_tz(core, mem_phys, mem_size); + + return ret; } -int venus_shutdown(struct device *dev) +int venus_shutdown(struct venus_core *core) { - return qcom_scm_pas_shutdown(VENUS_PAS_ID); + int ret; + + if (core->use_tz) + ret = qcom_scm_pas_shutdown(VENUS_PAS_ID); + else + ret = venus_shutdown_no_tz(core); + + return ret; } int venus_firmware_init(struct venus_core *core) { struct platform_device_info info; + struct iommu_domain *iommu_dom; struct platform_device *pdev; struct device_node *np; int ret; @@ -182,10 +246,27 @@ int venus_firmware_init(struct venus_core *core) core->fw.dev = &pdev->dev; + iommu_dom = iommu_domain_alloc(&platform_bus_type); + if (!iommu_dom) { + dev_err(core->fw.dev, "Failed to allocate iommu domain\n"); + ret = -ENOMEM; + goto err_unregister; + } + + ret = iommu_attach_device(iommu_dom, core->fw.dev); + if (ret) { + dev_err(core->fw.dev, "could not attach device\n"); + goto err_iommu_free; + } + + core->fw.iommu_domain = iommu_dom; + of_node_put(np); return 0; +err_iommu_free: + iommu_domain_free(iommu_dom); err_unregister: platform_device_unregister(pdev); of_node_put(np); @@ -194,8 +275,15 @@ int venus_firmware_init(struct venus_core *core) void venus_firmware_deinit(struct venus_core *core) { + struct iommu_domain *iommu; + if (!core->fw.dev) return; + iommu = core->fw.iommu_domain; + + iommu_detach_device(iommu, core->fw.dev); + iommu_domain_free(iommu); + platform_device_unregister(to_platform_device(core->fw.dev)); } diff --git a/drivers/media/platform/qcom/venus/firmware.h b/drivers/media/platform/qcom/venus/firmware.h index fd7edf0..119a9a4 100644 --- a/drivers/media/platform/qcom/venus/firmware.h +++ b/drivers/media/platform/qcom/venus/firmware.h @@ -19,7 +19,7 @@ int venus_firmware_init(struct venus_core *core); void venus_firmware_deinit(struct venus_core *core); int venus_boot(struct venus_core *core); -int venus_shutdown(struct device *dev); +int venus_shutdown(struct venus_core *core); int venus_set_hw_state(struct venus_core *core, bool suspend); static inline int venus_set_hw_state_suspend(struct venus_core *core) diff --git a/drivers/media/platform/qcom/venus/hfi_venus_io.h b/drivers/media/platform/qcom/venus/hfi_venus_io.h index d69f51b..ef0c72a 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus_io.h +++ b/drivers/media/platform/qcom/venus/hfi_venus_io.h @@ -119,6 +119,7 @@ #define WRAPPER_NONPIX_START_ADDR (WRAPPER_BASE + 0x1030) #define WRAPPER_NONPIX_END_ADDR (WRAPPER_BASE + 0x1034) #define WRAPPER_A9SS_SW_RESET (WRAPPER_BASE + 0x3000) +#define WRAPPER_A9SS_SW_RESET_BIT BIT(4) /* Venus 4xx */ #define WRAPPER_VCODEC0_MMCC_POWER_STATUS (WRAPPER_BASE + 0x90) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project