[PATCH v2 07/29] venus: hfi_venus: add halt AXI support for Venus 4xx

[Stanimir Varbanov]

Add AXI halt support for version 4xx by using venus wrapper
registers.

Signed-off-by: Stanimir Varbanov <stanimir.varba...@linaro.org>
---
 drivers/media/platform/qcom/venus/hfi_venus.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c 
b/drivers/media/platform/qcom/venus/hfi_venus.c
index 734ce11b0ed0..53546174aab8 100644
--- a/drivers/media/platform/qcom/venus/hfi_venus.c
+++ b/drivers/media/platform/qcom/venus/hfi_venus.c
@@ -532,6 +532,23 @@ static int venus_halt_axi(struct venus_hfi_device *hdev)
        u32 val;
        int ret;
 
+       if (hdev->core->res->hfi_version == HFI_VERSION_4XX) {
+               val = venus_readl(hdev, WRAPPER_CPU_AXI_HALT);
+               val |= BIT(16);
+               venus_writel(hdev, WRAPPER_CPU_AXI_HALT, val);
+
+               ret = readl_poll_timeout(base + WRAPPER_CPU_AXI_HALT_STATUS,
+                                        val, val & BIT(24),
+                                        POLL_INTERVAL_US,
+                                        VBIF_AXI_HALT_ACK_TIMEOUT_US);
+               if (ret) {
+                       dev_err(dev, "AXI bus port halt timeout\n");
+                       return ret;
+               }
+
+               return 0;
+       }
+
        /* Halt AXI and AXI IMEM VBIF Access */
        val = venus_readl(hdev, VBIF_AXI_HALT_CTRL0);
        val |= VBIF_AXI_HALT_CTRL0_HALT_REQ;
-- 
2.14.1