[PATCH 0/4] staging: media: ipu7: abi headers cleanup

[PATCH 0/4] staging: media: ipu7: abi headers cleanup

[Nikolay Kulikov]

This series cleans up unused definitions of structures, enums, and
macros. Each one was identified and verified using 'git grep' across the
entire driver.
Verified by compilation.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
Nikolay Kulikov (4):
      staging: media: ipu7: remove unused structures from abi/ headers
      staging: media: ipu7: remove unused abi/ macros
      staging: media: ipu7: remove unused abi enums
      staging: media: ipu7: remove unnecessary "#pragma pack()" directives

 drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h  |  86 -----
 .../staging/media/ipu7/abi/ipu7_fw_common_abi.h    |  93 -----
 .../staging/media/ipu7/abi/ipu7_fw_config_abi.h    |   3 -
 drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h  | 183 ---------
 drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h   | 421 ---------------------
 .../media/ipu7/abi/ipu7_fw_psys_config_abi.h       |  24 --
 .../staging/media/ipu7/abi/ipu7_fw_syscom_abi.h    |   1 -
 7 files changed, 811 deletions(-)
---
base-commit: c6eb4dc5964fdf4086b73b7f0f5dc0d595fb5cf3
change-id: 20260803-ipu7_abi-3ed19177fa56

Best regards,
--  
Nikolay Kulikov <nikolayof23@gmail.com>

[PATCH 1/4] staging: media: ipu7: remove unused structures from abi/ headers

[Nikolay Kulikov]

Remove the declarations of these structures, as they are not used in the
driver code.
Remove the abi/ipu7_fw_psys_config_abi.h file because it contains
nothing but an unused structure and is not included anywhere.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
 drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h  |  11 --
 .../staging/media/ipu7/abi/ipu7_fw_common_abi.h    |  37 -----
 drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h  |   4 -
 drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h   | 172 ---------------------
 .../media/ipu7/abi/ipu7_fw_psys_config_abi.h       |  24 ---
 5 files changed, 248 deletions(-)

diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
index 56b90aab83ea..8d5c9b06d158 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
@@ -91,17 +91,6 @@ struct ia_gofo_boot_config {
 	struct syscom_config_s syscom_context_config;
 };
 
