media: atomisp: Removed unused HAS_WATCHDOG_SP_THREAD_DEBUG debug

Since the debug codes around #ifdef HAS_WATCHDOG_SP_THREAD_DEBUG are
no longer used, the debug implementation of this can be removed.

Link: https://lore.kernel.org/r/20230619052453.48598-3-hpa@redhat.com
Signed-off-by: Kate Hsuan <hpa@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h
index b6538beca18ad82967ca40363d21c8b7f6a698b0..f2e17945fd4539633d18517e2bde116f49003026 100644 (file)
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/debug_global.h
@@ -35,13 +35,6 @@
 
 #define DEBUG_BUFFER_ISP_DMEM_ADDR       0x0
 
-/*
- * Enable HAS_WATCHDOG_SP_THREAD_DEBUG for additional SP thread and
- * pipe information on watchdog output
- * #undef HAS_WATCHDOG_SP_THREAD_DEBUG
- * #define HAS_WATCHDOG_SP_THREAD_DEBUG
- */
-
 /*
  * The linear buffer mode will accept data until the first
  * overflow and then stop accepting new data

diff --git a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
index a20879aedef67e1edb06ba5bf338be20fa437cb3..d6e52b4971d689dcf92b729c97bf224b933a3363 100644 (file)
--- a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
@@ -331,11 +331,7 @@ struct ia_css_sp_info {
        of DDR debug queue */
        u32 perf_counter_input_system_error; /** input system perf
        counter array */
-#ifdef HAS_WATCHDOG_SP_THREAD_DEBUG
-       u32 debug_wait; /** thread/pipe post mortem debug */
-       u32 debug_stage; /** thread/pipe post mortem debug */
-       u32 debug_stripe; /** thread/pipe post mortem debug */
-#endif
+
        u32 threads_stack; /** sp thread's stack pointers */
        u32 threads_stack_size; /** sp thread's stack sizes */
        u32 curr_binary_id;        /** current binary id */

diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
index 3a3d72c6eaaacac84cf5c41147514ca47ddb92eb..efa13629483642aa7b43103042959c5f146a25f7 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
+++ b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
@@ -306,12 +306,6 @@ void ia_css_debug_dump_isp_params(struct ia_css_stream *stream,
  */
 void ia_css_debug_dump_perf_counters(void);
 
-#ifdef HAS_WATCHDOG_SP_THREAD_DEBUG
-void sh_css_dump_thread_wait_info(void);
-void sh_css_dump_pipe_stage_info(void);
-void sh_css_dump_pipe_stripe_info(void);
-#endif
-
 void ia_css_debug_dump_isp_binary(void);
 
 void sh_css_dump_sp_raw_copy_linecount(bool reduced);

diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
index 3af855d844e5a7acb6f086f122ffc6ca67076457..cf66a40bd6a44dc7edeefca96b5317c856dcab85 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
+++ b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
@@ -101,12 +101,6 @@
 
 #define ENABLE_LINE_MAX_LENGTH (25)
 
-/*
- * TODO:SH_CSS_MAX_SP_THREADS is not the max number of sp threads
- * future rework should fix this and remove the define MAX_THREAD_NUM
- */
-#define MAX_THREAD_NUM (SH_CSS_MAX_SP_THREADS + SH_CSS_MAX_SP_INTERNAL_THREADS)
-
 static struct pipe_graph_class {
        bool do_init;
        int height;
@@ -2074,12 +2068,6 @@ void ia_css_debug_dump_debug_info(const char *context)
        ia_css_debug_dump_isp_gdc_fifo_state();
        ia_css_debug_dump_sp_state();
        ia_css_debug_dump_perf_counters();
-
-#ifdef HAS_WATCHDOG_SP_THREAD_DEBUG
-       sh_css_dump_thread_wait_info();
-       sh_css_dump_pipe_stage_info();
-       sh_css_dump_pipe_stripe_info();
-#endif
        ia_css_debug_dump_dma_isp_fifo_state();
        ia_css_debug_dump_dma_sp_fifo_state();
        ia_css_debug_dump_dma_state();
@@ -2391,86 +2379,6 @@ static void __printf(1, 2) dtrace_dot(const char *fmt, ...)
        va_end(ap);
 }
 
-#ifdef HAS_WATCHDOG_SP_THREAD_DEBUG
-void sh_css_dump_thread_wait_info(void)
-{
-       const struct ia_css_fw_info *fw;
-       int i;
-       unsigned int HIVE_ADDR_sp_thread_wait;
-       s32 sp_thread_wait[MAX_THREAD_NUM];
-
-       ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE, "SEM WAITS:\n");
-
-       fw = &sh_css_sp_fw;
-       HIVE_ADDR_sp_thread_wait =
-           fw->info.sp.debug_wait;
-
-       (void)HIVE_ADDR_sp_thread_wait;
-
-       sp_dmem_load(SP0_ID,
-                    (unsigned int)sp_address_of(sp_thread_wait),
-                    &sp_thread_wait,
-                    sizeof(sp_thread_wait));
-       for (i = 0; i < MAX_THREAD_NUM; i++) {
-               ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE,
-                                   "\twait[%d] = 0x%X\n",
-                                   i, sp_thread_wait[i]);
-       }
-}
-
-void sh_css_dump_pipe_stage_info(void)
-{
-       const struct ia_css_fw_info *fw;
-       int i;
-       unsigned int HIVE_ADDR_sp_pipe_stage;
-       s32 sp_pipe_stage[MAX_THREAD_NUM];
-
-       ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE, "PIPE STAGE:\n");
-
-       fw = &sh_css_sp_fw;
-       HIVE_ADDR_sp_pipe_stage =
-           fw->info.sp.debug_stage;
-
-       (void)HIVE_ADDR_sp_pipe_stage;
-
-       sp_dmem_load(SP0_ID,
-                    (unsigned int)sp_address_of(sp_pipe_stage),
-                    &sp_pipe_stage,
-                    sizeof(sp_pipe_stage));
-       for (i = 0; i < MAX_THREAD_NUM; i++) {
-               ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE,
-                                   "\tstage[%d] = %d\n",
-                                   i, sp_pipe_stage[i]);
-       }
-}
-
-void sh_css_dump_pipe_stripe_info(void)
-{
-       const struct ia_css_fw_info *fw;
-       int i;
-       unsigned int HIVE_ADDR_sp_pipe_stripe;
-       s32 sp_pipe_stripe[MAX_THREAD_NUM];
-
-       ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE, "PIPE STRIPE:\n");
-
-       fw = &sh_css_sp_fw;
-       HIVE_ADDR_sp_pipe_stripe =
-           fw->info.sp.debug_stripe;
-
-       (void)HIVE_ADDR_sp_pipe_stripe;
-
-       sp_dmem_load(SP0_ID,
-                    (unsigned int)sp_address_of(sp_pipe_stripe),
-                    &sp_pipe_stripe,
-                    sizeof(sp_pipe_stripe));
-       for (i = 0; i < MAX_THREAD_NUM; i++) {
-               ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE,
-                                   "\tstripe[%d] = %d\n",
-                                   i, sp_pipe_stripe[i]);
-       }
-}
-#endif
-
 static void
 ia_css_debug_pipe_graph_dump_frame(
     const struct ia_css_frame *frame,

diff --git a/drivers/staging/media/atomisp/pci/sh_css_internal.h b/drivers/staging/media/atomisp/pci/sh_css_internal.h
index d98f1323441eabec40225426e086b2929ed6404a..ef7d43de4a6ad736d0ffb76610d275113917a19c 100644 (file)
--- a/drivers/staging/media/atomisp/pci/sh_css_internal.h
+++ b/drivers/staging/media/atomisp/pci/sh_css_internal.h
@@ -86,31 +86,8 @@
 #define SH_CSS_MAX_IF_CONFIGS  3 /* Must match with IA_CSS_NR_OF_CONFIGS (not defined yet).*/
 #define SH_CSS_IF_CONFIG_NOT_NEEDED    0xFF
 
-/*
- * SH_CSS_MAX_SP_THREADS:
- *      sp threads visible to host with connected communication queues
- *      these threads are capable of running an image pipe
- * SH_CSS_MAX_SP_INTERNAL_THREADS:
- *      internal sp service threads, no communication queues to host
- *      these threads can't be used as image pipe
- */
-
-#if !defined(ISP2401)
-#define SH_CSS_SP_INTERNAL_METADATA_THREAD     1
-#else
-#define SH_CSS_SP_INTERNAL_METADATA_THREAD     0
-#endif
-
-#define SH_CSS_SP_INTERNAL_SERVICE_THREAD              1
-
 #define SH_CSS_MAX_SP_THREADS          5
 
-#define SH_CSS_MAX_SP_INTERNAL_THREADS (\
-        SH_CSS_SP_INTERNAL_SERVICE_THREAD +\
-        SH_CSS_SP_INTERNAL_METADATA_THREAD)
-
-#define SH_CSS_MAX_PIPELINES   SH_CSS_MAX_SP_THREADS
-
 /**
  * The C99 standard does not specify the exact object representation of structs;
  * the representation is compiler dependent.