This is a note to let you know that I've just added the patch titled
media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-venus-hfi_venus-write-to-vidc_ctrl_init-after-unmasking-interrupts.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d74e481609808330b4625b3691cf01e1f56e255e Mon Sep 17 00:00:00 2001
From: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Date: Tue, 30 May 2023 14:30:36 +0200
Subject: media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
From: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
commit d74e481609808330b4625b3691cf01e1f56e255e upstream.
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@xxxxxxxxxxxxxxx # v4.12+
Fixes: d96d3f30c0f2 ("[media] media: venus: hfi: add Venus HFI files")
Signed-off-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Signed-off-by: Stanimir Varbanov <stanimir.k.varbanov@xxxxxxxxx>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/media/platform/qcom/venus/hfi_venus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 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_
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_
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) {
Patches currently in stable-queue which might be from konrad.dybcio@xxxxxxxxxx are
queue-5.15/arm64-dts-qcom-sdm845-add-missing-rpmh-power-domain-.patch
queue-5.15/clk-qcom-gcc-sm8250-fix-gcc_sdcc2_apps_clk_src.patch
queue-5.15/arm64-dts-qcom-sm8250-mark-pcie-hosts-as-dma-coheren.patch
queue-5.15/media-venus-hfi_venus-only-consider-sys_idle_indicat.patch
queue-5.15/clk-qcom-gcc-sc7180-fix-up-gcc_sdcc2_apps_clk_src.patch
queue-5.15/arm64-dts-qcom-sm8350-use-proper-cpu-compatibles.patch
queue-5.15/arm64-dts-qcom-pmk8350-fix-adc-tm-compatible-string.patch
queue-5.15/clk-qcom-reset-use-the-correct-type-of-sleep-delay-b.patch
queue-5.15/arm64-dts-qcom-sm8250-edo-add-gpio-line-names-for-tl.patch
queue-5.15/arm64-dts-qcom-apq8016-sbc-fix-ov5640-regulator-supp.patch
queue-5.15/media-venus-hfi_venus-write-to-vidc_ctrl_init-after-unmasking-interrupts.patch
queue-5.15/arm64-dts-qcom-sm8350-add-missing-lmh-interrupts-to-.patch
queue-5.15/iommu-qcom-disable-and-reset-context-bank-before-pro.patch
queue-5.15/arm64-dts-qcom-sm8250-edo-rectify-gpio-keys.patch
queue-5.15/soc-qcom-ocmem-add-ocmem-hardware-version-print.patch
queue-5.15/clk-qcom-gcc-sm6350-fix-gcc_sdcc2_apps_clk_src.patch
queue-5.15/arm64-dts-qcom-sm8250-edo-add-gpio-line-names-for-pm.patch
queue-5.15/arm64-dts-qcom-pmi8994-add-missing-ovp-interrupt.patch
queue-5.15/arm64-dts-qcom-msm8996-add-missing-interrupt-to-the-.patch
queue-5.15/arm64-dts-qcom-sm8250-sony-xperia-correct-gpio-keys-.patch
queue-5.15/arm64-dts-qcom-pm660l-add-missing-short-interrupt.patch
queue-5.15/soc-qcom-ocmem-fix-num_ports-num_macros-macros.patch
