From patchwork Thu Sep 10 07:52:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanimir Varbanov X-Patchwork-Id: 249575 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6011:0:0:0:0 with SMTP id o17csp1165641ejj; Thu, 10 Sep 2020 00:53:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsuOnnJX9JI3PdoYMfNUUw5cy+Y+QgM0S2LI+vmDnKi6Ahl2LEPdcP2rcX8XPZHFO9lVnd X-Received: by 2002:a05:6402:138a:: with SMTP id b10mr7910477edv.113.1599724404780; Thu, 10 Sep 2020 00:53:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599724404; cv=none; d=google.com; s=arc-20160816; b=Ia9RV2Mu1nsYns8KIU+9VYegpk+S6+NjQZYcXGH78A24ETRn2Lbj57M2qYzP7W91zg 4ETKyG6fftvvGw+uTWbJk417XMBUJtdR5h2BE7lKLw+AzJUR/sZVGs2PftD2+94UVDjq TPYrAQS8z2ZpL2lt3q3awzIVs7igF0Ke5WJTpTG6Ltp+/YQElkXWeJCFFOjhrgtG4Dtq Ju3/T6Vdo88ncRmWKLN4JA/oxLZRWsZabZeuC+XjXwhyqK8P8i0iUa4NHruvPSDQNv6U S7i9puOD4UTsge2RbzXDkoeHZ6LTu2H4TFk0yb8ymbsFlXWsyuRQaa00/cR/HzsEB2cm aRgA== 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:dkim-signature; bh=QM0o+rVzX3uPzdClaXq4cvOE98Cu7/fWdyVNqeP9dm8=; b=iXU3N3oKEMa2T1MeYavOmLUgIvUJMy7D3EHisEfXTK0yH3eBYPMq1bc5o8PMqXdBqC lDxlZoa/pa4mOzQ3Z5rlT9s3Pk5XZEy0D15YOBoLgK3PhHW1uhXplOzS6r5Kc227EX/c eWuW0LH0N63ycStAnTJ7SOdj1sG6Mtc3vyRXqmcv2CC7hrCHltayy4BsUjTCfwcBkpId MlLNcsSedIXo/spyXGnNgtUXlCB8eXqRcnimYy76ZBOGF9cAkkrB9HWM7Xp0XecRHp5R PCC5djsHMBTlVsAQ84DjY9heHaIRB1pmcgnNR2Zx4aAQcqtIBfee1JrMQ04xUdaf7X6t Sb3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="utjF/eg5"; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t17si3229873ejs.679.2020.09.10.00.53.24; Thu, 10 Sep 2020 00:53:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-msm-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=@linaro.org header.s=google header.b="utjF/eg5"; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726846AbgIJHxX (ORCPT + 15 others); Thu, 10 Sep 2020 03:53:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730150AbgIJHxK (ORCPT ); Thu, 10 Sep 2020 03:53:10 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C1D5C061799 for ; Thu, 10 Sep 2020 00:53:00 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id gr14so7362419ejb.1 for ; Thu, 10 Sep 2020 00:53:00 -0700 (PDT) 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=QM0o+rVzX3uPzdClaXq4cvOE98Cu7/fWdyVNqeP9dm8=; b=utjF/eg5YPe5nbhcIOF5tQlQtWPCjtGTK8ZA6cyO9peRb1+AsJ9ABldRh7kaDScqAD Jrq6+arYgOeJ5ykRuBsdYrW9VMbCnuHkMuXgSn7EzRzlG5vDidkh9+EuchObnU6qplQR KKXdgISb6vhsH2U3YI04TBqA58ASzbiurG0BdgcMpSxFcWZ9nQX7H6zgXlzfKqyyFzd9 dO31+ZF6G99eJLEzefX3/Z6nSFswMWOIv2P4yrvZSCwpFstQEAGHWSY0OAvv/AF7QCm5 BntVnDhCKM8uuRUvXPHKvoFPfJ2AMwI8LAnIoPKqiguBFkVtxJWenUusx+wldxWAYoTo pstw== 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=QM0o+rVzX3uPzdClaXq4cvOE98Cu7/fWdyVNqeP9dm8=; b=Vjn0mEyoxsQsSxAclo4AvvoGLYJs3YGMTyqLkH4UBWXc4ZbM785MJjWmb29faSlHlY /6+hykG/qC/2zVZmk26ArppnqDn6NA0J8vN5zCJ2I1WRxJ29z9VBFvCdTycWnIiTngT0 TP/tNAEtovT3tTEpe49LCd8GKyxSOw/+Gi2wmL35MAVcp1CPJUrqqrH6IhwkLjlzSMLw pkYIPUJgahU5yMZsScbTXapr9m8yMBF2KCvtH9qAMeTfj9l63R+vBAfbSXUjnf7EAZHn ZCvgFFbNq/jyKfzF0XBZYGPCB51TogjED6F3cA+8C1tjlSvb8ZPNwUFHeBkvn7eQgpMw lPyQ== X-Gm-Message-State: AOAM531p6w327GP2FuyaZm9+7SukfkIiNpnEecaYdNCo/DjO0RLEMoZ2 rvKO+WJbZhVBzW6ZJ4GpsX9dBj+3JqQfzaWr X-Received: by 2002:a17:906:cb92:: with SMTP id mf18mr7839719ejb.485.1599724378737; Thu, 10 Sep 2020 00:52:58 -0700 (PDT) Received: from localhost.localdomain ([195.24.90.54]) by smtp.gmail.com with ESMTPSA id q26sm5742838ejr.97.2020.09.10.00.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 00:52:58 -0700 (PDT) From: Stanimir Varbanov To: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Cc: Bjorn Andersson , Elliot Berman , Stanimir Varbanov Subject: [PATCH v3 2/2] venus: firmware: Set virtual address ranges Date: Thu, 10 Sep 2020 10:52:27 +0300 Message-Id: <20200910075227.950-3-stanimir.varbanov@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200910075227.950-1-stanimir.varbanov@linaro.org> References: <20200910075227.950-1-stanimir.varbanov@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In order to boot some of the new Venus firmware versions TZ call to set virtual address ranges is needed. Add virtual address ranges for CP and CP_NONPIX in resource structure and use them when loading and booting the firmware on remote processor. Signed-off-by: Stanimir Varbanov --- drivers/media/platform/qcom/venus/core.c | 4 ++++ drivers/media/platform/qcom/venus/core.h | 4 ++++ drivers/media/platform/qcom/venus/firmware.c | 19 ++++++++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Bjorn Andersson diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index c5af42873aed..3549a094e860 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -540,6 +540,10 @@ static const struct venus_resources sdm845_res_v2 = { .vmem_size = 0, .vmem_addr = 0, .dma_mask = 0xe0000000 - 1, + .cp_start = 0, + .cp_size = 0x70800000, + .cp_nonpixel_start = 0x1000000, + .cp_nonpixel_size = 0x24800000, .fwname = "qcom/venus-5.2/venus.mdt", }; diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 1a7aee7ee628..3e3f0138e3c3 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -77,6 +77,10 @@ struct venus_resources { unsigned int vmem_id; u32 vmem_size; u32 vmem_addr; + u32 cp_start; + u32 cp_size; + u32 cp_nonpixel_start; + u32 cp_nonpixel_size; const char *fwname; }; diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c index 8801a6a7543d..1db64a854b88 100644 --- a/drivers/media/platform/qcom/venus/firmware.c +++ b/drivers/media/platform/qcom/venus/firmware.c @@ -181,6 +181,7 @@ static int venus_shutdown_no_tz(struct venus_core *core) int venus_boot(struct venus_core *core) { struct device *dev = core->dev; + const struct venus_resources *res = core->res; phys_addr_t mem_phys; size_t mem_size; int ret; @@ -200,7 +201,23 @@ int venus_boot(struct venus_core *core) else ret = venus_boot_no_tz(core, mem_phys, mem_size); - return ret; + if (ret) + return ret; + + if (core->use_tz && res->cp_size) { + ret = qcom_scm_mem_protect_video_var(res->cp_start, + res->cp_size, + res->cp_nonpixel_start, + res->cp_nonpixel_size); + if (ret) { + qcom_scm_pas_shutdown(VENUS_PAS_ID); + dev_err(dev, "set virtual address ranges fail (%d)\n", + ret); + return ret; + } + } + + return 0; } int venus_shutdown(struct venus_core *core)