From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17664C43461 for ; Thu, 10 Sep 2020 21:04:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CDB0421D90 for ; Thu, 10 Sep 2020 21:04:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="fmy9E1Sx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727023AbgIJVEf (ORCPT ); Thu, 10 Sep 2020 17:04:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731174AbgIJOhg (ORCPT ); Thu, 10 Sep 2020 10:37:36 -0400 Received: from mail-ot1-x344.google.com (mail-ot1-x344.google.com [IPv6:2607:f8b0:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A9FDC061756 for ; Thu, 10 Sep 2020 07:26:25 -0700 (PDT) Received: by mail-ot1-x344.google.com with SMTP id c10so5466593otm.13 for ; Thu, 10 Sep 2020 07:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=c09JxSr1XUKKzAFJy15maBise8KOeiPU0mV0zBX6I1c=; b=fmy9E1Sx9ENoBeL3m/Wo9JWXkizgoX9vknkcHVdJ4/9MGJwbIIxKkEzqP1ceAkQE/L 8fdAzYONKnHe9rSaYVLU+xFADK0imN+gqrwoPKzPuY/XWOOVdedZKUs0qXbro7pO5qGp lP3j/tCRvrpArnPChyTNjZIom1hRF0/hTwX+M7tAGWKBg14JHv4iCHqEGx/HAqf5F3Kg ntDcTKYgh9CuPNWqjvb1gmQDygz1rGMB3bV7N82F5E4bQyJNU9nmt0vPVhU0T2mb0p7k y2u0pOhFoQZDtvD3z7p6RAGSZWtuQMZTvl6qpYzjBZn+0VgV3r7qT9LkXT6DZJmCHRoa 0EGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=c09JxSr1XUKKzAFJy15maBise8KOeiPU0mV0zBX6I1c=; b=c1UsX2omnXLDtdOWFUZthqFwAvRIDSQBFg0px3SazoK7caNP5r4Kx52FTSiLmNE2/m AsXS/y2QTKHgXiKk63guC6zeOT+bEdtI6DID5pkRJ/MK4oGDmO9VmOe1caQfiao5Y2hu rD2nyWznnf4XUTHdSLoDercK3US7CS9QMzzbQwhVTmTRvFKo6DebbKvN1EoaWr2Vx6kL faM0N0W+hyP2TUREbFhctca4V00BW2+Ug76swmjinFPo+EosXW5ZE7Sdgusg6pfL/fCY 4PJfYoU04dggYS6bDojw9U6ogmNy0gVhbFtEo8HmmDI7aHPVYeijz0xk871KWn5o/Hhl bb6A== X-Gm-Message-State: AOAM530gEUySQoFBktxfF5+EpmMCm60tQFT6n0TGl3/o1mOXBp8yhZ/c nmPIcjAUE6KkQriUTYCOVa7efXbEVbJ5Kg== X-Google-Smtp-Source: ABdhPJwlL4vUAD4hIIHStlYhw9JaO++kDERp7tgLCh1ZDzzlclXpoEbqXjdmVoT3x6hCqA7Td0Avug== X-Received: by 2002:a9d:5b7:: with SMTP id 52mr3931033otd.134.1599747984807; Thu, 10 Sep 2020 07:26:24 -0700 (PDT) Received: from tuxbook-pro ([2605:6000:e5cb:c100:f65c:89ff:fe90:ceeb]) by smtp.gmail.com with ESMTPSA id 106sm861736oth.63.2020.09.10.07.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 07:26:23 -0700 (PDT) Date: Thu, 10 Sep 2020 09:26:21 -0500 From: Bjorn Andersson To: Stanimir Varbanov Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Elliot Berman Subject: Re: [PATCH v3 2/2] venus: firmware: Set virtual address ranges Message-ID: <20200910142621.GA6485@tuxbook-pro> References: <20200910075227.950-1-stanimir.varbanov@linaro.org> <20200910075227.950-3-stanimir.varbanov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200910075227.950-3-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 On Thu 10 Sep 02:52 CDT 2020, Stanimir Varbanov wrote: > 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. > Reviewed-by: Bjorn Andersson Regards, Bjorn > 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(-) > > 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) > -- > 2.17.1 >