The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x d74e481609808330b4625b3691cf01e1f56e255e # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023090938-ceremony-cinch-9f48@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^..
Possible dependencies:
d74e48160980 ("media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts") 255385ca433c ("media: venus: hfi: Add a 6xx boot logic") ff2a7013b3e6 ("media: venus: hfi,pm,firmware: Convert to block relative addressing") 7482a983dea3 ("media: venus: redesign clocks and pm domains control") fd1ee315dcd4 ("media: venus: cache vb payload to be used by clock scaling") 219031a6e7df ("media: venus: fix build on 32bit environments") c0e284ccfeda ("media: venus: Update clock scaling") 8dbebb2bd01e ("media: venus: Fix occasionally failures to suspend") 32f0a6ddc8c9 ("media: venus: Use on-chip interconnect API") d42974e438fe ("media: venus: dec: populate properly timestamps and flags for capture buffers") beac82904a87 ("media: venus: make decoder compliant with stateful codec API") 14ea00d65c65 ("media: venus: helpers: add three more helper functions") 1e485ee5a724 ("media: venus: helpers: export few helper functions") a132459d4009 ("media: venus: core: fix max load for msm8996 and sdm845") 5792ae7c3dd4 ("media: venus: firmware: check fw size against DT memory region size") 87e25f4b2c3c ("media: venus: fix reported size of 0-length buffers") df381dc8e475 ("media: venus: firmware: add no TZ boot and shutdown routine") f9799fcce4bb ("media: venus: firmware: register separate platform_device for firmware loader") a4cf7e3c069d ("media: venus: firmware: move load firmware in a separate function") 5df317c8786b ("media: venus: firmware: add routine to reset ARM9")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d74e481609808330b4625b3691cf01e1f56e255e Mon Sep 17 00:00:00 2001 From: Konrad Dybcio konrad.dybcio@linaro.org Date: Tue, 30 May 2023 14:30:36 +0200 Subject: [PATCH] media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
The startup procedure shouldn't be started with interrupts masked, as that may entail silent failures.
Kick off initialization only after the interrupts are unmasked.
Cc: stable@vger.kernel.org # v4.12+ Fixes: d96d3f30c0f2 ("[media] media: venus: hfi: add Venus HFI files") Signed-off-by: Konrad Dybcio konrad.dybcio@linaro.org Signed-off-by: Stanimir Varbanov stanimir.k.varbanov@gmail.com Signed-off-by: Hans Verkuil hverkuil-cisco@xs4all.nl
diff --git a/drivers/media/platform/qcom/venus/hfi_venus.c b/drivers/media/platform/qcom/venus/hfi_venus.c index 918a283bd890..5506a0d196ef 100644 --- a/drivers/media/platform/qcom/venus/hfi_venus.c +++ b/drivers/media/platform/qcom/venus/hfi_venus.c @@ -453,7 +453,6 @@ static int venus_boot_core(struct venus_hfi_device *hdev) void __iomem *wrapper_base = hdev->core->wrapper_base; int ret = 0;
- writel(BIT(VIDC_CTRL_INIT_CTRL_SHIFT), cpu_cs_base + VIDC_CTRL_INIT); if (IS_V6(hdev->core)) { mask_val = readl(wrapper_base + WRAPPER_INTR_MASK); mask_val &= ~(WRAPPER_INTR_MASK_A2HWD_BASK_V6 | @@ -464,6 +463,7 @@ static int venus_boot_core(struct venus_hfi_device *hdev) writel(mask_val, wrapper_base + WRAPPER_INTR_MASK); writel(1, cpu_cs_base + CPU_CS_SCIACMDARG3);
+ writel(BIT(VIDC_CTRL_INIT_CTRL_SHIFT), cpu_cs_base + VIDC_CTRL_INIT); while (!ctrl_status && count < max_tries) { ctrl_status = readl(cpu_cs_base + CPU_CS_SCIACMDARG0); if ((ctrl_status & CPU_CS_SCIACMDARG0_ERROR_STATUS_MASK) == 4) {