All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
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 07/25] media: venus: hfi: Define additional 6xx registers
Date: Fri, 12 Mar 2021 17:30:21 +0000	[thread overview]
Message-ID: <20210312173039.1387617-8-bryan.odonoghue@linaro.org> (raw)
In-Reply-To: <20210312173039.1387617-1-bryan.odonoghue@linaro.org>

From: Dikshita Agarwal <dikshita@codeaurora.org>

- Add X2 RPMh registers and definitions from the downstream example.
- Add 6xx core power definitions
- Add 6xx AON definitions
- Add 6xx wrapper tz definitions
- Add 6xx wrapper interrupt definitions
- Add 6xx soft interrupt definitions
- Define wrapper LPI register offsets

Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
Co-developed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
 .../media/platform/qcom/venus/hfi_venus_io.h  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/media/platform/qcom/venus/hfi_venus_io.h b/drivers/media/platform/qcom/venus/hfi_venus_io.h
index 8604b213f03f..300c6e47e72f 100644
--- a/drivers/media/platform/qcom/venus/hfi_venus_io.h
+++ b/drivers/media/platform/qcom/venus/hfi_venus_io.h
@@ -56,10 +56,22 @@
 #define UC_REGION_ADDR				0x64
 #define UC_REGION_SIZE				0x68
 
+#define CPU_CS_H2XSOFTINTEN_V6			0x148
+
+#define CPU_CS_X2RPMH_V6			0x168
+#define CPU_CS_X2RPMH_MASK0_BMSK_V6		0x1
+#define CPU_CS_X2RPMH_MASK0_SHFT_V6		0x0
+#define CPU_CS_X2RPMH_MASK1_BMSK_V6		0x2
+#define CPU_CS_X2RPMH_MASK1_SHFT_V6		0x1
+#define CPU_CS_X2RPMH_SWOVERRIDE_BMSK_V6	0x4
+#define CPU_CS_X2RPMH_SWOVERRIDE_SHFT_V6	0x3
+
 /* Relative to CPU_IC_BASE */
 #define CPU_IC_SOFTINT				0x18
+#define CPU_IC_SOFTINT_V6			0x150
 #define CPU_IC_SOFTINT_H2A_MASK			0x8000
 #define CPU_IC_SOFTINT_H2A_SHIFT		0xf
+#define CPU_IC_SOFTINT_H2A_SHIFT_V6		0x0
 
 /* Venus wrapper */
 #define WRAPPER_BASE_V6				0x000b0000
@@ -88,6 +100,9 @@
 #define WRAPPER_INTR_MASK_A2HCPU_MASK		0x4
 #define WRAPPER_INTR_MASK_A2HCPU_SHIFT		0x2
 
+#define WRAPPER_INTR_STATUS_A2HWD_MASK_V6	0x8
+#define WRAPPER_INTR_MASK_A2HWD_BASK_V6		0x8
+
 #define WRAPPER_INTR_CLEAR			0x14
 #define WRAPPER_INTR_CLEAR_A2HWD_MASK		0x10
 #define WRAPPER_INTR_CLEAR_A2HWD_SHIFT		0x4
@@ -97,6 +112,8 @@
 #define WRAPPER_POWER_STATUS			0x44
 #define WRAPPER_VDEC_VCODEC_POWER_CONTROL	0x48
 #define WRAPPER_VENC_VCODEC_POWER_CONTROL	0x4c
+#define WRAPPER_DEBUG_BRIDGE_LPI_CONTROL_V6	0x54
+#define WRAPPER_DEBUG_BRIDGE_LPI_STATUS_V6	0x58
 #define WRAPPER_VDEC_VENC_AHB_BRIDGE_SYNC_RESET	0x64
 
 #define WRAPPER_CPU_CLOCK_CONFIG		0x2000
