[PATCH 7/7] media: ipu6: Move ipu7 fw logger and watchdog configuration

[Antti Laakso <antti.laakso@linux.intel.com>]

The logger and watchdog configurations are not isys specific, move them
to ipu7-boot.h. No functional change.

Assisted-by: LLM
Signed-off-by: Antti Laakso <antti.laakso@linux.intel.com>
---
 drivers/media/pci/intel/ipu6/ipu7-boot.h    | 22 +++++++++++++++++++++
 drivers/media/pci/intel/ipu6/ipu7-fw-isys.h | 19 ++----------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/drivers/media/pci/intel/ipu6/ipu7-boot.h b/drivers/media/pci/intel/ipu6/ipu7-boot.h
index a7e59067b3eb..e7a21b16f41b 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-boot.h
+++ b/drivers/media/pci/intel/ipu6/ipu7-boot.h
@@ -4,6 +4,8 @@
 #ifndef IPU7_BOOT_H
 #define IPU7_BOOT_H
 
+#include <linux/bits.h>
+
 #include "ipu7-fw-com.h"
 
 #define IPU7_BOOT_MSG_VER_MAX_ENTRIES	3U
@@ -12,6 +14,26 @@
 #define IPU7_BOOT_STATE_READY(s)	((s) == 0x57a7e100U)
 #define IPU7_BOOT_STATE_INACTIVE(s)	((s) == 0x57a7e300U)
 
+#define IPU7_FWLOG_MAX_LOGGER_SOURCES		(64U)
+
+#define IPU7_LOGGER_CFG_CHANNEL_ENABLE_SYSCOM	BIT(1)
+
+/* Shared by the insys and psys subsystem configurations */
+struct ipu7_fw_logger_config {
+	u8 use_source_severity;
+	u8 source_severity[IPU7_FWLOG_MAX_LOGGER_SOURCES];
+	u8 use_channels_enable_bitmask;
+	u8 channels_enable_bitmask;
+	u8 padding[1];
+	u32 hw_printf_buffer_base_addr;
+	u32 hw_printf_buffer_size_bytes;
+};
+
+struct ipu7_wdt_abi {
+	u32 wdt_timer1_us;
+	u32 wdt_timer2_us;
+};
+
 struct ipu7_boot_abi_version {
 	u8 patch;
 	u8 subminor;
diff --git a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
index 30289d73be6c..2536f15a4962 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
+++ b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
@@ -4,9 +4,9 @@
 #ifndef IPU7_FW_ISYS_H
 #define IPU7_FW_ISYS_H
 
+#include "ipu7-boot.h"
 #include <linux/limits.h>
 
-#define IPU7_FWLOG_MAX_LOGGER_SOURCES		(64U)
 #define IPU7_INSYS_MAX_OUTPUT_QUEUES		3U
 #define IPU7_INSYS_STREAM_ID_MAX		16U
 #define IPU7_INSYS_MAX_INPUT_QUEUES		(IPU7_INSYS_STREAM_ID_MAX + 1U)
@@ -158,24 +158,9 @@ enum insys_msg_err_groups {
 	INSYS_MSG_ERR_GROUP_N,
 };
 
-struct ipu7_fw_isys_logger_config {
-	u8 use_source_severity;
-	u8 source_severity[IPU7_FWLOG_MAX_LOGGER_SOURCES];
-	u8 use_channels_enable_bitmask;
-	u8 channels_enable_bitmask;
-	u8 padding[1];
-	u32 hw_printf_buffer_base_addr;
-	u32 hw_printf_buffer_size_bytes;
-};
-
-struct ipu7_wdt_abi {
-	u32 wdt_timer1_us;
-	u32 wdt_timer2_us;
-};
-
 struct ipu7_insys_config {
 	u32 timeout_val_ms;
-	struct ipu7_fw_isys_logger_config logger_config;
+	struct ipu7_fw_logger_config logger_config;
 	struct ipu7_wdt_abi wdt_config;
 };
 
-- 
2.55.0