From patchwork Mon Feb 22 16:02:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 385800 Delivered-To: patch@linaro.org Received: by 2002:a02:290e:0:0:0:0:0 with SMTP id p14csp1396698jap; Mon, 22 Feb 2021 08:04:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJyq7WEM8ZnkYlej9fgNg7J6drRMz9hRRhbnCWgdyUuUKzHBfMUd+qKp7kkexMSUe/ppnmrt X-Received: by 2002:a05:6402:a54:: with SMTP id bt20mr8635281edb.96.1614009898977; Mon, 22 Feb 2021 08:04:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614009898; cv=none; d=google.com; s=arc-20160816; b=sM7SHfbDxoPwPa638h81ABs0ag4WE5zTArTUnfY+W7kvasM4DVs1uZ9yT5pHGRaijR s1BIjVEfoQS/SfPq7FoK10zaaKWF+05zFBJPuxuUYVPC85ANO6S5RZxdKiq6IYGwmR/q fauJLLrNUc5kqREjjIcjawq9fFH8Gm+1J4q0AwjpOh6Ol5yyit1iKGB450mP1xYEiSUu G+4ROzDwwEPlhYAgtr0DgDGlLRzO0NYW5lARKlGdESQT/ubyiP7l32hU/9/JO/r733qA THyqQCmkdAshjN6b/UEp2BmkLaN4JW42Txd52pdBEeUz9Pn/ITQPmQeWRl+g26lXDXWM i8xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lciWFaVyAjUGcLf/UXnkqFKZDeRxBKQIFgTCiBjIihg=; b=VlG8YNM8da4zaP0X1+SjDvgcLgPi18z5WQRh+GwWNb80R+4PtQwhkmqnAxVWSD/DAK QlZSXO27IwNwzg2Cjvd/D2NN086gwadagf/2uCUUcnjktl7xkhhsx4f+c3sbA9uoUtJn abcqMl7JlyajawXlPJAuBp+swudxn1hJ5n4XuD+mQYfvqKE9Vll/SO2yoeBdqke4zONG uERS7TlxixkihdyVGIPQTweF6RG7L3Xre+O+Xk6gJ9m7ZDrV/lcSFa7FrckUzLsv3cdO aNwvPCVtY6tXERfQGcu7MqJ3vo+vBbCie6GyufEFDqsQoxUxiBgGBKpqNTyTGcyNeWSa Zb2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=x21gKUiS; 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 s13si12459169edj.330.2021.02.22.08.04.58; Mon, 22 Feb 2021 08:04:58 -0800 (PST) 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=x21gKUiS; 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 S231281AbhBVQEk (ORCPT + 16 others); Mon, 22 Feb 2021 11:04:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231392AbhBVQDp (ORCPT ); Mon, 22 Feb 2021 11:03:45 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A9B8C061225 for ; Mon, 22 Feb 2021 08:01:48 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id l12so19632630wry.2 for ; Mon, 22 Feb 2021 08:01:48 -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 :mime-version:content-transfer-encoding; bh=lciWFaVyAjUGcLf/UXnkqFKZDeRxBKQIFgTCiBjIihg=; b=x21gKUiShumnIsW0N1K6FqDGgoTHb28vRGO5NbR2gEdgzRI3RTjXCL2S1BXl1qXpkl nn7qgB8Ll3nDv1OLT0nfjtQSzLgvaaPB+tT9fI6j++1XwOxKyJ/VTelh11WFq/KPz4Q+ TElcOKUHsPBaV2pB3KCb9TQpYT7NWVhlWONkpFi3jxG61HjZoObVCzjxu5DC0lw23oak tfQtu0UWDF9UazhVAg/Kdat/MEtY20MRNZ0GCxRKBOOweHHvzH/++O395OWusfrydH7K ElxjsylMBAB2ecvSH7gex4Vz/SD2ktNbRRKX9FSxvsdoWbpNxXQMODx2G70SXExa9ZvI 7VMA== 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:mime-version:content-transfer-encoding; bh=lciWFaVyAjUGcLf/UXnkqFKZDeRxBKQIFgTCiBjIihg=; b=jCg9xPyefhtYVnLH9+F+b2xCZsjf4Trdb8BX6aacSwmONCpTcA5GIdBbcyg0gV2Uiy RdJ7Gs+UWQkZsJUsXrhaxeW+qCS4yjpIBJkkT20EiiVTokBOGGraDUqRfB4z86IewrEG UV2hCyXLZYjV1OCr8Y86Y6A8sULLsCGrTXW6o1PmOZwQdznADGJNaV76alYULW2J3/C0 pWq0FHfu0Er0ONaFS5f5h1foUhRtbDmw9NnBDM9IGqRH/QVciiyNV8vZER5wsm0AribX 1vMWh6ARt26vtvs/IThyPbPAm0Q/baeuHSTZvHLoD5C9U5qKyOHd41ij/wQkKftJvEfp zttQ== X-Gm-Message-State: AOAM532vefywqWdZ030Utvb5/sDLglOdbyhelf1dQcMxVcNQ7HDNVjMF jl97hz5AURruY0mkU8J+A2mPpQ== X-Received: by 2002:a5d:52c2:: with SMTP id r2mr2461371wrv.40.1614009707193; Mon, 22 Feb 2021 08:01:47 -0800 (PST) Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie. [188.141.3.169]) by smtp.gmail.com with ESMTPSA id c3sm7373697wrw.80.2021.02.22.08.01.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Feb 2021 08:01:46 -0800 (PST) From: Bryan O'Donoghue To: stanimir.varbanov@linaro.org, agross@kernel.org, bjorn.andersson@linaro.org, mchehab@kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: bryan.odonoghue@linaro.org, dikshita@codeaurora.org, jonathan@marek.ca, vgarodia@codeaurora.org Subject: [PATCH 10/25] media: venus: core: Add an io base for TZ wrapper regs Date: Mon, 22 Feb 2021 16:02:45 +0000 Message-Id: <20210222160300.1811121-11-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> References: <20210222160300.1811121-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 6xx silicon needs to access registers from a wrapper trust-zone base address range. This commit defines the necessary variable for later use. Signed-off-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/core.c | 1 + drivers/media/platform/qcom/venus/core.h | 2 ++ 2 files changed, 3 insertions(+) -- 2.29.2 diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 01c1828830c7..35a8956fe969 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -214,6 +214,7 @@ static void venus_assign_register_offsets(struct venus_core *core) core->cpu_cs_base = core->base + CPU_CS_BASE; core->cpu_ic_base = core->base + CPU_IC_BASE; core->wrapper_base = core->base + WRAPPER_BASE; + core->wrapper_tz_base = 0; } static int venus_probe(struct platform_device *pdev) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h index 0c90f48323f2..54e6cd89b30a 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -95,6 +95,7 @@ struct venus_format { * @cpu_cs_base IO memory cpu_cs base address * @cpu_ic_base IO memory cpu_ic base address * @wrapper_base IO memory wrapper base address + * @wrapper_base IO memory wrapper TZ base address * @irq: Venus irq * @clks: an array of struct clk pointers * @vcodec0_clks: an array of vcodec0 struct clk pointers @@ -132,6 +133,7 @@ struct venus_core { void __iomem *cpu_cs_base; void __iomem *cpu_ic_base; void __iomem *wrapper_base; + void __iomem *wrapper_tz_base; int irq; struct clk *clks[VIDC_CLKS_NUM_MAX]; struct clk *vcodec0_clks[VIDC_VCODEC_CLKS_NUM_MAX];