From patchwork Fri Mar 12 17:30:23 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: 398682 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1384896jai; Fri, 12 Mar 2021 09:31:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJylDydH6lUBGLn3F9ANCqiO4lagGEbs0Qn2Mxmo3OvDXwHqWjdisuK06xZx00C4D6NLQatL X-Received: by 2002:a05:6402:9:: with SMTP id d9mr15327840edu.67.1615570205261; Fri, 12 Mar 2021 09:30:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615570205; cv=none; d=google.com; s=arc-20160816; b=VTau7SSbQVJYRogFzKkMun9CVdG3w1LX4sdEBfF2lS8j8h7qNn28DGUUZ8Ei6uLeZn G20sARLZo+UCYqy0TTqVCF18kZt35uKGFaSRUC+r/F9+qjjTK0fMugVACm2W0rMYIN5G ubYUtpS0AvGepliFSaL/5n7tpA9sko4vn77UDRCjGL2mNFmu3IuhyAXjH66O9s4RoyZe 2uFXKPxoQ1A61i62+hnY5oQfH3n/ZKjGFzPrK3Z5oGjofFZtS6jkUQUpx2PHhqUnUDmD GkoKzGJKJpWvQBKKgy/1Wj3f83S9DejpFIZ/hDUzcKctGgQfePaEvLtI5W8ZyWxii1VE 66eA== 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=nQCW8ZwYzo22rvcQzFUBZHnTB+UpuvDUuYoHvF9lN9M=; b=W9GV7xIiAjexQT8OpQp9xe4o1FmhRZRn5Jx0LWzgAVB0uzymW8flepHLD2nweZ8Hnd Bl4MODvUju1480gBlPl+KHMI3kPiIa8bRecvHg0ZnnwN0ew++RRb+WzPm1cWcae/VT4/ ArzWUdDSUZqn28Ha5NCrEzZJ3MdpJost8ZGX/CT2HtH3tcHb52GHK/+v45qXJcZVYZD4 OeEdfDittaShP7ZYrG/+WqDXIWpDCuD9M8Exwv0qUkb4Q2n4UrBBYJJv9uqQd8obTpqJ cSFJWONfxWD3xBVTYCJGsG6dNBrovgLtTMLpZUJVDDX+s60RwjYGntcpBOHEfAo4Hodj N3lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UKfKk7uX; 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 ot6si4540497ejb.337.2021.03.12.09.30.05; Fri, 12 Mar 2021 09:30:05 -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=UKfKk7uX; 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 S232686AbhCLR3Z (ORCPT + 16 others); Fri, 12 Mar 2021 12:29:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232822AbhCLR3W (ORCPT ); Fri, 12 Mar 2021 12:29:22 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E3D9C061761 for ; Fri, 12 Mar 2021 09:29:22 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id m20-20020a7bcb940000b029010cab7e5a9fso16251525wmi.3 for ; Fri, 12 Mar 2021 09:29:22 -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=nQCW8ZwYzo22rvcQzFUBZHnTB+UpuvDUuYoHvF9lN9M=; b=UKfKk7uXleTe7zuOxsmJ8L5O7+o7WvS/kHu/FM0suoWy1OVfE27YHS1RID7Ivowkbj rrBapW89saHxk/O2lhOInwGmWgOe74ZvDbIiesYPrFHaqnJFRpr4F3QJ38vYgLgU27Am fukz93QEz7JldNSHAOVojbUJN1l4GSbDi6pHHoOcDjhCxi6zl/Tc2lQcZZgnT+j0BB+z zDnzXZBz+bTCg0HZ0VBZ3qtlBI/QGvG7V6Yk6eNgpp8TFdB0iKGx721PnatsZlCJIgNS /Iu94Dbi5kC8ypKYi6NqtxUTS2f8mkKkAQRS/miLPXvDyO3H6Ik+SYtEYQ0cWgOCDiu8 E69g== 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=nQCW8ZwYzo22rvcQzFUBZHnTB+UpuvDUuYoHvF9lN9M=; b=LuPosDYiLtWNbeMqKAJcM0deAwOEVq+ZMXzw5UvDSkVsgVF8xUUHItkU8B9Mmr84oM R7fPI/7Hl+QQ4DbctxB5knfxRPzmhbVugDZjIrsyOGjhIS0DTPEpeJYMOrz8nvRX4+hz I8izQnFIgiNwqzHhnVSh6XEo4feF/mKN9+zHOTKNxWtf+aoIooSjrRPdk74oUh5x/vqD grTwQWYGQFS9WBjUnwXXdfQPJ4I0dk8qcwUAOqqdrRyifkwJ05CtwACAsNbRn5rnwpOx vT0IiiS0+AAXhcw+Hn2elPfxD0pXRWKuxws/xmBa5EYJ11jcZyu7zIhVfeXJ0hpMsaqs dBzQ== X-Gm-Message-State: AOAM533vo3UqHO7/b5Zwp+3+/C6524jKRCl8Hjf6GSjnTNXaLI8rahgW DRFzMFwj3QNlA52d5JwOHiQaAw== X-Received: by 2002:a7b:cc84:: with SMTP id p4mr14257163wma.10.1615570161013; Fri, 12 Mar 2021 09:29:21 -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 18sm2876375wmj.21.2021.03.12.09.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 09:29:20 -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 v2 09/25] media: venus: core: Add an io base for TZ wrapper regs Date: Fri, 12 Mar 2021 17:30:23 +0000 Message-Id: <20210312173039.1387617-10-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210312173039.1387617-1-bryan.odonoghue@linaro.org> References: <20210312173039.1387617-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.30.1 diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 7124d9111001..cf2aa83c4378 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -215,6 +215,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 85047806142f..0c519211fac3 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];