On Thu Oct 1 10:31:30 2026 +0300, Divyamani Tripathi wrote:
> Firmware ABI 1.0.14 diverges from IPU7's InSys message layout (uPipe
> config, CFA dimension, binning factor, wider output cropping) and
> expects boot-message major version 2 instead of IPU7's 1; without the
> version fix the IPU8 firmware rejects the boot handshake with
> IA_GOFO_FW_BOOT_STATE_CRIT_MSG_VERSION (0xdead0301), confirmed on real
> hardware.
>
> Add the IPU8 layout as additional '_ipu8' structs and convert to it at
> send time when running on IPU8, keeping the existing IPU7 layout as
> the shared driver-internal representation used by the common isys
> queue/video code.
>
> Signed-off-by: Divyamani Tripathi <[email protected]>
> Signed-off-by: Sakari Ailus <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6-isys.h | 3 +
drivers/media/pci/intel/ipu6/ipu7-fw-isys.c | 85 ++++++++++++++++++++++++++---
drivers/media/pci/intel/ipu6/ipu7-fw-isys.h | 70 ++++++++++++++++++++++++
3 files changed, 151 insertions(+), 7 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys.h
b/drivers/media/pci/intel/ipu6/ipu6-isys.h
index 2af20f56a965..c5c8ede8e64e 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys.h
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys.h
@@ -139,6 +139,9 @@ struct isys_fw_msgs {
union {
struct ipu7_fw_isys_frame_buff_set frame;
struct ipu7_fw_isys_stream_cfg stream;
+ /* sizes the union for the larger IPU8 (ABI 1.0.14)
layout */
+ struct ipu7_fw_isys_frame_buff_set_ipu8 frame_ipu8;
+ struct ipu7_fw_isys_stream_cfg_ipu8 stream_ipu8;
} ipu7;
};
struct list_head head;
diff --git a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
index 024ff61f91b0..97bdcb6f2831 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
@@ -133,8 +133,10 @@ static int ipu7_fw_isys_init(struct ipu6_isys *isys,
unsigned int num_streams)
isys->fwctx = fwctx;
+ /* IPU8 firmware expects boot-message major version 2, not 1 */
ret = ipu6_ipu7_init_boot_config(adev, queue_configs, num_queues,
- freq, fw_config_dma_addr, 1U);
+ freq, fw_config_dma_addr,
+ IS_IPU8(adev->isp) ? 2U : 1U);
if (ret) {
ipu7_fw_isys_cleanup(isys);
return ret;
@@ -419,10 +421,60 @@ ipu7_fw_isys_prepare_buf_set(struct isys_fw_msgs *msg,
set->output_pins[0].addr, set->output_pins[0].user_token);
}
+static void isys_stream_cfg_to_ipu8(struct ipu7_fw_isys_stream_cfg_ipu8 *dst,
+ const struct ipu7_fw_isys_stream_cfg *src)
+{
+ memset(dst, 0, sizeof(*dst));
+ memcpy(dst->input_pins, src->input_pins, sizeof(dst->input_pins));
+ dst->stream_msg_map = src->stream_msg_map;
+ dst->port_id = src->port_id;
+ dst->vc = src->vc;
+ dst->nof_input_pins = src->nof_input_pins;
+ dst->nof_output_pins = src->nof_output_pins;
+ for (unsigned int i = 0; i < ARRAY_SIZE(src->output_pins); i++) {
+ dst->output_pins[i].link = src->output_pins[i].link;
+ dst->output_pins[i].crop.line_top =
+ src->output_pins[i].crop.line_top;
+ dst->output_pins[i].crop.line_bottom =
+ src->output_pins[i].crop.line_bottom;
+ dst->output_pins[i].dpcm = src->output_pins[i].dpcm;
+ dst->output_pins[i].stride = src->output_pins[i].stride;
+ dst->output_pins[i].ft = src->output_pins[i].ft;
+ dst->output_pins[i].send_irq = src->output_pins[i].send_irq;
+ dst->output_pins[i].input_pin_id =
+ src->output_pins[i].input_pin_id;
+ dst->output_pins[i].early_ack_en =
+ src->output_pins[i].early_ack_en;
+ }
+}
+
+static void isys_buffset_to_ipu8(struct ipu7_fw_isys_frame_buff_set_ipu8 *dst,
+ const struct ipu7_fw_isys_frame_buff_set *src)
+{
+ memset(dst, 0, sizeof(*dst));
+ for (unsigned int i = 0; i < ARRAY_SIZE(src->output_pins); i++)
+ dst->output_pins[i].pin_payload = src->output_pins[i];
+ dst->capture_msg_map = src->capture_msg_map;
+ dst->frame_id = src->frame_id;
+ dst->skip_frame = src->skip_frame;
+}
+
static int ipu7_fw_isys_stream_open(struct ipu6_isys *isys,
const unsigned int stream_handle,
struct isys_fw_msgs *msg)
{
+ if (IS_IPU8(isys->adev->isp)) {
+ struct ipu7_fw_isys_stream_cfg cfg = msg->ipu7.stream;
+
+ isys_stream_cfg_to_ipu8(&msg->ipu7.stream_ipu8, &cfg);
+
+ return ipu7_fw_isys_send_cmd(isys, stream_handle,
+ &msg->ipu7.stream_ipu8,
+ msg->dma_addr,
+ sizeof(msg->ipu7.stream_ipu8),
+ IPU7_INSYS_SEND_TYPE_STREAM_OPEN);
+ }
+
return ipu7_fw_isys_send_cmd(isys, stream_handle, &msg->ipu7.stream,
msg->dma_addr, sizeof(msg->ipu7.stream),
IPU7_INSYS_SEND_TYPE_STREAM_OPEN);
@@ -442,22 +494,41 @@ static int ipu7_fw_isys_stream_flush(struct ipu6_isys
*isys,
IPU7_INSYS_SEND_TYPE_STREAM_FLUSH);
}
+static int ipu7_fw_isys_send_frame_buff_set(struct ipu6_isys *isys,
+ const unsigned int stream_handle,
+ struct isys_fw_msgs *msg, u16
send_type)
+{
+ if (IS_IPU8(isys->adev->isp)) {
+ struct ipu7_fw_isys_frame_buff_set set = msg->ipu7.frame;
+
+ isys_buffset_to_ipu8(&msg->ipu7.frame_ipu8, &set);
+
+ return ipu7_fw_isys_send_cmd(isys, stream_handle,
+ &msg->ipu7.frame_ipu8,
+ msg->dma_addr,
+ sizeof(msg->ipu7.frame_ipu8),
+ send_type);
+ }
+
+ return ipu7_fw_isys_send_cmd(isys, stream_handle, &msg->ipu7.frame,
+ msg->dma_addr, sizeof(msg->ipu7.frame),
+ send_type);
+}
+
static int ipu7_fw_isys_stream_start(struct ipu6_isys *isys,
const unsigned int stream_handle,
struct isys_fw_msgs *msg, bool capture)
{
- return ipu7_fw_isys_send_cmd(isys, stream_handle, &msg->ipu7.frame,
- msg->dma_addr, sizeof(msg->ipu7.frame),
-
IPU7_INSYS_SEND_TYPE_STREAM_START_AND_CAPTURE);
+ return ipu7_fw_isys_send_frame_buff_set(isys, stream_handle, msg,
+
IPU7_INSYS_SEND_TYPE_STREAM_START_AND_CAPTURE);
}
static int ipu7_fw_isys_stream_capture(struct ipu6_isys *isys,
const unsigned int stream_handle,
struct isys_fw_msgs *msg)
{
- return ipu7_fw_isys_send_cmd(isys, stream_handle, &msg->ipu7.frame,
- msg->dma_addr, sizeof(msg->ipu7.frame),
- IPU7_INSYS_SEND_TYPE_STREAM_CAPTURE);
+ return ipu7_fw_isys_send_frame_buff_set(isys, stream_handle, msg,
+
IPU7_INSYS_SEND_TYPE_STREAM_CAPTURE);
}
const struct ipu6_fw_isys_ops ipu7_fw_isys_ops = {
diff --git a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
index 6b72560b0a15..30289d73be6c 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
+++ b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.h
@@ -235,6 +235,14 @@ struct ipu7_fw_isys_output_cropping {
u16 line_bottom;
} __packed;
+/* IPU8 InSys firmware layout, ABI 1.0.14. */
+struct ipu7_fw_isys_output_cropping_ipu8 {
+ u16 line_top;
+ u16 line_bottom;
+ u16 column_left;
+ u16 column_right;
+} __packed;
+
struct ipu7_fw_isys_output_dpcm {
u8 enable;
u8 type;
@@ -242,6 +250,25 @@ struct ipu7_fw_isys_output_dpcm {
u8 pad;
} __packed;
+/* IPU8 (InSys ABI 1.0.14) only. */
+enum ipu7_insys_cfa_dim {
+ IPU7_INSYS_CFA_DIM_2X2 = 0,
+ IPU7_INSYS_CFA_DIM_4X4 = 1,
+ N_IPU7_INSYS_CFA_DIM
+};
+
+#define IPU7_INSYS_MAX_BINNING_FACTOR 4U
+
+/* IPU8 (InSys ABI 1.0.14) only. */
+struct ipu7_fw_isys_upipe_output_pin_ipu8 {
+ u32 opaque_pin_cfg;
+ u16 plane_offset_1;
+ u16 plane_offset_2;
+ u8 single_uob_fifo;
+ u8 shared_uob_fifo;
+ u8 pad[2];
+} __packed;
+
struct ipu7_fw_isys_output_pin {
struct ipu7_fw_isys_output_link link;
struct ipu7_fw_isys_output_cropping crop;
@@ -254,6 +281,22 @@ struct ipu7_fw_isys_output_pin {
u8 pad[3];
} __packed;
+/* IPU8 InSys firmware layout, ABI 1.0.14. */
+struct ipu7_fw_isys_output_pin_ipu8 {
+ struct ipu7_fw_isys_output_link link;
+ struct ipu7_fw_isys_output_cropping_ipu8 crop;
+ struct ipu7_fw_isys_output_dpcm dpcm;
+ struct ipu7_fw_isys_upipe_output_pin_ipu8 upipe_pin_cfg;
+ u32 stride;
+ u16 ft;
+ u8 upipe_enable;
+ u8 send_irq;
+ u8 input_pin_id;
+ u8 early_ack_en;
+ u8 cfa_dim;
+ u8 binning_factor;
+} __packed;
+
struct ipu7_fw_isys_resolution {
u32 width;
u32 height;
@@ -280,12 +323,30 @@ struct ipu7_fw_isys_stream_cfg {
u8 pad[2];
} __packed;
+/* IPU8 InSys firmware layout, ABI 1.0.14. */
+struct ipu7_fw_isys_stream_cfg_ipu8 {
+ struct ipu7_fw_isys_input_pin input_pins[IPU7_MAX_IPINS];
+ struct ipu7_fw_isys_output_pin_ipu8 output_pins[IPU7_MAX_OPINS];
+ u16 stream_msg_map;
+ u8 port_id;
+ u8 vc;
+ u8 nof_input_pins;
+ u8 nof_output_pins;
+ u8 pad[2];
+} __packed;
+
struct ipu7_fw_isys_capture_output_pin {
u64 user_token;
u32 addr;
u8 pad[4];
} __packed;
+/* IPU8 (InSys ABI 1.0.14) only. */
+struct ipu7_fw_isys_capture_output_pin_cfg_ipu8 {
+ struct ipu7_fw_isys_capture_output_pin pin_payload;
+ u32 upipe_capture_cfg;
+} __packed;
+
struct ipu7_fw_isys_frame_buff_set {
struct ipu7_fw_isys_capture_output_pin output_pins[IPU7_MAX_OPINS];
u8 capture_msg_map;
@@ -294,6 +355,15 @@ struct ipu7_fw_isys_frame_buff_set {
u8 pad[5];
} __packed;
+/* IPU8 InSys firmware layout, ABI 1.0.14. */
+struct ipu7_fw_isys_frame_buff_set_ipu8 {
+ struct ipu7_fw_isys_capture_output_pin_cfg_ipu8
output_pins[IPU7_MAX_OPINS];
+ u8 capture_msg_map;
+ u8 frame_id;
+ u8 skip_frame;
+ u8 pad[5];
+} __packed;
+
struct ipu6_fw_isys_ops *ipu7_fw_isys_get_ops(void);
irqreturn_t ipu7_isys_isr(struct ipu6_bus_device *adev);
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
