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 6.4-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-6.4 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-6.4/arm64-dts-qcom-sdm845-add-missing-rpmh-power-domain-.patch
queue-6.4/arm-dts-qcom-sdx65-mtp-update-the-pmic-used-in-sdx65.patch
queue-6.4/clk-qcom-gcc-qdu1000-fix-gcc_pcie_0_pipe_clk_src-clo.patch
queue-6.4/clk-qcom-gcc-sm8250-fix-gcc_sdcc2_apps_clk_src.patch
queue-6.4/arm64-dts-qcom-sm8250-mark-pcie-hosts-as-dma-coheren.patch
queue-6.4/media-venus-hfi_venus-only-consider-sys_idle_indicat.patch
queue-6.4/clk-qcom-gcc-sc7180-fix-up-gcc_sdcc2_apps_clk_src.patch
queue-6.4/arm64-dts-qcom-sm8350-use-proper-cpu-compatibles.patch
queue-6.4/interconnect-qcom-qcm2290-enable-sync-state.patch
queue-6.4/arm64-dts-qcom-pmk8350-fix-adc-tm-compatible-string.patch
queue-6.4/interconnect-qcom-bcm-voter-improve-enable_mask-hand.patch
queue-6.4/clk-qcom-gcc-sc8280xp-add-missing-gdscs.patch
queue-6.4/clk-qcom-dispcc-sc8280xp-use-ret-registers-on-gdscs.patch
queue-6.4/clk-qcom-gcc-sm8450-use-floor-ops-for-sdcc-rcgs.patch
queue-6.4/clk-qcom-reset-use-the-correct-type-of-sleep-delay-b.patch
queue-6.4/arm64-dts-qcom-pmi8950-add-missing-ovp-interrupt.patch
queue-6.4/arm64-dts-qcom-pm8350b-fix-thermal-zone-name.patch
queue-6.4/arm-dts-qcom-ipq4019-correct-sdhci-xo-clock.patch
queue-6.4/interconnect-qcom-sm8450-enable-sync_state.patch
queue-6.4/clk-qcom-gpucc-sm6350-fix-clock-source-names.patch
queue-6.4/arm64-dts-qcom-msm8998-add-missing-power-domain-to-m.patch
queue-6.4/arm64-dts-qcom-sc8280xp-x13s-unreserve-nc-pins.patch
queue-6.4/arm64-dts-qcom-sdm845-tama-set-serial-indices-and-st.patch
queue-6.4/clk-qcom-gcc-sm7150-add-clk_ops_parent_enable-to-sdc.patch
queue-6.4/arm64-dts-qcom-sm6350-fix-zap-region.patch
queue-6.4/arm64-dts-qcom-sm8250-edo-add-gpio-line-names-for-tl.patch
queue-6.4/arm64-dts-qcom-msm8998-drop-bus-clock-reference-from.patch
queue-6.4/clk-qcom-gcc-qdu1000-register-gcc_gpll1_out_even-clo.patch
queue-6.4/arm64-dts-qcom-apq8016-sbc-fix-ov5640-regulator-supp.patch
queue-6.4/media-venus-hfi_venus-write-to-vidc_ctrl_init-after-unmasking-interrupts.patch
queue-6.4/arm64-dts-qcom-sm8350-add-missing-lmh-interrupts-to-.patch
queue-6.4/iommu-qcom-disable-and-reset-context-bank-before-pro.patch
queue-6.4/arm64-dts-qcom-sm8250-edo-rectify-gpio-keys.patch
queue-6.4/clk-qcom-gcc-qdu1000-fix-clkref-clocks-handling.patch
queue-6.4/arm64-dts-qcom-pmr735b-fix-thermal-zone-name.patch
queue-6.4/arm64-dts-qcom-msm8996-fix-dsi1-interrupts.patch
queue-6.4/soc-qcom-ocmem-add-ocmem-hardware-version-print.patch
queue-6.4/clk-qcom-gcc-sc8280xp-add-missing-gdsc-flags.patch
queue-6.4/arm64-dts-qcom-sc8280xp-add-missing-scm-interconnect.patch
queue-6.4/clk-qcom-gcc-sm6350-fix-gcc_sdcc2_apps_clk_src.patch
queue-6.4/arm64-dts-qcom-pm6150l-add-missing-short-interrupt.patch
queue-6.4/arm64-dts-qcom-sm8350-fix-cpu-idle-state-residency-t.patch
queue-6.4/arm64-dts-qcom-sc8280xp-crd-correct-vreg_misc_3p3-gp.patch
queue-6.4/arm64-defconfig-enable-qualcomm-msm8996-global-clock.patch
queue-6.4/arm64-dts-qcom-sm8250-edo-add-gpio-line-names-for-pm.patch
queue-6.4/arm64-dts-qcom-pm8350-fix-thermal-zone-name.patch
queue-6.4/arm64-dts-qcom-pmi8994-add-missing-ovp-interrupt.patch
queue-6.4/clk-qcom-gpucc-sm6350-introduce-index-based-clk-look.patch
queue-6.4/arm64-dts-qcom-msm8996-add-missing-interrupt-to-the-.patch
queue-6.4/arm64-dts-qcom-sm8250-sony-xperia-correct-gpio-keys-.patch
queue-6.4/dt-bindings-clock-qcom-gcc-sc8280xp-add-missing-gdsc.patch
queue-6.4/interconnect-qcom-bcm-voter-use-enable_maks-for-keep.patch
queue-6.4/arm64-dts-qcom-sm8150-use-proper-dsi-phy-compatible.patch
queue-6.4/arm64-dts-qcom-apq8016-sbc-rename-ov5640-enable-gpio.patch
queue-6.4/arm64-dts-qcom-pm660l-add-missing-short-interrupt.patch
queue-6.4/soc-qcom-ocmem-fix-num_ports-num_macros-macros.patch