@@ -125,4 +142,17 @@
 #define WRAPPER_VCODEC1_MMCC_POWER_STATUS	0x110
 #define WRAPPER_VCODEC1_MMCC_POWER_CONTROL	0x114
 
+/* Venus 6xx */
+#define WRAPPER_CORE_POWER_STATUS_V6		0x80
+#define WRAPPER_CORE_POWER_CONTROL_V6		0x84
+
+/* Wrapper TZ 6xx */
+#define WRAPPER_TZ_BASE_V6			0x000c0000
+#define WRAPPER_TZ_CPU_STATUS_V6		0x10
+
+/* Venus AON */
+#define AON_BASE_V6				0x000e0000
+#define AON_WRAPPER_MVP_NOC_LPI_CONTROL		0x00
+#define AON_WRAPPER_MVP_NOC_LPI_STATUS		0x04
+
 #endif
-- 
2.30.1


  parent reply	other threads:[~2021-03-12 17:29 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-12 17:30 [PATCH v2 00/25] media: venus: Enable 6xx support Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 01/25] media: venus: Update v6 buffer descriptors Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 02/25] media: venus: core,pm: Add handling for resets Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 03/25] media: venus: core: add sm8250 DT compatible and resource data Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 04/25] media: venus: core: Add io base variables for each block Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 05/25] media: venus: hfi,pm,firmware: Convert to block relative addressing Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 06/25] media: venus: hfi: Define block offsets for V6 hardware Bryan O'Donoghue
2021-03-12 17:30 ` Bryan O'Donoghue [this message]
2021-03-12 17:30 ` [PATCH v2 08/25] media: venus: core: Add differentiator IS_V6(core) Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 09/25] media: venus: core: Add an io base for TZ wrapper regs Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 10/25] media: venus: core: Add an io base for AON regs Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 11/25] media: venus: core: Hook to V6 base registers when appropriate Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 12/25] media: venus: hfi: Add a 6xx boot logic Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 13/25] media: venus: hfi: Add 6xx interrupt support Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 14/25] media: venus: hfi: Read WRAPPER_TZ_CPU_STATUS_V6 on 6xx Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 15/25] media: venus: hfi, vdec: v6 Add IS_V6() to existing IS_V4() if locations Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 16/25] media: venus: pm: Hook 6xx pm ops into 4xx pm ops Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 17/25] media: venus: core,pm: Vote for min clk freq during venus boot Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 18/25] media: venus: hfi: Add 6xx AXI halt logic Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 19/25] media: venus: pm: Toggle 6xx wrapper power in vcodec_control Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 20/25] media: venus: firmware: Do not toggle WRAPPER_A9SS_SW_RESET on 6xx Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 21/25] media: venus: helpers: Add internal buffer list for v6 Bryan O'Donoghue
2021-03-17  9:59   ` dikshita
2021-03-12 17:30 ` [PATCH v2 22/25] media: venus: helpers, hfi, vdec: Set actual plane constraints to FW Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 23/25] media: venus: hfi: Increase plat_buf_v6 o/p buffer count Bryan O'Donoghue
2021-03-12 17:30 ` [PATCH v2 24/25] media: venus: helper: Decide work mode Bryan O'Donoghue
2021-03-22 13:12   ` Stanimir Varbanov
2021-03-12 17:30 ` [PATCH v2 25/25] media: venus: vdec: Fix decoder cmd STOP issue Bryan O'Donoghue
2021-03-23 12:20 ` [PATCH v2 00/25] media: venus: Enable 6xx support Stanimir Varbanov
2021-03-23 14:07   ` Bryan O'Donoghue

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210312173039.1387617-8-bryan.odonoghue@linaro.org \
    --to=bryan.odonoghue@linaro.org \
    --cc=agross@kernel.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=dikshita@codeaurora.org \
    --cc=jonathan@marek.ca \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mchehab@kernel.org \
    --cc=stanimir.varbanov@linaro.org \
    --cc=vgarodia@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.