From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93ED219E97B for ; Sat, 23 Aug 2025 02:50:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755917438; cv=none; b=YZP8Xz/pSlOnsvxJ017wFx4NDMFGYsOjdJbSlNE1YrlgedMWFbVAOSER7YOznIvtzP5w2h29MRGPifRlzE8Qe/TaLlN/tOUYJW5C6r9J42Dmakhq1aIOh5tuv+GuDELspesg3ai9Zo3UZzEuYEhpPXUZUmCYRdLg5tQ9tZS6BaM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755917438; c=relaxed/simple; bh=awL8Z3yOKF5gKW5yYsskxMhJLKpwPSF5n4G6gZRsxzE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LuESO9q4eyAzQR/im8W1bw8qqBZqcaF1x4bISYRrYU4iYbiUcqhI9HmKLMJmWqcveGcZYr5RIPX2pHBFDXYqYn1L+GfY3Y0cEDqBmE2zHVn/UtV1uCNp++CRxyS3vDSZgHiIFemws4TZM8TgaRYru36CriqEaKkXL3almcxX9t8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jdFh3aRZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jdFh3aRZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D8EBC4CEED; Sat, 23 Aug 2025 02:50:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1755917438; bh=awL8Z3yOKF5gKW5yYsskxMhJLKpwPSF5n4G6gZRsxzE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jdFh3aRZObM1DyBcS44YL/S+3FHj59Npw1+waYsZQ4Z5nrlxKnpYhZrZ4f5J7QlhV egeFyAoqXEsY/hw4JG4wwuHCTz6YUPx/hKTEDwiaQxyQHnj6007JkM5s2rzrqxp4F7 /nTwUlmQyd3gmpP808tPd1V1HtZ211K4AnSahIzov5j6kYNt8rukS90elm8zbPWUeR 7HHiS2ZUOJVUcUtZZzbbo4HWxaMUoC9w9BENgZHd+gTDAKE2xs7CWCduK/+a3vsaGi PuvFNpU+R200phYMdHENryK/2O9uiIUw1W6t5wjQuiPSuo7FztPvsj/hSC6FmbNaUA JlAcWVppJQZIg== From: Sasha Levin To: stable@vger.kernel.org Cc: Dikshita Agarwal , Stanimir Varbanov , Stephen Boyd , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.15.y 1/2] media: venus: Add support for SSR trigger using fault injection Date: Fri, 22 Aug 2025 22:50:34 -0400 Message-ID: <20250823025035.1695132-1-sashal@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <2025082150-feminize-barterer-4a0f@gregkh> References: <2025082150-feminize-barterer-4a0f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Dikshita Agarwal [ Upstream commit 748b080f21678f2988b0da2d2b396a6f928d9b2c ] Here we introduce a new fault injection for SSR trigger. To trigger the SSR: echo 100 > /sys/kernel/debug/venus/fail_ssr/probability echo 1 > /sys/kernel/debug/venus/fail_ssr/times Co-developed-by: Stanimir Varbanov Signed-off-by: Stanimir Varbanov Signed-off-by: Dikshita Agarwal Reviewed-by: Stephen Boyd Signed-off-by: Mauro Carvalho Chehab Stable-dep-of: 3200144a2fa4 ("media: venus: protect against spurious interrupts during probe") Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/venus/core.c | 15 ++++++++++++++- drivers/media/platform/qcom/venus/dbgfs.c | 9 +++++++++ drivers/media/platform/qcom/venus/dbgfs.h | 13 +++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 021cd9313e5a..f1a64fa0d832 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -263,6 +263,19 @@ static void venus_assign_register_offsets(struct venus_core *core) } } +static irqreturn_t venus_isr_thread(int irq, void *dev_id) +{ + struct venus_core *core = dev_id; + irqreturn_t ret; + + ret = hfi_isr_thread(irq, dev_id); + + if (ret == IRQ_HANDLED && venus_fault_inject_ssr()) + hfi_core_trigger_ssr(core, HFI_TEST_SSR_SW_ERR_FATAL); + + return ret; +} + static int venus_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -319,7 +332,7 @@ static int venus_probe(struct platform_device *pdev) mutex_init(&core->lock); INIT_DELAYED_WORK(&core->work, venus_sys_error_handler); - ret = devm_request_threaded_irq(dev, core->irq, hfi_isr, hfi_isr_thread, + ret = devm_request_threaded_irq(dev, core->irq, hfi_isr, venus_isr_thread, IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "venus", core); if (ret) diff --git a/drivers/media/platform/qcom/venus/dbgfs.c b/drivers/media/platform/qcom/venus/dbgfs.c index 52de47f2ca88..726f4b730e69 100644 --- a/drivers/media/platform/qcom/venus/dbgfs.c +++ b/drivers/media/platform/qcom/venus/dbgfs.c @@ -4,13 +4,22 @@ */ #include +#include #include "core.h" +#ifdef CONFIG_FAULT_INJECTION +DECLARE_FAULT_ATTR(venus_ssr_attr); +#endif + void venus_dbgfs_init(struct venus_core *core) { core->root = debugfs_create_dir("venus", NULL); debugfs_create_x32("fw_level", 0644, core->root, &venus_fw_debug); + +#ifdef CONFIG_FAULT_INJECTION + fault_create_debugfs_attr("fail_ssr", core->root, &venus_ssr_attr); +#endif } void venus_dbgfs_deinit(struct venus_core *core) diff --git a/drivers/media/platform/qcom/venus/dbgfs.h b/drivers/media/platform/qcom/venus/dbgfs.h index b7b621a8472f..c87c1355d039 100644 --- a/drivers/media/platform/qcom/venus/dbgfs.h +++ b/drivers/media/platform/qcom/venus/dbgfs.h @@ -4,8 +4,21 @@ #ifndef __VENUS_DBGFS_H__ #define __VENUS_DBGFS_H__ +#include + struct venus_core; +#ifdef CONFIG_FAULT_INJECTION +extern struct fault_attr venus_ssr_attr; +static inline bool venus_fault_inject_ssr(void) +{ + return should_fail(&venus_ssr_attr, 1); +} +#else +static inline bool venus_fault_inject_ssr(void) { return false; } +#endif + + void venus_dbgfs_init(struct venus_core *core); void venus_dbgfs_deinit(struct venus_core *core); -- 2.50.1