Message ID | 1655377322-14195-1-git-send-email-quic_dikshita@quicinc.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | [v3] venus: Add support for SSR trigger using fault injection | expand |
Quoting Dikshita Agarwal (2022-06-16 04:02:02) > 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 <stanimir.varbanov@linaro.org> > signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com> This line should come last and the 's' should be capitalized. > Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> > --- Code looks good Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Thanks Dikshita. On 6/16/22 21:37, Stephen Boyd wrote: > Quoting Dikshita Agarwal (2022-06-16 04:02:02) >> 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 <stanimir.varbanov@linaro.org> >> signed-off-by: Dikshita Agarwal <quic_dikshita@quicinc.com> > > This line should come last and the 's' should be capitalized. Thanks Stephen, will fix that while applying. > >> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> >> --- > > Code looks good > > Reviewed-by: Stephen Boyd <swboyd@chromium.org>
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 877eca1..abfa5d6 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -265,6 +265,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; @@ -320,7 +333,7 @@ static int venus_probe(struct platform_device *pdev) INIT_DELAYED_WORK(&core->work, venus_sys_error_handler); init_waitqueue_head(&core->sys_err_done); - 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 52de47f..726f4b7 100644 --- a/drivers/media/platform/qcom/venus/dbgfs.c +++ b/drivers/media/platform/qcom/venus/dbgfs.c @@ -4,13 +4,22 @@ */ #include <linux/debugfs.h> +#include <linux/fault-inject.h> #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 b7b621a..c87c135 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 <linux/fault-inject.h> + 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);