Hi Kate,
Thank you for the new version.
It seems that this is a mismatch of multiple previous v1 patches
squashed into 1, so I'm afraid that this is going to need
a version 3 to fix this.
I see bits of both:
[PATCH 1/3] media: atomisp: sh_css_internal: Unifying sh_css_sp_group to remove #ifdef ISP2401
[PATCH 3/3] media: atomisp: ia_css_debug: remove unused codes
from v1 of the series in here. Where I think this should be only patch 3/3,
removing the unused ia_css_debug code as a prep patch for further changes.
See below for details.
On 6/12/23 07:57, Kate Hsuan wrote:
> Since some parts of the data scructure elements are determined in compile
> time, the configuration data structure should be compiled for both two
> ISP models. In order to set the configuration for both ISP model in
> runtime, Thesh_css_sp_group is unified to one data structure for the
> configuration to ensure the data structure can be used for both ISP2400
> and 2401. Some of the unsed codes from ia_css_debug.c are also removed.
It seems that when squashing patches you have ended up re-using the wrong
commit message for this one.
Instead the commit msg of the v1:
"[PATCH 3/3] media: atomisp: ia_css_debug: remove unused codes"
patch should be used here.
> Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
> ---
> .../runtime/debug/interface/ia_css_debug.h | 6 --
> .../pci/runtime/debug/src/ia_css_debug.c | 76 +------------------
> .../media/atomisp/pci/sh_css_internal.h | 35 +++------
> 3 files changed, 13 insertions(+), 104 deletions(-)
>
> 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 fff89e9b4b01..3a3d72c6eaaa 100644
> --- 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
> @@ -141,12 +141,6 @@ static inline void __printf(2, 0) ia_css_debug_vdtrace(unsigned int level,
> __printf(2, 3) void ia_css_debug_dtrace(unsigned int level,
> const char *fmt, ...);
>
> -/*! @brief Dump sp thread's stack contents
> - * SP thread's stack contents are set to 0xcafecafe. This function dumps the
> - * stack to inspect if the stack's boundaries are compromised.
> - * @return None
> - */
> -void ia_css_debug_dump_sp_stack_info(void);
>
> /*! @brief Function to set the global dtrace verbosity level.
> * @param[in] trace_level Maximum level of the messages to be traced.
> 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 bb6204cb42c5..bb30146c5fe7 100644
> --- 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
The patch-hunk starting here:
> @@ -105,7 +105,8 @@
> * 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)
> +#define MAX_THREAD_NUM_2400 (SH_CSS_MAX_SP_THREADS + SH_CSS_MAX_SP_INTERNAL_THREADS_2400)
> +#define MAX_THREAD_NUM_2401 (SH_CSS_MAX_SP_THREADS + SH_CSS_MAX_SP_INTERNAL_THREADS_2401)
>
> static struct pipe_graph_class {
> bool do_init;
And ending here, does not belong in this patch. Instead it should be squashed into patch 2/3
which will result in patch 2/3 simply removing the original lines.
> @@ -147,79 +148,6 @@ void ia_css_debug_dtrace(unsigned int level, const char *fmt, ...)
> va_end(ap);
> }
>
> -static void debug_dump_long_array_formatted(
> - const sp_ID_t sp_id,
> - hrt_address stack_sp_addr,
> - unsigned int stack_size)
> -{
> - unsigned int i;
> - u32 val;
> - u32 addr = (uint32_t)stack_sp_addr;
> - u32 stack_size_words = CEIL_DIV(stack_size, sizeof(uint32_t));
> -
> - /* When size is not multiple of four, last word is only relevant for
> - * remaining bytes */
> - for (i = 0; i < stack_size_words; i++) {
> - val = sp_dmem_load_uint32(sp_id, (hrt_address)addr);
> - if ((i % 8) == 0)
> - ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE, "\n");
> -
> - ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE, "0x%08x ", val);
> - addr += sizeof(uint32_t);
> - }
> -
> - ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE, "\n");
> -}
> -
> -static void debug_dump_sp_stack_info(
> - const sp_ID_t sp_id)
> -{
> - const struct ia_css_fw_info *fw;
> - unsigned int HIVE_ADDR_sp_threads_stack;
> - unsigned int HIVE_ADDR_sp_threads_stack_size;
> - u32 stack_sizes[MAX_THREAD_NUM];
> - u32 stack_sp_addr[MAX_THREAD_NUM];
> - unsigned int i;
> -
> - fw = &sh_css_sp_fw;
> -
> - ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE, "sp_id(%u) stack info\n", sp_id);
> - ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE,
> - "from objects stack_addr_offset:0x%x stack_size_offset:0x%x\n",
> - fw->info.sp.threads_stack,
> - fw->info.sp.threads_stack_size);
> -
> - HIVE_ADDR_sp_threads_stack = fw->info.sp.threads_stack;
> - HIVE_ADDR_sp_threads_stack_size = fw->info.sp.threads_stack_size;
> -
> - if (fw->info.sp.threads_stack == 0 ||
> - fw->info.sp.threads_stack_size == 0)
> - return;
> -
> - (void)HIVE_ADDR_sp_threads_stack;
> - (void)HIVE_ADDR_sp_threads_stack_size;
> -
> - sp_dmem_load(sp_id,
> - (unsigned int)sp_address_of(sp_threads_stack),
> - &stack_sp_addr, sizeof(stack_sp_addr));
> - sp_dmem_load(sp_id,
> - (unsigned int)sp_address_of(sp_threads_stack_size),
> - &stack_sizes, sizeof(stack_sizes));
> -
> - for (i = 0 ; i < MAX_THREAD_NUM; i++) {
> - ia_css_debug_dtrace(IA_CSS_DEBUG_VERBOSE,
> - "thread: %u stack_addr: 0x%08x stack_size: %u\n",
> - i, stack_sp_addr[i], stack_sizes[i]);
> - debug_dump_long_array_formatted(sp_id, (hrt_address)stack_sp_addr[i],
> - stack_sizes[i]);
> - }
> -}
> -
> -void ia_css_debug_dump_sp_stack_info(void)
> -{
> - debug_dump_sp_stack_info(SP0_ID);
> -}
> -
> void ia_css_debug_set_dtrace_level(const unsigned int trace_level)
> {
> dbg_level = trace_level;
All the sh_css_internal.h changes below should be
squashed into / moved to:
[PATCH v2 3/3] atomisp: sh_css_params: write the sp_group config according to the ISP model
> diff --git a/drivers/staging/media/atomisp/pci/sh_css_internal.h b/drivers/staging/media/atomisp/pci/sh_css_internal.h
> index d98f1323441e..2fa0b3e45fe0 100644
> --- a/drivers/staging/media/atomisp/pci/sh_css_internal.h
> +++ b/drivers/staging/media/atomisp/pci/sh_css_internal.h
> @@ -22,9 +22,7 @@
> #include <platform_support.h>
> #include <linux/stdarg.h>
>
> -#if !defined(ISP2401)
> #include "input_formatter.h"
> -#endif
> #include "input_system.h"
>
> #include "ia_css_types.h"
> @@ -95,19 +93,20 @@
> * 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_METADATA_THREAD_2400 1
> +#define SH_CSS_SP_INTERNAL_METADATA_THREAD_2401 0
>
> #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_SP_INTERNAL_THREADS_2400 (\
> + SH_CSS_SP_INTERNAL_SERVICE_THREAD +\
> + SH_CSS_SP_INTERNAL_METADATA_THREAD_2400)
> +
> +#define SH_CSS_MAX_SP_INTERNAL_THREADS_2401 (\
> + SH_CSS_SP_INTERNAL_SERVICE_THREAD +\
> + SH_CSS_SP_INTERNAL_METADATA_THREAD_2401)
>
> #define SH_CSS_MAX_PIPELINES SH_CSS_MAX_SP_THREADS
>
> @@ -357,14 +356,12 @@ struct sh_css_sp_debug_command {
> u32 dma_sw_reg;
> };
>
> -#if !defined(ISP2401)
> /* SP input formatter configuration.*/
> struct sh_css_sp_input_formatter_set {
> u32 stream_format;
> input_formatter_cfg_t config_a;
> input_formatter_cfg_t config_b;
> };
> -#endif
>
> #define IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT (3)
>
> @@ -377,7 +374,7 @@ struct sh_css_sp_config {
> frames are locked when their EOF event is successfully sent to the
> host (true) or when they are passed to the preview/video pipe
> (false). */
> -#if !defined(ISP2401)
> +
> struct {
> u8 a_changed;
> u8 b_changed;
> @@ -385,15 +382,13 @@ struct sh_css_sp_config {
> struct sh_css_sp_input_formatter_set
> set[SH_CSS_MAX_IF_CONFIGS]; /* CSI-2 port is used as index. */
> } input_formatter;
> -#endif
> -#if !defined(ISP2401)
> +
> sync_generator_cfg_t sync_gen;
> tpg_cfg_t tpg;
> prbs_cfg_t prbs;
> input_system_cfg_t input_circuit;
> u8 input_circuit_cfg_changed;
> u32 mipi_sizes_for_check[N_CSI_PORTS][IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT];
> -#endif
> u8 enable_isys_event_queue;
> u8 disable_cont_vf;
> };
> @@ -409,7 +404,6 @@ enum sh_css_stage_type {
> #define SH_CSS_PIPE_CONFIG_SAMPLE_PARAMS_MASK \
> ((SH_CSS_PIPE_CONFIG_SAMPLE_PARAMS << SH_CSS_MAX_SP_THREADS) - 1)
>
> -#if defined(ISP2401)
> struct sh_css_sp_pipeline_terminal {
> union {
> /* Input System 2401 */
> @@ -442,7 +436,6 @@ struct sh_css_sp_pipeline_io_status {
> u32 running[N_INPUT_SYSTEM_CSI_PORT]; /** configured streams */
> };
>
> -#endif
> enum sh_css_port_dir {
> SH_CSS_PORT_INPUT = 0,
> SH_CSS_PORT_OUTPUT = 1
> @@ -641,10 +634,8 @@ struct sh_css_sp_stage {
> struct sh_css_sp_group {
> struct sh_css_sp_config config;
> struct sh_css_sp_pipeline pipe[SH_CSS_MAX_SP_THREADS];
> -#if defined(ISP2401)
> struct sh_css_sp_pipeline_io pipe_io[SH_CSS_MAX_SP_THREADS];
> struct sh_css_sp_pipeline_io_status pipe_io_status;
> -#endif
> struct sh_css_sp_debug_command debug;
> };
>
> @@ -922,13 +913,11 @@ sh_css_frame_info_set_width(struct ia_css_frame_info *info,
> unsigned int width,
> unsigned int aligned);
>
> -#if !defined(ISP2401)
>
> unsigned int
> sh_css_get_mipi_sizes_for_check(const unsigned int port,
> const unsigned int idx);
>
> -#endif
>
> ia_css_ptr
> sh_css_store_sp_group_to_ddr(void);
> @@ -971,11 +960,9 @@ sh_css_continuous_is_enabled(uint8_t pipe_num);
> struct ia_css_pipe *
> find_pipe_by_num(uint32_t pipe_num);
>
> -#ifdef ISP2401
> void
> ia_css_get_crop_offsets(
> struct ia_css_pipe *pipe,
> struct ia_css_frame_info *in_frame);
> -#endif
>
> #endif /* _SH_CSS_INTERNAL_H_ */
Regards,
Hans