-struct ia_gofo_secondary_boot_config {
-	u32 length;
-	struct ia_gofo_version_s config_version;
-	struct ia_gofo_msg_version_list client_version_support;
-	u8 reserved1[IA_GOFO_BOOT_SECONDARY_RESERVED_FIELDS];
-	u16 checksum;
-	u8 padding[2];
-	u32 reserved2[IA_GOFO_BOOT_SECONDARY_RESERVED_SIZE];
-	struct syscom_config_s syscom_context_config;
-};
-
 #pragma pack(pop)
 
 #define IA_GOFO_WDT_TIMEOUT_ERR			0xdead0401
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
index 398a13350480..c50b355b04d8 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
@@ -41,16 +41,6 @@ struct ia_gofo_msg_version_list {
 
 #define IA_GOFO_ABI_BITS_PER_BYTE	(8U)
 
-struct ia_gofo_tlv_header {
-	u16 tlv_type;
-	u16 tlv_len32;
-};
-
-struct ia_gofo_tlv_list {
-	u16 num_elems;
-	u16 head_offset;
-};
-
 #define TLV_ITEM_ALIGNMENT	((u32)sizeof(u32))
 #define TLV_MSG_ALIGNMENT	((u32)sizeof(u64))
 #define TLV_LIST_ALIGNMENT	TLV_ITEM_ALIGNMENT
@@ -97,22 +87,6 @@ enum ia_gofo_msg_err_general {
 #define IA_GOFO_MSG_TYPE_LOG		2
 #define IA_GOFO_MSG_TYPE_GENERAL_ERR	3
 
-struct ia_gofo_msg_header {
-	struct ia_gofo_tlv_header tlv_header;
-	struct ia_gofo_tlv_list msg_options;
-	u64 user_token;
-};
-
-struct ia_gofo_msg_header_ack {
-	struct ia_gofo_msg_header header;
-	struct ia_gofo_msg_err err;
-
-};
-
-struct ia_gofo_msg_general_err {
-	struct ia_gofo_msg_header_ack header;
-};
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
@@ -132,12 +106,6 @@ enum ia_gofo_soc_pbk_instance_id {
 
 #define IA_GOFO_MSG_LINK_PBK_MAX_SLOTS	(2U)
 
-struct ia_gofo_msg_indirect {
-	struct ia_gofo_msg_header header;
-	struct ia_gofo_tlv_header ref_header;
-	ia_gofo_addr_t ref_msg_ptr;
-};
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
@@ -161,11 +129,6 @@ struct ia_gofo_msg_log_info_ts {
 	struct ia_gofo_msg_log_info log_info;
 };
 
-struct ia_gofo_msg_log {
-	struct ia_gofo_msg_header header;
-	struct ia_gofo_msg_log_info_ts log_info_ts;
-};
-
 #pragma pack(pop)
 
 #define IA_GOFO_MSG_ABI_OUT_ACK_QUEUE_ID	(0U)
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
index c42d0b7a2627..87bf2bd5576c 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
@@ -315,10 +315,6 @@ struct ipu7_insys_resp {
 	u8 pad[2];
 };
 
-struct ipu7_insys_resp_queue_token {
-	struct ipu7_insys_resp resp_info;
-};
-
 struct ipu7_insys_send_queue_token {
 	u64 buf_handle;
 	ia_gofo_addr_t addr;
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
index 311248385993..1d0541b1ae9d 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
@@ -55,18 +55,6 @@ enum ipu7_msg_node_profile_type {
 	IPU_MSG_NODE_PROFILE_TYPE_N
 };
 
-struct ipu7_msg_node_profile {
-	struct ia_gofo_tlv_header tlv_header;
-	ipu7_msg_teb_t teb;
-};
-
-struct ipu7_msg_cb_profile {
-	struct ipu7_msg_node_profile profile_base;
-	ipu7_msg_deb_t deb;
-	ipu7_msg_rbm_t rbm;
-	ipu7_msg_rbm_t reb;
-};
-
 #define IPU_MSG_NODE_MAX_PROFILES	(2U)
 #define IPU_MSG_NODE_DEF_PROFILE_IDX	(0U)
 #define IPU_MSG_NODE_RSRC_ID_EXT_IP	(0xff)
@@ -75,17 +63,6 @@ struct ipu7_msg_cb_profile {
 #define IPU_MSG_NODE_DONT_CARE_TEB_LO	(0xffffffff)
 #define IPU_MSG_NODE_RSRC_ID_IS		(0xfe)
 
-struct ipu7_msg_node {
-	struct ia_gofo_tlv_header tlv_header;
-	u8 node_rsrc_id;
-	u8 node_ctx_id;
-	u8 num_frags;
-	u8 reserved[1];
-	struct ia_gofo_tlv_list profiles_list;
-	struct ia_gofo_tlv_list terms_list;
-	struct ia_gofo_tlv_list node_options;
-};
-
 enum ipu7_msg_node_option_types {
 	IPU_MSG_NODE_OPTION_TYPES_PADDING = 0,
 	IPU_MSG_NODE_OPTION_TYPES_N
@@ -118,62 +95,16 @@ enum ipu7_msg_link_cmprs_option_bit_depth {
 #define IPU_MSG_LINK_CMPRS_SPACE_SAVING_NUM_MAX \
 	(IPU_MSG_LINK_CMPRS_SPACE_SAVING_DENOM - 1U)
 
-struct ipu7_msg_link_cmprs_plane_desc {
-	u8 plane_enable;
-	u8 cmprs_enable;
-	u8 encoder_plane_id;
-	u8 decoder_plane_id;
-	u8 cmprs_is_lossy;
-	u8 cmprs_is_footprint;
-	u8 bit_depth;
-	u8 space_saving_numerator;
-	u32 pixels_offset;
-	u32 ts_offset;
-	u32 tile_row_to_tile_row_stride;
-	u32 rows_of_tiles;
-	u32 lossy_cfg[IPU_MSG_LINK_CMPRS_LOSSY_CFG_PAYLOAD_SIZE];
-};
-
 #define IPU_MSG_LINK_CMPRS_MAX_PLANES		(2U)
 #define IPU_MSG_LINK_CMPRS_NO_ALIGN_INTERVAL	(0U)
 #define IPU_MSG_LINK_CMPRS_MIN_ALIGN_INTERVAL	(16U)
 #define IPU_MSG_LINK_CMPRS_MAX_ALIGN_INTERVAL	(1024U)
-struct ipu7_msg_link_cmprs_option {
-	struct ia_gofo_tlv_header header;
-	u32 cmprs_buf_size;
-	u16 align_interval;
-	u8 reserved[2];
-	struct ipu7_msg_link_cmprs_plane_desc plane_descs[2];
-};
-
-struct ipu7_msg_link_ep {
-	u8 node_ctx_id;
-	u8 term_id;
-};
-
-struct ipu7_msg_link_ep_pair {
-	struct ipu7_msg_link_ep ep_src;
-	struct ipu7_msg_link_ep ep_dst;
-};
-
 #define IPU_MSG_LINK_FOREIGN_KEY_NONE		(65535U)
 #define IPU_MSG_LINK_FOREIGN_KEY_MAX		(64U)
 #define IPU_MSG_LINK_PBK_ID_DONT_CARE		(255U)
 #define IPU_MSG_LINK_PBK_SLOT_ID_DONT_CARE	(255U)
 #define IPU_MSG_LINK_TERM_ID_DONT_CARE		(0xff)
 
-struct ipu7_msg_link {
-	struct ia_gofo_tlv_header tlv_header;
-	struct ipu7_msg_link_ep_pair endpoints;
-	u16 foreign_key;
-	u8 streaming_mode;
-	u8 pbk_id;
-	u8 pbk_slot_id;
-	u8 delayed_link;
-	u8 reserved[2];
-	struct ia_gofo_tlv_list link_options;
-};
-
 #pragma pack(pop)
 
 enum ipu7_msg_dev_state {
@@ -208,30 +139,6 @@ enum ipu7_msg_err_groups {
 };
 
 #pragma pack(push, 1)
-struct ipu7_msg_task {
-	struct ia_gofo_msg_header header;
-	u8 graph_id;
-	u8 profile_idx;
-	u8 node_ctx_id;
-	u8 frame_id;
-	u8 frag_id;
-	u8 req_done_msg;
-	u8 req_done_irq;
-	u8 reserved[1];
-	ipu7_msg_teb_t payload_reuse_bm;
-	ia_gofo_addr_t term_buffers[IPU_MSG_MAX_NODE_TERMS];
-};
-
-struct ipu7_msg_task_done {
-	struct ia_gofo_msg_header_ack header;
-	u8 graph_id;
-	u8 frame_id;
-	u8 node_ctx_id;
-	u8 profile_idx;
-	u8 frag_id;
-	u8 reserved[3];
-};
-
 enum ipu7_msg_err_task {
 	IPU_MSG_ERR_TASK_OK = IA_GOFO_MSG_ERR_OK,
 	IPU_MSG_ERR_TASK_GRAPH_ID = 1,
@@ -262,33 +169,11 @@ enum ipu7_msg_term_type {
 #define IPU_MSG_TERM_EVENT_TYPE_PROGRESS	1U
 #define IPU_MSG_TERM_EVENT_TYPE_N	(IPU_MSG_TERM_EVENT_TYPE_PROGRESS + 1U)
 
-struct ipu7_msg_term {
-	struct ia_gofo_tlv_header tlv_header;
-	u8 term_id;
-	u8 event_req_bm;
-	u8 reserved[2];
-	u32 payload_size;
-	struct ia_gofo_tlv_list term_options;
-};
-
 enum ipu7_msg_term_option_types {
 	IPU_MSG_TERM_OPTION_TYPES_PADDING = 0,
 	IPU_MSG_TERM_OPTION_TYPES_N
 };
 
-struct ipu7_msg_term_event {
-	struct ia_gofo_msg_header header;
-	u8 graph_id;
-	u8 frame_id;
-	u8 node_ctx_id;
-	u8 profile_idx;
-	u8 frag_id;
-	u8 term_id;
-	u8 event_type;
-	u8 reserved[1];
-	u64 event_ts;
-};
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
@@ -301,28 +186,6 @@ struct ipu7_msg_term_event {
 #define IPU_MSG_DEVICE_CLOSE_SEND_RESP		BIT(0)
 #define IPU_MSG_DEVICE_CLOSE_SEND_IRQ		BIT(1)
 
-struct ipu7_msg_dev_open {
-	struct ia_gofo_msg_header header;
-	u32 max_graphs;
-	u8 dev_msg_map;
-	u8 enable_power_gating;
-	u8 reserved[2];
-};
-
-struct ipu7_msg_dev_open_ack {
-	struct ia_gofo_msg_header_ack header;
-};
-
-struct ipu7_msg_dev_close {
-	struct ia_gofo_msg_header header;
-	u8 dev_msg_map;
-	u8 reserved[7];
-};
-
-struct ipu7_msg_dev_close_ack {
-	struct ia_gofo_msg_header_ack header;
-};
-
 enum ipu7_msg_err_device {
 	IPU_MSG_ERR_DEVICE_OK = IA_GOFO_MSG_ERR_OK,
 	IPU_MSG_ERR_DEVICE_MAX_GRAPHS = 1,
@@ -343,47 +206,12 @@ enum ipu7_msg_err_device {
 #define IPU_MSG_GRAPH_CLOSE_SEND_RESP	BIT(0)
 #define IPU_MSG_GRAPH_CLOSE_SEND_IRQ	BIT(1)
 
-struct ipu7_msg_graph_open {
-	struct ia_gofo_msg_header header;
-	struct ia_gofo_tlv_list nodes;
-	struct ia_gofo_tlv_list links;
-	u8 graph_id;
-	u8 graph_msg_map;
-	u8 reserved[6];
-};
-
 enum ipu7_msg_graph_ack_option_types {
 	IPU_MSG_GRAPH_ACK_OPTION_TYPES_PADDING = 0,
 	IPU_MSG_GRAPH_ACK_TASK_Q_INFO,
 	IPU_MSG_GRAPH_ACK_OPTION_TYPES_N
 };
 
-struct ipu7_msg_graph_open_ack_task_q_info {
-	struct ia_gofo_tlv_header header;
-	u8 node_ctx_id;
-	u8 q_id;
-	u8 reserved[2];
-};
-
-struct ipu7_msg_graph_open_ack {
-	struct ia_gofo_msg_header_ack header;
-	u8 graph_id;
-	u8 reserved[7];
-};
-
-struct ipu7_msg_graph_close {
-	struct ia_gofo_msg_header header;
-	u8 graph_id;
-	u8 graph_msg_map;
-	u8 reserved[6];
-};
-
-struct ipu7_msg_graph_close_ack {
-	struct ia_gofo_msg_header_ack header;
-	u8 graph_id;
-	u8 reserved[7];
-};
-
 enum ipu7_msg_err_graph {
 	IPU_MSG_ERR_GRAPH_OK = IA_GOFO_MSG_ERR_OK,
 	IPU_MSG_ERR_GRAPH_GRAPH_STATE = 1,
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_psys_config_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_psys_config_abi.h
deleted file mode 100644
index 0af04c8c6a88..000000000000
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_psys_config_abi.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2020 - 2025 Intel Corporation
- */
-
-#ifndef IPU7_PSYS_CONFIG_ABI_H_INCLUDED__
-#define IPU7_PSYS_CONFIG_ABI_H_INCLUDED__
-
-#include <linux/types.h>
-
-#include "ipu7_fw_boot_abi.h"
-#include "ipu7_fw_config_abi.h"
-
-struct ipu7_psys_config {
-	u32 use_debug_manifest;
-	u32 timeout_val_ms;
-	u32 compression_support_enabled;
-	struct ia_gofo_logger_config logger_config;
-	struct ipu7_wdt_abi wdt_config;
-	u8 ipu_psys_debug_bitmask;
-	u8 padding[3];
-};
-
-#endif

-- 
2.55.0

[PATCH 2/4] staging: media: ipu7: remove unused abi/ macros

[Nikolay Kulikov]

These macros are defined but never used, so remove them.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
 drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h  | 31 ------------
 .../staging/media/ipu7/abi/ipu7_fw_common_abi.h    | 28 ----------
 .../staging/media/ipu7/abi/ipu7_fw_config_abi.h    |  3 --
 drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h  | 29 -----------
 drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h   | 59 ----------------------
 .../staging/media/ipu7/abi/ipu7_fw_syscom_abi.h    |  1 -
 6 files changed, 151 deletions(-)

diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
index 8d5c9b06d158..00c04ee8dd0b 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
@@ -9,19 +9,9 @@
 #include "ipu7_fw_common_abi.h"
 #include "ipu7_fw_syscom_abi.h"
 
-#define IA_GOFO_FWLOG_SEVERITY_CRIT			(0U)
-#define IA_GOFO_FWLOG_SEVERITY_ERROR			(1U)
-#define IA_GOFO_FWLOG_SEVERITY_WARNING			(2U)
-#define IA_GOFO_FWLOG_SEVERITY_INFO			(3U)
-#define IA_GOFO_FWLOG_SEVERITY_DEBUG			(4U)
-#define IA_GOFO_FWLOG_SEVERITY_VERBOSE			(5U)
 #define IA_GOFO_FWLOG_MAX_LOGGER_SOURCES		(64U)
 
-#define LOGGER_CONFIG_CHANNEL_ENABLE_HWPRINTF_BITMASK	BIT(0)
 #define LOGGER_CONFIG_CHANNEL_ENABLE_SYSCOM_BITMASK	BIT(1)
-#define LOGGER_CONFIG_CHANNEL_ENABLE_ALL_BITMASK \
-	(LOGGER_CONFIG_CHANNEL_ENABLE_HWPRINTF_BITMASK | \
-	 LOGGER_CONFIG_CHANNEL_ENABLE_SYSCOM_BITMASK)
 
 struct ia_gofo_logger_config {
 	u8 use_source_severity;
@@ -35,27 +25,7 @@ struct ia_gofo_logger_config {
 
 #pragma pack(push, 1)
 
-#define IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX_PER_APP \
-	((u32)IA_GOFO_FW_BOOT_ID_MAX)
-#define IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_IS_OFFSET (0U)
-#define IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_PS_OFFSET \
-	((IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_IS_OFFSET) + \
-	(u32)(IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX_PER_APP))
-#define IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_PRIMARY_OFFSET (0U)
-#define IA_GOFO_CCG_IPU_BUTTRESS_FW_BOOT_PARAMS_SECONDARY_OFFSET (0x3000 / 4U)
-#define IA_GOFO_HKR_IPU_BUTTRESS_FW_BOOT_PARAMS_SECONDARY_OFFSET \
-	(IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX_PER_APP * 2U)
-#define IA_GOFO_HKR_HIF_BUTTRESS_FW_BOOT_PARAMS_SECONDARY_OFFSET \
-	(IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX_PER_APP)
-#define IA_GOFO_CCG_IPU_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX \
-	(IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX_PER_APP * 4U)
-#define IA_GOFO_HKR_IPU_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX \
-	(IA_GOFO_BUTTRESS_FW_BOOT_PARAMS_MAX_REG_IDX_PER_APP * 4U)
-
 #define IA_GOFO_BOOT_RESERVED_SIZE (58U)
-#define IA_GOFO_BOOT_SECONDARY_RESERVED_SIZE (IA_GOFO_BOOT_RESERVED_SIZE)
-#define IA_GOFO_BOOT_SECONDARY_RESERVED_FIELDS \
-	(sizeof(ia_gofo_addr_t) + sizeof(ia_gofo_addr_t) + sizeof(u32))
 
 enum ia_gofo_buttress_reg_id {
 	IA_GOFO_FW_BOOT_CONFIG_ID = 0,
@@ -101,7 +71,6 @@ struct ia_gofo_boot_config {
 #define IA_GOFO_MEM_UNCORRECTABLE_CACHE_ERR	0xdead0805
 #define IA_GOFO_DOUBLE_EXCEPTION_ERR		0xdead0806
 #define IA_GOFO_BIST_DMEM_FAULT_DETECTION_ERR	0xdead1000
-#define IA_GOFO_BIST_DATA_INTEGRITY_FAILURE	0xdead1010
 
 enum ia_gofo_boot_state {
 	IA_GOFO_FW_BOOT_STATE_SECONDARY_BOOT_CONFIG_READY = 0x57a7b000,
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
index c50b355b04d8..dab4476f83ff 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
@@ -11,8 +11,6 @@
 #pragma pack(push, 1)
 typedef u32	ia_gofo_addr_t;
 
-#define IA_GOFO_ADDR_NULL	(0U)
-
 struct ia_gofo_version_s {
 	u8 patch;
 	u8 subminor;
@@ -20,10 +18,6 @@ struct ia_gofo_version_s {
 	u8 major;
 };
 
-#define IA_GOFO_MSG_VERSION_INIT(major_val, minor_val, subminor_val, patch_val)\
-	{.major = (major_val), .minor = (minor_val), .subminor = \
-	(subminor_val), .patch = (patch_val)}
-
 #define IA_GOFO_MSG_VERSION_LIST_MAX_ENTRIES	(3U)
 #define IA_GOFO_MSG_RESERVED_SIZE		(3U)
 
@@ -35,22 +29,11 @@ struct ia_gofo_msg_version_list {
 
 #pragma pack(pop)
 
-#define TLV_TYPE_PADDING		(0U)
-
 #pragma pack(push, 1)
-
-#define IA_GOFO_ABI_BITS_PER_BYTE	(8U)
-
-#define TLV_ITEM_ALIGNMENT	((u32)sizeof(u32))
-#define TLV_MSG_ALIGNMENT	((u32)sizeof(u64))
-#define TLV_LIST_ALIGNMENT	TLV_ITEM_ALIGNMENT
 #pragma pack(pop)
 
-#define IA_GOFO_MODULO(dividend, divisor) ((dividend) % (divisor))
-
 #define IA_GOFO_MSG_ERR_MAX_DETAILS		(4U)
 #define IA_GOFO_MSG_ERR_OK			(0U)
-#define IA_GOFO_MSG_ERR_UNSPECIFED		(0xffffffff)
 #define IA_GOFO_MSG_ERR_GROUP_UNSPECIFIED	(0U)
 #define IA_GOFO_MSG_ERR_IS_OK(err)	(IA_GOFO_MSG_ERR_OK == (err).err_code)
 
@@ -63,9 +46,6 @@ struct ia_gofo_msg_err {
 
 #pragma pack(pop)
 
-#define IA_GOFO_MSG_ERR_GROUP_APP_EXT_START	(16U)
-#define IA_GOFO_MSG_ERR_GROUP_MAX		(31U)
-#define IA_GOFO_MSG_ERR_GROUP_INTERNAL_START	(IA_GOFO_MSG_ERR_GROUP_MAX + 1U)
 #define IA_GOFO_MSG_ERR_GROUP_RESERVED	IA_GOFO_MSG_ERR_GROUP_UNSPECIFIED
 #define IA_GOFO_MSG_ERR_GROUP_GENERAL		1
 
@@ -104,16 +84,10 @@ enum ia_gofo_soc_pbk_instance_id {
 	IA_GOFO_SOC_PBK_ID_N
 };
 
-#define IA_GOFO_MSG_LINK_PBK_MAX_SLOTS	(2U)
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
 #define IA_GOFO_MSG_LOG_MAX_PARAMS	(4U)
-#define IA_GOFO_MSG_LOG_DOC_FMT_ID_MIN	(0U)
-
-#define IA_GOFO_MSG_LOG_DOC_FMT_ID_MAX	(4095U)
-#define IA_GOFO_MSG_LOG_FMT_ID_INVALID	(0xfffffff)
 
 struct ia_gofo_msg_log_info {
 	u16 log_counter;
@@ -131,8 +105,6 @@ struct ia_gofo_msg_log_info_ts {
 
 #pragma pack(pop)
 
-#define IA_GOFO_MSG_ABI_OUT_ACK_QUEUE_ID	(0U)
 #define IA_GOFO_MSG_ABI_OUT_LOG_QUEUE_ID	(1U)
-#define IA_GOFO_MSG_ABI_IN_DEV_QUEUE_ID		(2U)
 
 #endif
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_config_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_config_abi.h
index c3f62aaedd86..cd6c6add0333 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_config_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_config_abi.h
@@ -8,9 +8,6 @@
 
 #include <linux/types.h>
 
-#define IPU_CONFIG_ABI_WDT_TIMER_DISABLED	0U
-#define IPU_CONFIG_ABI_CMD_TIMER_DISABLED	0U
-
 struct ipu7_wdt_abi {
 	u32 wdt_timer1_us;
 	u32 wdt_timer2_us;
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
index 87bf2bd5576c..f1dbcfefaa10 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
@@ -19,19 +19,8 @@
 #define IPU_INSYS_OUTPUT_LOG_QUEUE	(IPU_INSYS_OUTPUT_FIRST_QUEUE + 1U)
 #define IPU_INSYS_OUTPUT_RESERVED_QUEUE	(IPU_INSYS_OUTPUT_LAST_QUEUE)
 #define IPU_INSYS_INPUT_FIRST_QUEUE	(IPU_INSYS_MAX_OUTPUT_QUEUES)
-#define IPU_INSYS_INPUT_LAST_QUEUE \
-	(IPU_INSYS_INPUT_FIRST_QUEUE + IPU_INSYS_MAX_INPUT_QUEUES - 1U)
 #define IPU_INSYS_INPUT_DEV_QUEUE	(IPU_INSYS_INPUT_FIRST_QUEUE)
 #define IPU_INSYS_INPUT_MSG_QUEUE	(IPU_INSYS_INPUT_FIRST_QUEUE + 1U)
-#define IPU_INSYS_INPUT_MSG_MAX_QUEUE	(IPU_INSYS_MAX_INPUT_QUEUES - 1U)
-
-#define MAX_OPINS_FOR_SINGLE_IPINS	(3U)
-#define DEV_SEND_QUEUE_SIZE		(IPU_INSYS_STREAM_ID_MAX)
-
-#define PIN_PLANES_MAX			(4U)
-
-#define INSYS_MSG_ERR_STREAM_INSUFFICIENT_RESOURCES_INPUT \
-	INSYS_MSG_ERR_STREAM_INSUFFICIENT_RESOURCES
 
 typedef u64 ipu7_insys_return_token;
 
@@ -129,7 +118,6 @@ enum ipu7_insys_frame_format_type {
 	N_IPU_INSYS_FRAME_FORMAT
 };
 
-#define IPU_INSYS_FRAME_FORMAT_RAW (IPU_INSYS_FRAME_FORMAT_RAW16)
 #define N_IPU_INSYS_MIPI_DATA_TYPE 0x40
 
 enum ipu7_insys_mipi_dt_rename_mode {
@@ -138,27 +126,10 @@ enum ipu7_insys_mipi_dt_rename_mode {
 	N_IPU_INSYS_MIPI_DT_MODE
 };
 
-#define IPU_INSYS_SEND_MSG_ENABLED				1U
-#define IPU_INSYS_SEND_MSG_DISABLED				0U
-
 #define IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_SOF			BIT(0)
-#define IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_EOF			BIT(1)
 #define IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_SOF			BIT(2)
-#define IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_EOF			BIT(3)
 #define IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_SOF_DISCARDED	BIT(4)
-#define IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_EOF_DISCARDED	BIT(5)
 #define IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_SOF_DISCARDED	BIT(6)
-#define IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_EOF_DISCARDED	BIT(7)
-#define IPU_INSYS_STREAM_SYNC_MSG_ENABLE_MSG_SEND_RESP ( \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_SOF | \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_EOF | \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_SOF_DISCARDED | \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_EOF_DISCARDED)
-#define IPU_INSYS_STREAM_SYNC_MSG_ENABLE_MSG_SEND_IRQ ( \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_SOF | \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_EOF | \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_SOF_DISCARDED | \
-	IPU_INSYS_STREAM_SYNC_MSG_SEND_IRQ_EOF_DISCARDED)
 
 #define IPU_INSYS_STREAM_MSG_SEND_RESP_STREAM_OPEN_DONE		BIT(0)
 #define IPU_INSYS_STREAM_MSG_SEND_IRQ_STREAM_OPEN_DONE		BIT(1)
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
index 1d0541b1ae9d..3f2c065dfe14 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
@@ -28,9 +28,6 @@ enum ipu7_msg_type {
 	IPU_MSG_TYPE_N,
 };
 
-#define IPU_MSG_MAX_NODE_TERMS		(64U)
-#define IPU_MSG_MAX_FRAGS		(7U)
-
 enum ipu7_msg_node_type {
 	IPU_MSG_NODE_TYPE_PAD = 0,
 	IPU_MSG_NODE_TYPE_BASE,
@@ -55,14 +52,6 @@ enum ipu7_msg_node_profile_type {
 	IPU_MSG_NODE_PROFILE_TYPE_N
 };
 
-#define IPU_MSG_NODE_MAX_PROFILES	(2U)
-#define IPU_MSG_NODE_DEF_PROFILE_IDX	(0U)
-#define IPU_MSG_NODE_RSRC_ID_EXT_IP	(0xff)
-
-#define IPU_MSG_NODE_DONT_CARE_TEB_HI	(0xffffffff)
-#define IPU_MSG_NODE_DONT_CARE_TEB_LO	(0xffffffff)
-#define IPU_MSG_NODE_RSRC_ID_IS		(0xfe)
-
 enum ipu7_msg_node_option_types {
 	IPU_MSG_NODE_OPTION_TYPES_PADDING = 0,
 	IPU_MSG_NODE_OPTION_TYPES_N
@@ -90,20 +79,9 @@ enum ipu7_msg_link_cmprs_option_bit_depth {
 	IPU_MSG_LINK_CMPRS_OPTION_12BPP = 2,
 };
 
-#define IPU_MSG_LINK_CMPRS_SPACE_SAVING_DENOM		(128U)
-#define IPU_MSG_LINK_CMPRS_LOSSY_CFG_PAYLOAD_SIZE	(5U)
-#define IPU_MSG_LINK_CMPRS_SPACE_SAVING_NUM_MAX \
-	(IPU_MSG_LINK_CMPRS_SPACE_SAVING_DENOM - 1U)
-
-#define IPU_MSG_LINK_CMPRS_MAX_PLANES		(2U)
-#define IPU_MSG_LINK_CMPRS_NO_ALIGN_INTERVAL	(0U)
-#define IPU_MSG_LINK_CMPRS_MIN_ALIGN_INTERVAL	(16U)
-#define IPU_MSG_LINK_CMPRS_MAX_ALIGN_INTERVAL	(1024U)
 #define IPU_MSG_LINK_FOREIGN_KEY_NONE		(65535U)
-#define IPU_MSG_LINK_FOREIGN_KEY_MAX		(64U)
 #define IPU_MSG_LINK_PBK_ID_DONT_CARE		(255U)
 #define IPU_MSG_LINK_PBK_SLOT_ID_DONT_CARE	(255U)
-#define IPU_MSG_LINK_TERM_ID_DONT_CARE		(0xff)
 
 #pragma pack(pop)
 
@@ -165,10 +143,6 @@ enum ipu7_msg_term_type {
 	IPU_MSG_TERM_TYPE_N,
 };
 
-#define IPU_MSG_TERM_EVENT_TYPE_NONE		0U
-#define IPU_MSG_TERM_EVENT_TYPE_PROGRESS	1U
-#define IPU_MSG_TERM_EVENT_TYPE_N	(IPU_MSG_TERM_EVENT_TYPE_PROGRESS + 1U)
-
 enum ipu7_msg_term_option_types {
 	IPU_MSG_TERM_OPTION_TYPES_PADDING = 0,
 	IPU_MSG_TERM_OPTION_TYPES_N
@@ -177,14 +151,6 @@ enum ipu7_msg_term_option_types {
 #pragma pack(pop)
 
 #pragma pack(push, 1)
-#define IPU_MSG_DEVICE_SEND_MSG_ENABLED		1U
-#define IPU_MSG_DEVICE_SEND_MSG_DISABLED	0U
-
-#define IPU_MSG_DEVICE_OPEN_SEND_RESP		BIT(0)
-#define IPU_MSG_DEVICE_OPEN_SEND_IRQ		BIT(1)
-
-#define IPU_MSG_DEVICE_CLOSE_SEND_RESP		BIT(0)
-#define IPU_MSG_DEVICE_CLOSE_SEND_IRQ		BIT(1)
 
 enum ipu7_msg_err_device {
 	IPU_MSG_ERR_DEVICE_OK = IA_GOFO_MSG_ERR_OK,
@@ -196,15 +162,6 @@ enum ipu7_msg_err_device {
 #pragma pack(pop)
 
 #pragma pack(push, 1)
-#define IPU_MSG_GRAPH_ID_UNKNOWN	(0xff)
-#define IPU_MSG_GRAPH_SEND_MSG_ENABLED	1U
-#define IPU_MSG_GRAPH_SEND_MSG_DISABLED	0U
-
-#define IPU_MSG_GRAPH_OPEN_SEND_RESP	BIT(0)
-#define IPU_MSG_GRAPH_OPEN_SEND_IRQ	BIT(1)
-
-#define IPU_MSG_GRAPH_CLOSE_SEND_RESP	BIT(0)
-#define IPU_MSG_GRAPH_CLOSE_SEND_IRQ	BIT(1)
 
 enum ipu7_msg_graph_ack_option_types {
 	IPU_MSG_GRAPH_ACK_OPTION_TYPES_PADDING = 0,
@@ -259,16 +216,12 @@ enum ipu7_msg_err_graph {
 
 #define FWPS_MSG_ABI_MAX_INPUT_QUEUES	(60U)
 #define FWPS_MSG_ABI_MAX_OUTPUT_QUEUES	(2U)
-#define FWPS_MSG_ABI_MAX_QUEUES \
-	(FWPS_MSG_ABI_MAX_OUTPUT_QUEUES + FWPS_MSG_ABI_MAX_INPUT_QUEUES)
 
-#define FWPS_MSG_ABI_OUT_ACK_QUEUE_ID	(IA_GOFO_MSG_ABI_OUT_ACK_QUEUE_ID)
 #define FWPS_MSG_ABI_OUT_LOG_QUEUE_ID	(IA_GOFO_MSG_ABI_OUT_LOG_QUEUE_ID)
 #if (FWPS_MSG_ABI_OUT_LOG_QUEUE_ID >= FWPS_MSG_ABI_MAX_OUTPUT_QUEUES)
 #error "Maximum output queues configuration is too small to fit ACK and LOG \
 queues"
 #endif
-#define FWPS_MSG_ABI_IN_DEV_QUEUE_ID	(IA_GOFO_MSG_ABI_IN_DEV_QUEUE_ID)
 #define FWPS_MSG_ABI_IN_RESERVED_QUEUE_ID	(3U)
 #define FWPS_MSG_ABI_IN_FIRST_TASK_QUEUE_ID \
 	(FWPS_MSG_ABI_IN_RESERVED_QUEUE_ID + 1U)
@@ -278,16 +231,4 @@ queues"
 useful queues"
 #endif
 
-#define FWPS_MSG_ABI_IN_LAST_TASK_QUEUE_ID	(FWPS_MSG_ABI_MAX_QUEUES - 1U)
-#define FWPS_MSG_ABI_IN_MAX_TASK_QUEUES \
-	(FWPS_MSG_ABI_IN_LAST_TASK_QUEUE_ID - \
-	FWPS_MSG_ABI_IN_FIRST_TASK_QUEUE_ID + 1U)
-#define FWPS_MSG_ABI_OUT_FIRST_QUEUE_ID		(FWPS_MSG_ABI_OUT_ACK_QUEUE_ID)
-#define FWPS_MSG_ABI_OUT_LAST_QUEUE_ID	(FWPS_MSG_ABI_MAX_OUTPUT_QUEUES - 1U)
-#define FWPS_MSG_ABI_IN_FIRST_QUEUE_ID		(FWPS_MSG_ABI_IN_DEV_QUEUE_ID)
-#define FWPS_MSG_ABI_IN_LAST_QUEUE_ID	(FWPS_MSG_ABI_IN_LAST_TASK_QUEUE_ID)
-
-#define FWPS_MSG_HOST2FW_MAX_SIZE	(2U * 1024U)
-#define FWPS_MSG_FW2HOST_MAX_SIZE	(256U)
-
 #endif
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_syscom_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_syscom_abi.h
index bfa5258d5b97..19b5149279c3 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_syscom_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_syscom_abi.h
@@ -11,7 +11,6 @@
 #include "ipu7_fw_common_abi.h"
 
 #pragma pack(push, 1)
-#define SYSCOM_QUEUE_MIN_CAPACITY	2U
 
 struct syscom_queue_params_config {
 	ia_gofo_addr_t token_array_mem;

-- 
2.55.0

[PATCH 3/4] staging: media: ipu7: remove unused abi enums

[Nikolay Kulikov]

These enumerations and their members are defined but never used, so we
can remove them.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
 drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h  |  44 ------
 .../staging/media/ipu7/abi/ipu7_fw_common_abi.h    |  22 ---
 drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h  | 150 ------------------
 drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h   | 170 ---------------------
 4 files changed, 386 deletions(-)

diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
index 00c04ee8dd0b..c65c88101234 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h
@@ -30,18 +30,13 @@ struct ia_gofo_logger_config {
 enum ia_gofo_buttress_reg_id {
 	IA_GOFO_FW_BOOT_CONFIG_ID = 0,
 	IA_GOFO_FW_BOOT_STATE_ID = 1,
-	IA_GOFO_FW_BOOT_RESERVED1_ID = IA_GOFO_FW_BOOT_STATE_ID,
 	IA_GOFO_FW_BOOT_SYSCOM_QUEUE_INDICES_BASE_ID = 2,
-	IA_GOFO_FW_BOOT_UNTRUSTED_ADDR_MIN_ID = 3,
-	IA_GOFO_FW_BOOT_RESERVED0_ID = IA_GOFO_FW_BOOT_UNTRUSTED_ADDR_MIN_ID,
 	IA_GOFO_FW_BOOT_MESSAGING_VERSION_ID = 4,
 	IA_GOFO_FW_BOOT_ID_MAX
 };
 
 enum ia_gofo_boot_uc_tile_frequency_units {
 	IA_GOFO_FW_BOOT_UC_FREQUENCY_UNITS_MHZ = 0,
-	IA_GOFO_FW_BOOT_UC_FREQUENCY_UNITS_HZ = 1,
-	IA_GOFO_FW_BOOT_UC_FREQUENCY_UNITS_N
 };
 
 #define IA_GOFO_FW_BOOT_STATE_IS_CRITICAL(boot_state) \
@@ -73,49 +68,10 @@ struct ia_gofo_boot_config {
 #define IA_GOFO_BIST_DMEM_FAULT_DETECTION_ERR	0xdead1000
 
 enum ia_gofo_boot_state {
-	IA_GOFO_FW_BOOT_STATE_SECONDARY_BOOT_CONFIG_READY = 0x57a7b000,
 	IA_GOFO_FW_BOOT_STATE_UNINIT = 0x57a7e000,
-	IA_GOFO_FW_BOOT_STATE_STARTING_0 = 0x57a7d000,
-	IA_GOFO_FW_BOOT_STATE_CACHE_INIT_DONE = 0x57a7d010,
-	IA_GOFO_FW_BOOT_STATE_MEM_INIT_DONE = 0x57a7d020,
-	IA_GOFO_FW_BOOT_STATE_STACK_INIT_DONE = 0x57a7d030,
-	IA_GOFO_FW_BOOT_STATE_EARLY_BOOT_DONE = 0x57a7d100,
-	IA_GOFO_FW_BOOT_STATE_BOOT_CONFIG_START = 0x57a7d200,
-	IA_GOFO_FW_BOOT_STATE_QUEUE_INIT_DONE = 0x57a7d300,
 	IA_GOFO_FW_BOOT_STATE_READY = 0x57a7e100,
-	IA_GOFO_FW_BOOT_STATE_CRIT_UNSPECIFIED = 0xdead0001,
-	IA_GOFO_FW_BOOT_STATE_CRIT_CFG_PTR = 0xdead0101,
-	IA_GOFO_FW_BOOT_STATE_CRIT_CFG_VERSION = 0xdead0201,
-	IA_GOFO_FW_BOOT_STATE_CRIT_MSG_VERSION = 0xdead0301,
-	IA_GOFO_FW_BOOT_STATE_CRIT_WDT_TIMEOUT = IA_GOFO_WDT_TIMEOUT_ERR,
-	IA_GOFO_FW_BOOT_STATE_WRONG_DATA_SECTION_UNPACKING = 0xdead0501,
-	IA_GOFO_FW_BOOT_STATE_WRONG_RO_DATA_SECTION_UNPACKING = 0xdead0601,
-	IA_GOFO_FW_BOOT_STATE_INVALID_UNTRUSTED_ADDR_MIN = 0xdead0701,
-	IA_GOFO_FW_BOOT_STATE_CRIT_MEM_FATAL_DME = IA_GOFO_MEM_FATAL_DME_ERR,
-	IA_GOFO_FW_BOOT_STATE_CRIT_MEM_UNCORRECTABLE_LOCAL =
-	IA_GOFO_MEM_UNCORRECTABLE_LOCAL_ERR,
-	IA_GOFO_FW_BOOT_STATE_CRIT_MEM_UNCORRECTABLE_DIRTY =
-	IA_GOFO_MEM_UNCORRECTABLE_DIRTY_ERR,
-	IA_GOFO_FW_BOOT_STATE_CRIT_MEM_UNCORRECTABLE_DTAG =
-	IA_GOFO_MEM_UNCORRECTABLE_DTAG_ERR,
-	IA_GOFO_FW_BOOT_STATE_CRIT_MEM_UNCORRECTABLE_CACHE =
-	IA_GOFO_MEM_UNCORRECTABLE_CACHE_ERR,
-	IA_GOFO_FW_BOOT_STATE_CRIT_DOUBLE_EXCEPTION =
-	IA_GOFO_DOUBLE_EXCEPTION_ERR,
-	IA_GOFO_FW_BOOT_STATE_CRIT_BIST_DMEM_FAULT_DETECTION_ERR =
-	IA_GOFO_BIST_DMEM_FAULT_DETECTION_ERR,
-	IA_GOFO_FW_BOOT_STATE_CRIT_DATA_INTEGRITY_FAILURE = 0xdead1010,
-	IA_GOFO_FW_BOOT_STATE_CRIT_STACK_CHK_FAILURE = 0xdead1011,
-	IA_GOFO_FW_BOOT_STATE_CRIT_SYSCOM_CONTEXT_INTEGRITY_FAILURE =
-	0xdead1012,
-	IA_GOFO_FW_BOOT_STATE_CRIT_MPU_CONFIG_FAILURE = 0xdead1013,
-	IA_GOFO_FW_BOOT_STATE_CRIT_SHARED_BUFFER_FAILURE = 0xdead1014,
-	IA_GOFO_FW_BOOT_STATE_CRIT_CMEM_FAILURE = 0xdead1015,
 	IA_GOFO_FW_BOOT_STATE_SHUTDOWN_CMD = 0x57a7f001,
-	IA_GOFO_FW_BOOT_STATE_SHUTDOWN_START = 0x57a7e200,
 	IA_GOFO_FW_BOOT_STATE_INACTIVE = 0x57a7e300,
-	IA_GOFO_FW_BOOT_HW_CMD_ACK_TIMEOUT = 0x57a7e400,
-	IA_GOFO_FW_BOOT_SYSTEM_CYCLES_ERROR = 0x57a7e500
 };
 
 #endif
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
index dab4476f83ff..b85dcc519a31 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
@@ -49,18 +49,6 @@ struct ia_gofo_msg_err {
 #define IA_GOFO_MSG_ERR_GROUP_RESERVED	IA_GOFO_MSG_ERR_GROUP_UNSPECIFIED
 #define IA_GOFO_MSG_ERR_GROUP_GENERAL		1
 
-enum ia_gofo_msg_err_general {
-	IA_GOFO_MSG_ERR_GENERAL_OK = IA_GOFO_MSG_ERR_OK,
-	IA_GOFO_MSG_ERR_GENERAL_MSG_TOO_SMALL = 1,
-	IA_GOFO_MSG_ERR_GENERAL_MSG_TOO_LARGE = 2,
-	IA_GOFO_MSG_ERR_GENERAL_DEVICE_STATE = 3,
-	IA_GOFO_MSG_ERR_GENERAL_ALIGNMENT = 4,
-	IA_GOFO_MSG_ERR_GENERAL_INDIRECT_REF_PTR_INVALID = 5,
-	IA_GOFO_MSG_ERR_GENERAL_INVALID_MSG_TYPE = 6,
-	IA_GOFO_MSG_ERR_GENERAL_SYSCOM_FAIL = 7,
-	IA_GOFO_MSG_ERR_GENERAL_N
-};
-
 #pragma pack(push, 1)
 #define IA_GOFO_MSG_TYPE_RESERVED	0
 #define IA_GOFO_MSG_TYPE_INDIRECT	1
@@ -72,16 +60,6 @@ enum ia_gofo_msg_err_general {
 #pragma pack(push, 1)
 enum ia_gofo_msg_link_streaming_mode {
 	IA_GOFO_MSG_LINK_STREAMING_MODE_SOFF = 0,
-	IA_GOFO_MSG_LINK_STREAMING_MODE_DOFF = 1,
-	IA_GOFO_MSG_LINK_STREAMING_MODE_BCLM = 2,
-	IA_GOFO_MSG_LINK_STREAMING_MODE_BCSM_FIX = 3,
-	IA_GOFO_MSG_LINK_STREAMING_MODE_N
-};
-
-enum ia_gofo_soc_pbk_instance_id {
-	IA_GOFO_SOC_PBK_ID0 = 0,
-	IA_GOFO_SOC_PBK_ID1 = 1,
-	IA_GOFO_SOC_PBK_ID_N
 };
 
 #pragma pack(pop)
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
index f1dbcfefaa10..29ea0355fdde 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h
@@ -36,7 +36,6 @@ enum ipu7_insys_resp_type {
 	IPU_INSYS_RESP_TYPE_FRAME_EOF = 8,
 	IPU_INSYS_RESP_TYPE_STREAM_START_AND_CAPTURE_DONE = 9,
 	IPU_INSYS_RESP_TYPE_STREAM_CAPTURE_DONE = 10,
-	IPU_INSYS_RESP_TYPE_PWM_IRQ = 11,
 	N_IPU_INSYS_RESP_TYPE
 };
 
@@ -44,86 +43,26 @@ enum ipu7_insys_send_type {
 	IPU_INSYS_SEND_TYPE_STREAM_OPEN = 0,
 	IPU_INSYS_SEND_TYPE_STREAM_START_AND_CAPTURE = 1,
 	IPU_INSYS_SEND_TYPE_STREAM_CAPTURE = 2,
-	IPU_INSYS_SEND_TYPE_STREAM_ABORT = 3,
 	IPU_INSYS_SEND_TYPE_STREAM_FLUSH = 4,
 	IPU_INSYS_SEND_TYPE_STREAM_CLOSE = 5,
 	N_IPU_INSYS_SEND_TYPE
 };
 
-enum ipu7_insys_mipi_vc {
-	IPU_INSYS_MIPI_VC_0 = 0,
-	IPU_INSYS_MIPI_VC_1 = 1,
-	IPU_INSYS_MIPI_VC_2 = 2,
-	IPU_INSYS_MIPI_VC_3 = 3,
-	IPU_INSYS_MIPI_VC_4 = 4,
-	IPU_INSYS_MIPI_VC_5 = 5,
-	IPU_INSYS_MIPI_VC_6 = 6,
-	IPU_INSYS_MIPI_VC_7 = 7,
-	IPU_INSYS_MIPI_VC_8 = 8,
-	IPU_INSYS_MIPI_VC_9 = 9,
-	IPU_INSYS_MIPI_VC_10 = 10,
-	IPU_INSYS_MIPI_VC_11 = 11,
-	IPU_INSYS_MIPI_VC_12 = 12,
-	IPU_INSYS_MIPI_VC_13 = 13,
-	IPU_INSYS_MIPI_VC_14 = 14,
-	IPU_INSYS_MIPI_VC_15 = 15,
-	N_IPU_INSYS_MIPI_VC
-};
-
-enum ipu7_insys_mipi_port {
-	IPU_INSYS_MIPI_PORT_0 = 0,
-	IPU_INSYS_MIPI_PORT_1 = 1,
-	IPU_INSYS_MIPI_PORT_2 = 2,
-	IPU_INSYS_MIPI_PORT_3 = 3,
-	IPU_INSYS_MIPI_PORT_4 = 4,
-	IPU_INSYS_MIPI_PORT_5 = 5,
-	NA_IPU_INSYS_MIPI_PORT
-};
-
 enum ipu7_insys_frame_format_type {
-	IPU_INSYS_FRAME_FORMAT_NV11 = 0,
-	IPU_INSYS_FRAME_FORMAT_NV12 = 1,
-	IPU_INSYS_FRAME_FORMAT_NV12_16 = 2,
-	IPU_INSYS_FRAME_FORMAT_NV12_TILEY = 3,
-	IPU_INSYS_FRAME_FORMAT_NV16 = 4,
-	IPU_INSYS_FRAME_FORMAT_NV21 = 5,
-	IPU_INSYS_FRAME_FORMAT_NV61 = 6,
-	IPU_INSYS_FRAME_FORMAT_YV12 = 7,
-	IPU_INSYS_FRAME_FORMAT_YV16 = 8,
-	IPU_INSYS_FRAME_FORMAT_YUV420 = 9,
-	IPU_INSYS_FRAME_FORMAT_YUV420_10 = 10,
-	IPU_INSYS_FRAME_FORMAT_YUV420_12 = 11,
-	IPU_INSYS_FRAME_FORMAT_YUV420_14 = 12,
-	IPU_INSYS_FRAME_FORMAT_YUV420_16 = 13,
-	IPU_INSYS_FRAME_FORMAT_YUV422 = 14,
-	IPU_INSYS_FRAME_FORMAT_YUV422_16 = 15,
 	IPU_INSYS_FRAME_FORMAT_UYVY = 16,
 	IPU_INSYS_FRAME_FORMAT_YUYV = 17,
-	IPU_INSYS_FRAME_FORMAT_YUV444 = 18,
-	IPU_INSYS_FRAME_FORMAT_YUV_LINE = 19,
 	IPU_INSYS_FRAME_FORMAT_RAW8 = 20,
 	IPU_INSYS_FRAME_FORMAT_RAW10 = 21,
 	IPU_INSYS_FRAME_FORMAT_RAW12 = 22,
-	IPU_INSYS_FRAME_FORMAT_RAW14 = 23,
 	IPU_INSYS_FRAME_FORMAT_RAW16 = 24,
 	IPU_INSYS_FRAME_FORMAT_RGB565 = 25,
-	IPU_INSYS_FRAME_FORMAT_PLANAR_RGB888 = 26,
 	IPU_INSYS_FRAME_FORMAT_RGBA888 = 27,
-	IPU_INSYS_FRAME_FORMAT_QPLANE6 = 28,
-	IPU_INSYS_FRAME_FORMAT_BINARY_8 = 29,
-	IPU_INSYS_FRAME_FORMAT_Y_8 = 30,
-	IPU_INSYS_FRAME_FORMAT_ARGB888 = 31,
-	IPU_INSYS_FRAME_FORMAT_BGRA888 = 32,
-	IPU_INSYS_FRAME_FORMAT_ABGR888 = 33,
-	N_IPU_INSYS_FRAME_FORMAT
 };
 
 #define N_IPU_INSYS_MIPI_DATA_TYPE 0x40
 
 enum ipu7_insys_mipi_dt_rename_mode {
 	IPU_INSYS_MIPI_DT_NO_RENAME = 0,
-	IPU_INSYS_MIPI_DT_RENAMED_MODE = 1,
-	N_IPU_INSYS_MIPI_DT_MODE
 };
 
 #define IPU_INSYS_STREAM_SYNC_MSG_SEND_RESP_SOF			BIT(0)
@@ -171,27 +110,10 @@ enum ipu7_insys_mipi_dt_rename_mode {
 
 enum ipu7_insys_output_link_dest {
 	IPU_INSYS_OUTPUT_LINK_DEST_MEM = 0,
-	IPU_INSYS_OUTPUT_LINK_DEST_PSYS = 1,
-	IPU_INSYS_OUTPUT_LINK_DEST_IPU_EXTERNAL = 2
-};
-
-enum ipu7_insys_dpcm_type {
-	IPU_INSYS_DPCM_TYPE_DISABLED = 0,
-	IPU_INSYS_DPCM_TYPE_10_8_10 = 1,
-	IPU_INSYS_DPCM_TYPE_12_8_12 = 2,
-	IPU_INSYS_DPCM_TYPE_12_10_12 = 3,
-	N_IPU_INSYS_DPCM_TYPE
-};
-
-enum ipu7_insys_dpcm_predictor {
-	IPU_INSYS_DPCM_PREDICTOR_1 = 0,
-	IPU_INSYS_DPCM_PREDICTOR_2 = 1,
-	N_IPU_INSYS_DPCM_PREDICTOR
 };
 
 enum ipu7_insys_send_queue_token_flag {
 	IPU_INSYS_SEND_QUEUE_TOKEN_FLAG_NONE = 0,
-	IPU_INSYS_SEND_QUEUE_TOKEN_FLAG_FLUSH_FORCE = 1
 };
 
 #pragma pack(push, 1)
@@ -296,84 +218,12 @@ struct ipu7_insys_send_queue_token {
 
 #pragma pack(pop)
 
-enum insys_msg_err_stream {
-	INSYS_MSG_ERR_STREAM_OK = IA_GOFO_MSG_ERR_OK,
-	INSYS_MSG_ERR_STREAM_STREAM_ID = 1,
-	INSYS_MSG_ERR_STREAM_MAX_OPINS = 2,
-	INSYS_MSG_ERR_STREAM_MAX_IPINS = 3,
-	INSYS_MSG_ERR_STREAM_STREAM_MESSAGES_MAP = 4,
-	INSYS_MSG_ERR_STREAM_SYNC_MESSAGES_MAP = 5,
-	INSYS_MSG_ERR_STREAM_SENSOR_TYPE = 6,
-	INSYS_MSG_ERR_STREAM_FOREIGN_KEY = 7,
-	INSYS_MSG_ERR_STREAM_STREAMING_MODE = 8,
-	INSYS_MSG_ERR_STREAM_DPCM_EN = 9,
-	INSYS_MSG_ERR_STREAM_DPCM_TYPE = 10,
-	INSYS_MSG_ERR_STREAM_DPCM_PREDICTOR = 11,
-	INSYS_MSG_ERR_STREAM_GRANULARITY_POINTER_UPDATE = 12,
-	INSYS_MSG_ERR_STREAM_MPF_LUT_ENTRY_RESOURCES_BUSY = 13,
-	INSYS_MSG_ERR_STREAM_MPF_DEV_ID = 14,
-	INSYS_MSG_ERR_STREAM_BUFFER_LINES = 15,
-	INSYS_MSG_ERR_STREAM_IPIN_ID = 16,
-	INSYS_MSG_ERR_STREAM_DATA_TYPE = 17,
-	INSYS_MSG_ERR_STREAM_STREAMING_PROTOCOL_STATE = 18,
-	INSYS_MSG_ERR_STREAM_SYSCOM_FLUSH = 19,
-	INSYS_MSG_ERR_STREAM_MIPI_VC = 20,
-	INSYS_MSG_ERR_STREAM_STREAM_SRC = 21,
-	INSYS_MSG_ERR_STREAM_PBK_ID = 22,
-	INSYS_MSG_ERR_STREAM_CMD_QUEUE_DEALLOCATE = 23,
-	INSYS_MSG_ERR_STREAM_INSUFFICIENT_RESOURCES = 24,
-	INSYS_MSG_ERR_STREAM_IPIN_CONFIGURATION = 25,
-	INSYS_MSG_ERR_STREAM_INVALID_STATE = 26,
-	INSYS_MSG_ERR_STREAM_SW_MANAGED = 27,
-	INSYS_MSG_ERR_STREAM_PBK_SLOT_ID = 28,
-	INSYS_MSG_ERR_STREAM_FLUSH_TIMEOUT = 29,
-	INSYS_MSG_ERR_STREAM_IPIN_WIDTH = 30,
-	INSYS_MSG_ERR_STREAM_IPIN_HEIGHT = 31,
-	INSYS_MSG_ERR_STREAM_OUTPUT_PIN_EARLY_ACK_EN = 32,
-	INSYS_MSG_ERR_STREAM_INCONSISTENT_PARAMS = 33,
-	INSYS_MSG_ERR_STREAM_PLANE_COUNT = 34,
-	INSYS_MSG_ERR_STREAM_FRAME_FORMAT_TYPE = 35,
-	INSYS_MSG_ERR_STREAM_INSUFFICIENT_RESOURCES_OUTPUT = 36,
-	INSYS_MSG_ERR_STREAM_WIDTH_OUTPUT_SIZE = 37,
-	INSYS_MSG_ERR_STREAM_CLOSED = 38,
-	INSYS_MSG_ERR_STREAM_N
-};
-
 enum insys_msg_err_capture {
-	INSYS_MSG_ERR_CAPTURE_OK = IA_GOFO_MSG_ERR_OK,
-	INSYS_MSG_ERR_CAPTURE_STREAM_ID = 1,
-	INSYS_MSG_ERR_CAPTURE_PAYLOAD_PTR = 2,
-	INSYS_MSG_ERR_CAPTURE_MEM_SLOT = 3,
-	INSYS_MSG_ERR_CAPTURE_STREAMING_MODE = 4,
-	INSYS_MSG_ERR_CAPTURE_AVAILABLE_CMD_SLOT = 5,
-	INSYS_MSG_ERR_CAPTURE_CONSUMED_CMD_SLOT = 6,
-	INSYS_MSG_ERR_CAPTURE_CMD_SLOT_PAYLOAD_PTR = 7,
-	INSYS_MSG_ERR_CAPTURE_CMD_PREPARE = 8,
-	INSYS_MSG_ERR_CAPTURE_OUTPUT_PIN = 9,
 	INSYS_MSG_ERR_CAPTURE_SYNC_FRAME_DROP = 10,
-	INSYS_MSG_ERR_CAPTURE_FRAME_MESSAGES_MAP = 11,
-	INSYS_MSG_ERR_CAPTURE_TIMEOUT = 12,
-	INSYS_MSG_ERR_CAPTURE_INVALID_STREAM_STATE = 13,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_MULTIBIT_PH_ERROR_DETECTED = 14,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_PAYLOAD_CRC_ERROR = 15,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_INPUT_DATA_LOSS_ELASTIC_FIFO_OVFL  = 16,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_PIXEL_BUFFER_OVERFLOW = 17,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_BAD_FRAME_DIM = 18,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_PHY_SYNC_ERR = 19,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_SECURE_TOUCH = 20,
-	INSYS_MSG_ERR_CAPTURE_HW_ERR_MASTER_SLAVE_SYNC_ERR = 21,
-	INSYS_MSG_ERR_CAPTURE_FRAME_SKIP_ERR = 22,
-	INSYS_MSG_ERR_CAPTURE_FE_INPUT_FIFO_OVERFLOW_ERR = 23,
-	INSYS_MSG_ERR_CAPTURE_CMD_SUBMIT_TO_HW = 24,
-	INSYS_MSG_ERR_CAPTURE_N
 };
 
 enum insys_msg_err_groups {
-	INSYS_MSG_ERR_GROUP_RESERVED = IA_GOFO_MSG_ERR_GROUP_RESERVED,
-	INSYS_MSG_ERR_GROUP_GENERAL = IA_GOFO_MSG_ERR_GROUP_GENERAL,
-	INSYS_MSG_ERR_GROUP_STREAM = 2,
 	INSYS_MSG_ERR_GROUP_CAPTURE = 3,
-	INSYS_MSG_ERR_GROUP_N,
 };
 
 #endif
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
index 3f2c065dfe14..b2e6bd9159f2 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
@@ -9,30 +9,6 @@
 #include "ipu7_fw_common_abi.h"
 
 #pragma pack(push, 1)
-enum ipu7_msg_type {
-	IPU_MSG_TYPE_RESERVED = IA_GOFO_MSG_TYPE_RESERVED,
-	IPU_MSG_TYPE_INDIRECT = IA_GOFO_MSG_TYPE_INDIRECT,
-	IPU_MSG_TYPE_DEV_LOG = IA_GOFO_MSG_TYPE_LOG,
-	IPU_MSG_TYPE_GENERAL_ERR = IA_GOFO_MSG_TYPE_GENERAL_ERR,
-	IPU_MSG_TYPE_DEV_OPEN = 4,
-	IPU_MSG_TYPE_DEV_OPEN_ACK = 5,
-	IPU_MSG_TYPE_GRAPH_OPEN = 6,
-	IPU_MSG_TYPE_GRAPH_OPEN_ACK = 7,
-	IPU_MSG_TYPE_TASK_REQ = 8,
-	IPU_MSG_TYPE_TASK_DONE = 9,
-	IPU_MSG_TYPE_GRAPH_CLOSE = 10,
-	IPU_MSG_TYPE_GRAPH_CLOSE_ACK = 11,
-	IPU_MSG_TYPE_DEV_CLOSE = 12,
-	IPU_MSG_TYPE_DEV_CLOSE_ACK = 13,
-	IPU_MSG_TYPE_TERM_EVENT = 14,
-	IPU_MSG_TYPE_N,
-};
-
-enum ipu7_msg_node_type {
-	IPU_MSG_NODE_TYPE_PAD = 0,
-	IPU_MSG_NODE_TYPE_BASE,
-	IPU_MSG_NODE_TYPE_N
-};
 
 #define IPU_MSG_NODE_MAX_DEVICES	(128U)
 #define DEB_NUM_UINT32	(IPU_MSG_NODE_MAX_DEVICES / (sizeof(u32) * 8U))
@@ -45,173 +21,27 @@ typedef u32 ipu7_msg_deb_t[DEB_NUM_UINT32];
 
 typedef u32 ipu7_msg_rbm_t[RBM_NUM_UINT32];
 
-enum ipu7_msg_node_profile_type {
-	IPU_MSG_NODE_PROFILE_TYPE_PAD = 0,
-	IPU_MSG_NODE_PROFILE_TYPE_BASE,
-	IPU_MSG_NODE_PROFILE_TYPE_CB,
-	IPU_MSG_NODE_PROFILE_TYPE_N
-};
-
-enum ipu7_msg_node_option_types {
-	IPU_MSG_NODE_OPTION_TYPES_PADDING = 0,
-	IPU_MSG_NODE_OPTION_TYPES_N
-};
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
 
-enum ipu7_msg_link_type {
-	IPU_MSG_LINK_TYPE_PAD = 0,
-	IPU_MSG_LINK_TYPE_GENERIC = 1,
-	IPU_MSG_LINK_TYPE_N
-};
-
-enum ipu7_msg_link_option_types {
-	IPU_MSG_LINK_OPTION_TYPES_PADDING = 0,
-	IPU_MSG_LINK_OPTION_TYPES_CMPRS = 1,
-	IPU_MSG_LINK_OPTION_TYPES_N
-};
-
-enum ipu7_msg_link_cmprs_option_bit_depth {
-	IPU_MSG_LINK_CMPRS_OPTION_8BPP = 0,
-	IPU_MSG_LINK_CMPRS_OPTION_10BPP = 1,
-	IPU_MSG_LINK_CMPRS_OPTION_12BPP = 2,
-};
-
 #define IPU_MSG_LINK_FOREIGN_KEY_NONE		(65535U)
 #define IPU_MSG_LINK_PBK_ID_DONT_CARE		(255U)
 #define IPU_MSG_LINK_PBK_SLOT_ID_DONT_CARE	(255U)
 
 #pragma pack(pop)
 
-enum ipu7_msg_dev_state {
-	IPU_MSG_DEV_STATE_CLOSED = 0,
-	IPU_MSG_DEV_STATE_OPEN_WAIT = 1,
-	IPU_MSG_DEV_STATE_OPEN = 2,
-	IPU_MSG_DEV_STATE_CLOSE_WAIT = 3,
-	IPU_MSG_DEV_STATE_N
-};
-
-enum ipu7_msg_graph_state {
-	IPU_MSG_GRAPH_STATE_CLOSED = 0,
-	IPU_MSG_GRAPH_STATE_OPEN_WAIT = 1,
-	IPU_MSG_GRAPH_STATE_OPEN = 2,
-	IPU_MSG_GRAPH_STATE_CLOSE_WAIT = 3,
-	IPU_MSG_GRAPH_STATE_N
-};
-
-enum ipu7_msg_task_state {
-	IPU_MSG_TASK_STATE_DONE = 0,
-	IPU_MSG_TASK_STATE_WAIT_DONE = 1,
-	IPU_MSG_TASK_STATE_N
-};
-
-enum ipu7_msg_err_groups {
-	IPU_MSG_ERR_GROUP_RESERVED = IA_GOFO_MSG_ERR_GROUP_RESERVED,
-	IPU_MSG_ERR_GROUP_GENERAL = IA_GOFO_MSG_ERR_GROUP_GENERAL,
-	IPU_MSG_ERR_GROUP_DEVICE = 2,
-	IPU_MSG_ERR_GROUP_GRAPH = 3,
-	IPU_MSG_ERR_GROUP_TASK = 4,
-	IPU_MSG_ERR_GROUP_N,
-};
-
 #pragma pack(push, 1)
-enum ipu7_msg_err_task {
-	IPU_MSG_ERR_TASK_OK = IA_GOFO_MSG_ERR_OK,
-	IPU_MSG_ERR_TASK_GRAPH_ID = 1,
-	IPU_MSG_ERR_TASK_NODE_CTX_ID = 2,
-	IPU_MSG_ERR_TASK_PROFILE_IDX = 3,
-	IPU_MSG_ERR_TASK_CTX_MEMORY_TASK = 4,
-	IPU_MSG_ERR_TASK_TERM_PAYLOAD_PTR = 5,
-	IPU_MSG_ERR_TASK_FRAME_ID = 6,
-	IPU_MSG_ERR_TASK_FRAG_ID = 7,
-	IPU_MSG_ERR_TASK_EXEC_EXT = 8,
-	IPU_MSG_ERR_TASK_EXEC_SBX = 9,
-	IPU_MSG_ERR_TASK_EXEC_INT = 10,
-	IPU_MSG_ERR_TASK_EXEC_UNKNOWN = 11,
-	IPU_MSG_ERR_TASK_PRE_EXEC = 12,
-	IPU_MSG_ERR_TASK_N
-};
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
-enum ipu7_msg_term_type {
-	IPU_MSG_TERM_TYPE_PAD = 0,
-	IPU_MSG_TERM_TYPE_BASE,
-	IPU_MSG_TERM_TYPE_N,
-};
-
-enum ipu7_msg_term_option_types {
-	IPU_MSG_TERM_OPTION_TYPES_PADDING = 0,
-	IPU_MSG_TERM_OPTION_TYPES_N
-};
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
 
-enum ipu7_msg_err_device {
-	IPU_MSG_ERR_DEVICE_OK = IA_GOFO_MSG_ERR_OK,
-	IPU_MSG_ERR_DEVICE_MAX_GRAPHS = 1,
-	IPU_MSG_ERR_DEVICE_MSG_MAP = 2,
-	IPU_MSG_ERR_DEVICE_N
-};
-
 #pragma pack(pop)
 
 #pragma pack(push, 1)
-
-enum ipu7_msg_graph_ack_option_types {
-	IPU_MSG_GRAPH_ACK_OPTION_TYPES_PADDING = 0,
-	IPU_MSG_GRAPH_ACK_TASK_Q_INFO,
-	IPU_MSG_GRAPH_ACK_OPTION_TYPES_N
-};
-
-enum ipu7_msg_err_graph {
-	IPU_MSG_ERR_GRAPH_OK = IA_GOFO_MSG_ERR_OK,
-	IPU_MSG_ERR_GRAPH_GRAPH_STATE = 1,
-	IPU_MSG_ERR_GRAPH_MAX_GRAPHS = 2,
-	IPU_MSG_ERR_GRAPH_GRAPH_ID = 3,
-	IPU_MSG_ERR_GRAPH_NODE_CTX_ID = 4,
-	IPU_MSG_ERR_GRAPH_NODE_RSRC_ID = 5,
-	IPU_MSG_ERR_GRAPH_PROFILE_IDX = 6,
-	IPU_MSG_ERR_GRAPH_TERM_ID = 7,
-	IPU_MSG_ERR_GRAPH_TERM_PAYLOAD_SIZE = 8,
-	IPU_MSG_ERR_GRAPH_LINK_NODE_CTX_ID = 9,
-	IPU_MSG_ERR_GRAPH_LINK_TERM_ID = 10,
-	IPU_MSG_ERR_GRAPH_PROFILE_TYPE = 11,
-	IPU_MSG_ERR_GRAPH_NUM_FRAGS = 12,
-	IPU_MSG_ERR_GRAPH_QUEUE_ID_USAGE = 13,
-	IPU_MSG_ERR_GRAPH_QUEUE_OPEN = 14,
-	IPU_MSG_ERR_GRAPH_QUEUE_CLOSE = 15,
-	IPU_MSG_ERR_GRAPH_QUEUE_ID_TASK_REQ_MISMATCH = 16,
-	IPU_MSG_ERR_GRAPH_CTX_MEMORY_FGRAPH = 17,
-	IPU_MSG_ERR_GRAPH_CTX_MEMORY_NODE = 18,
-	IPU_MSG_ERR_GRAPH_CTX_MEMORY_NODE_PROFILE = 19,
-	IPU_MSG_ERR_GRAPH_CTX_MEMORY_TERM = 20,
-	IPU_MSG_ERR_GRAPH_CTX_MEMORY_LINK = 21,
-	IPU_MSG_ERR_GRAPH_CTX_MSG_MAP = 22,
-	IPU_MSG_ERR_GRAPH_CTX_FOREIGN_KEY = 23,
-	IPU_MSG_ERR_GRAPH_CTX_STREAMING_MODE = 24,
-	IPU_MSG_ERR_GRAPH_CTX_PBK_RSRC = 25,
-	IPU_MSG_ERR_GRAPH_UNSUPPORTED_EVENT_TYPE = 26,
-	IPU_MSG_ERR_GRAPH_TOO_MANY_EVENTS = 27,
-	IPU_MSG_ERR_GRAPH_CTX_MEMORY_CMPRS = 28,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_ALIGN_INTERVAL = 29,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_PLANE_ID = 30,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_UNSUPPORTED_MODE = 31,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_BIT_DEPTH = 32,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_STRIDE_ALIGNMENT = 33,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_SUB_BUFFER_ALIGNMENT = 34,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_LAYOUT_ORDER = 35,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_LAYOUT_OVERLAP = 36,
-	IPU_MSG_ERR_GRAPH_CTX_CMPRS_BUFFER_TOO_SMALL = 37,
-	IPU_MSG_ERR_GRAPH_CTX_DELAYED_LINK = 38,
-	IPU_MSG_ERR_GRAPH_N
-};
-
 #pragma pack(pop)
 
 #define FWPS_MSG_ABI_MAX_INPUT_QUEUES	(60U)

-- 
2.55.0

[PATCH 4/4] staging: media: ipu7: remove unnecessary "#pragma pack()" directives

[Nikolay Kulikov]

After the removeal of unused structures, these directives have no effect
and can be removed.

Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>
---
 drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h |  6 ------
 drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h    | 20 --------------------
 2 files changed, 26 deletions(-)

diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
index b85dcc519a31..40c7843ad7a7 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h
@@ -29,9 +29,6 @@ struct ia_gofo_msg_version_list {
 
 #pragma pack(pop)
 
-#pragma pack(push, 1)
-#pragma pack(pop)
-
 #define IA_GOFO_MSG_ERR_MAX_DETAILS		(4U)
 #define IA_GOFO_MSG_ERR_OK			(0U)
 #define IA_GOFO_MSG_ERR_GROUP_UNSPECIFIED	(0U)
@@ -49,14 +46,11 @@ struct ia_gofo_msg_err {
 #define IA_GOFO_MSG_ERR_GROUP_RESERVED	IA_GOFO_MSG_ERR_GROUP_UNSPECIFIED
 #define IA_GOFO_MSG_ERR_GROUP_GENERAL		1
 
-#pragma pack(push, 1)
 #define IA_GOFO_MSG_TYPE_RESERVED	0
 #define IA_GOFO_MSG_TYPE_INDIRECT	1
 #define IA_GOFO_MSG_TYPE_LOG		2
 #define IA_GOFO_MSG_TYPE_GENERAL_ERR	3
 
-#pragma pack(pop)
-
 #pragma pack(push, 1)
 enum ia_gofo_msg_link_streaming_mode {
 	IA_GOFO_MSG_LINK_STREAMING_MODE_SOFF = 0,
diff --git a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
index b2e6bd9159f2..01f4ce857238 100644
--- a/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
+++ b/drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h
@@ -8,8 +8,6 @@
 
 #include "ipu7_fw_common_abi.h"
 
-#pragma pack(push, 1)
-
 #define IPU_MSG_NODE_MAX_DEVICES	(128U)
 #define DEB_NUM_UINT32	(IPU_MSG_NODE_MAX_DEVICES / (sizeof(u32) * 8U))
 
@@ -21,28 +19,10 @@ typedef u32 ipu7_msg_deb_t[DEB_NUM_UINT32];
 
 typedef u32 ipu7_msg_rbm_t[RBM_NUM_UINT32];
 
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-
 #define IPU_MSG_LINK_FOREIGN_KEY_NONE		(65535U)
 #define IPU_MSG_LINK_PBK_ID_DONT_CARE		(255U)
 #define IPU_MSG_LINK_PBK_SLOT_ID_DONT_CARE	(255U)
 
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-#pragma pack(pop)
 
 #define FWPS_MSG_ABI_MAX_INPUT_QUEUES	(60U)
 #define FWPS_MSG_ABI_MAX_OUTPUT_QUEUES	(2U)

-- 
2.55.0

Re: [PATCH 0/4] staging: media: ipu7: abi headers cleanup

[Sakari Ailus]

Hi Nikolay,

On Wed, Aug 05, 2026 at 09:23:04PM +0300, Nikolay Kulikov wrote:
> This series cleans up unused definitions of structures, enums, and
> macros. Each one was identified and verified using 'git grep' across the
> entire driver.
> Verified by compilation.
> 
> Signed-off-by: Nikolay Kulikov <nikolayof23@gmail.com>

Thanks for the series. As such it's nice to clean things up but a this
point we're going to do it by removing the entire driver within some small
number of kernel releases. I've sent a patch to update the TODO file, too.

-- 
Kind regards,

Sakari Ailus