github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: ipu6: Move ipu7 fw logger and watchdog configuration

Browse Source 
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>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
This commit is contained in:
Antti Laakso 2026-10-01 15:45:40 +03:00 committed by Sakari Ailus
parent f21f57ca4e
commit d38c344454
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/media/pci/intel/ipu6/ipu7-boot.h
View File

@ -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;

19
drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
View File

@ -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;
};