Skip to contentSkip to conversation

media: intel/ipu6: continue on ipu7 code sharing preparation

PATCH Superseded Stanislaw Gruszka 2 participants 14 messages Apr 7, 2025 – Apr 14, 2025

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover media: intel/ipu6: continue on ipu7 code sharing preparation

Move and rename more structures to isys.h. Add accessors to make further transformation easier.

This is on top of:
https://git.linuxtv.org/sailus/media_tree.git/log/?h=devel
plus:
https://lore.kernel.org/linux-media/[email protected]/
https://lore.kernel.org/linux-media/[email protected]/

Stanislaw Gruszka (7):
media: intel/ipu6: Use isd name in isys.h
media: intel/ipu6: Remove line_align
media: intel/ipu6: Move common structures definitions to isys.h
media: intel/ipu6: Rename common structures
media: intel/ipu6: Remove deprecated lock comment
media: intel/ipu6: Introduce isys and dev accessors macros
media: intel/ipu6: Start using accessors to get dev pointer

 drivers/media/pci/intel/ipu6/ipu6-fw-isys.c   |  14 +-
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c |  20 +-
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h |   6 +-
 .../media/pci/intel/ipu6/ipu6-isys-dwc-phy.c  |  16 +-
 .../media/pci/intel/ipu6/ipu6-isys-jsl-phy.c  |   8 +-
 .../media/pci/intel/ipu6/ipu6-isys-mcd-phy.c  |  10 +-
 .../media/pci/intel/ipu6/ipu6-isys-queue.c    | 180 +++++++++---------
 .../media/pci/intel/ipu6/ipu6-isys-queue.h    |  66 +------
 .../media/pci/intel/ipu6/ipu6-isys-video.c    |  84 ++++----
 .../media/pci/intel/ipu6/ipu6-isys-video.h    |  77 +-------
 drivers/media/pci/intel/ipu6/ipu6-isys.c      |  35 ++--
 drivers/media/pci/intel/ipu6/ipu6-isys.h      |  35 +++-
 drivers/media/pci/intel/ipu6/isys.h           | 103 +++++++++-
 13 files changed, 332 insertions(+), 322 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/7 media: intel/ipu6: Use isd name in isys.h

Rename asd to isd also in isys.h

---
 drivers/media/pci/intel/ipu6/isys.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/media/pci/intel/ipu6/isys.h +2 -2
index 4bde32f6d767..b6ddadfc374b 100644
@@ -35,8 +35,8 @@ int isys_subdev_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state,
 int isys_subdev_enum_mbus_code(struct v4l2_subdev *sd,
 			       struct v4l2_subdev_state *state,
 			       struct v4l2_subdev_mbus_code_enum *code);
-int isys_subdev_init(struct isys_subdev *asd, struct device *dev,
+int isys_subdev_init(struct isys_subdev *isd, struct device *dev,
 		     const struct v4l2_subdev_ops *ops, unsigned int nr_ctrls,
 		     unsigned int num_sink_pads, unsigned int num_source_pads);
-void isys_subdev_cleanup(struct isys_subdev *asd);
+void isys_subdev_cleanup(struct isys_subdev *isd);
 #endif
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/7 media: intel/ipu6: Remove line_align

In reply to Stanislaw Gruszka

isys->line_align value is only used in one place and we can just use the proper value directly there.

---
 drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 2 +-
 drivers/media/pci/intel/ipu6/ipu6-isys.c       | 1 -
 drivers/media/pci/intel/ipu6/ipu6-isys.h       | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1 -1
index e36a21aa9040..3165904d7ebf 100644
@@ -241,7 +241,7 @@ static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type,
 	else
 		*bytesperline = DIV_ROUND_UP(*width * pfmt->bpp, BITS_PER_BYTE);
 
-	*bytesperline = ALIGN(*bytesperline, av->isys->line_align);
+	*bytesperline = ALIGN(*bytesperline, 64);
 
 	/*
 	 * (height + 1) * bytesperline due to a hardware issue: the DMA unit
drivers/media/pci/intel/ipu6/ipu6-isys.c +0 -1
index 9b7ff5c440de..2267784b86bc 100644
@@ -1089,7 +1089,6 @@ static int isys_probe(struct auxiliary_device *auxdev,
 	INIT_LIST_HEAD(&isys->framebuflist);
 	INIT_LIST_HEAD(&isys->framebuflist_fw);
 
-	isys->line_align = IPU6_ISYS_2600_MEM_LINE_ALIGN;
 	isys->icache_prefetch = 0;
 
 	dev_set_drvdata(&auxdev->dev, isys);
drivers/media/pci/intel/ipu6/ipu6-isys.h +0 -4
index 610b60e69152..f488e782c26e 100644
@@ -29,8 +29,6 @@ struct ipu6_bus_device;
 				 IPU6_ISYS_UNISPART_IRQ_CSI0 |	\
 				 IPU6_ISYS_UNISPART_IRQ_CSI1)
 
-#define IPU6_ISYS_2600_MEM_LINE_ALIGN	64
-
 /*
  * Current message queue configuration. These must be big enough
  * so that they never gets full. Queues are located in system memory
@@ -118,7 +116,6 @@ struct sensor_async_sd {
  * @streams: streams per firmware stream ID
  * @fwcom: fw communication layer private pointer
  *         or optional external library private pointer
- * @line_align: line alignment in memory
  * @phy_termcal_val: the termination calibration value, only used for DWC PHY
  * @need_reset: Isys requires d0i0->i3 transition
  * @ref_count: total number of callers fw open
@@ -140,7 +137,6 @@ struct ipu6_isys {
 	struct ipu6_isys_stream streams[IPU6_ISYS_MAX_STREAMS];
 	int streams_ref_count[IPU6_ISYS_MAX_STREAMS];
 	void *fwcom;
-	unsigned int line_align;
 	u32 phy_termcal_val;
 	bool need_reset;
 	bool icache_prefetch;
Signature · 1 line
2.34.1
maintainer
#3 lore raw

Re: [PATCH 2/7] media: intel/ipu6: Remove line_align

Hi Stanislaw,

Thanks for the set.

Quoted 15 lines · Stanislaw Gruszka

isys->line_align value is only used in one place and we can just use the proper value directly there.

---
 drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 2 +-
 drivers/media/pci/intel/ipu6/ipu6-isys.c       | 1 -
 drivers/media/pci/intel/ipu6/ipu6-isys.h       | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +0 -0
index e36a21aa9040..3165904d7ebf 100644

drivers/media/pci/intel/ipu6/ipu6-isys-video.c static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type, · line 244

Quoted 5 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1 -1
@@ -241,7 +241,7 @@ static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type,
 	else
 		*bytesperline = DIV_ROUND_UP(*width * pfmt->bpp, BITS_PER_BYTE);
 
-	*bytesperline = ALIGN(*bytesperline, av->isys->line_align);
+	*bytesperline = ALIGN(*bytesperline, 64);

Is this value the same for ipu7?

Signature · 1 line
Sakari Ailus
#4 lore raw

Re: [PATCH 2/7] media: intel/ipu6: Remove line_align

Quoted 23 lines · Sakari Ailus

Hi Stanislaw,

Thanks for the set.

Quoted 18 lines · Stanislaw Gruszka

isys->line_align value is only used in one place and we can just use the proper value directly there.

---
 drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 2 +-
 drivers/media/pci/intel/ipu6/ipu6-isys.c       | 1 -
 drivers/media/pci/intel/ipu6/ipu6-isys.h       | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +0 -0
index e36a21aa9040..3165904d7ebf 100644
@@ -241,7 +241,7 @@ static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type,
 	else
 		*bytesperline = DIV_ROUND_UP(*width * pfmt->bpp, BITS_PER_BYTE);
 
Quoted 4 lines

drivers/media/pci/intel/ipu6/ipu6-isys-video.c static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type, · line 244

Quoted 2 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1 -1
-	*bytesperline = ALIGN(*bytesperline, av->isys->line_align);
+	*bytesperline = ALIGN(*bytesperline, 64);

Is this value the same for ipu7?

Yes.

Regards
Stanislaw

maintainer
#5 lore raw

Re: [PATCH 2/7] media: intel/ipu6: Remove line_align

Quoted 24 lines · Stanislaw Gruszka
Quoted 23 lines · Sakari Ailus

Hi Stanislaw,

Thanks for the set.

Quoted 18 lines · Stanislaw Gruszka

isys->line_align value is only used in one place and we can just use the proper value directly there.

---
 drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 2 +-
 drivers/media/pci/intel/ipu6/ipu6-isys.c       | 1 -
 drivers/media/pci/intel/ipu6/ipu6-isys.h       | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +0 -0
index e36a21aa9040..3165904d7ebf 100644
@@ -241,7 +241,7 @@ static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type,
 	else
 		*bytesperline = DIV_ROUND_UP(*width * pfmt->bpp, BITS_PER_BYTE);
 
Quoted 6 lines
Quoted 4 lines

drivers/media/pci/intel/ipu6/ipu6-isys-video.c static void ipu6_isys_try_fmt_cap(struct ipu6_isys_video *av, u32 type, · line 244

Quoted 2 lines
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +1 -1
-	*bytesperline = ALIGN(*bytesperline, av->isys->line_align);
+	*bytesperline = ALIGN(*bytesperline, 64);

Is this value the same for ipu7?

Yes.

Ack, thanks for confirming this.

Signature · 1 line
Sakari Ailus
#6 lore raw

PATCH 3/7 media: intel/ipu6: Move common structures definitions to isys.h

In reply to Stanislaw Gruszka

Move some structures that will be reused in ipu7 to isys.h file. Use one header file instead of multiple, since we frequently include most of ipu6-*.h headers in c files anyways.

---
 .../media/pci/intel/ipu6/ipu6-isys-queue.c    |   1 +
 .../media/pci/intel/ipu6/ipu6-isys-queue.h    |  56 +---------
 .../media/pci/intel/ipu6/ipu6-isys-video.h    |  59 +---------
 drivers/media/pci/intel/ipu6/isys.h           | 102 ++++++++++++++++++
 4 files changed, 105 insertions(+), 113 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +1 -0
index 5fc52a3b89e6..252097c61d0a 100644
@@ -20,6 +20,7 @@
 #include "ipu6-dma.h"
 #include "ipu6-fw-isys.h"
 #include "ipu6-isys.h"
+#include "ipu6-isys-queue.h"
 #include "ipu6-isys-video.h"
 
 static int ipu6_isys_buf_init(struct vb2_buffer *vb)
drivers/media/pci/intel/ipu6/ipu6-isys-queue.h +1 -55

63 lines not on this page · raw message

drivers/media/pci/intel/ipu6/ipu6-isys-video.h +1 -58

65 lines not on this page · raw message

drivers/media/pci/intel/ipu6/isys.h +102 -0

118 lines not on this page · raw message

Signature · 1 line
2.34.1
#7 lore raw

PATCH 4/7 media: intel/ipu6: Rename common structures

In reply to Stanislaw Gruszka

Rename common structures and defines with isys_ prefix. This makes clean distinction of what data/code belongs to each part of the driver.

---
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c |   4 +-
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h |   6 +-
 .../media/pci/intel/ipu6/ipu6-isys-queue.c    | 155 +++++++++---------
 .../media/pci/intel/ipu6/ipu6-isys-queue.h    |  10 +-
 .../media/pci/intel/ipu6/ipu6-isys-video.c    |  52 +++---
 .../media/pci/intel/ipu6/ipu6-isys-video.h    |  18 +-
 drivers/media/pci/intel/ipu6/ipu6-isys.c      |  14 +-
 drivers/media/pci/intel/ipu6/ipu6-isys.h      |   4 +-
 drivers/media/pci/intel/ipu6/isys.h           |  48 +++---
 9 files changed, 155 insertions(+), 156 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +2 -2
index 5c4baaffa092..ddd19cde69be 100644
@@ -556,7 +556,7 @@ int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2,
 	return ret;
 }
 
-void ipu6_isys_csi2_sof_event_by_stream(struct ipu6_isys_stream *stream)
+void ipu6_isys_csi2_sof_event_by_stream(struct isys_stream *stream)
 {
 	struct video_device *vdev = stream->asd->sd.devnode;
 	struct device *dev = &stream->isys->adev->auxdev.dev;
@@ -572,7 +572,7 @@ void ipu6_isys_csi2_sof_event_by_stream(struct ipu6_isys_stream *stream)
 		csi2->port, ev.u.frame_sync.frame_sequence, stream->vc);
 }
 
-void ipu6_isys_csi2_eof_event_by_stream(struct ipu6_isys_stream *stream)
+void ipu6_isys_csi2_eof_event_by_stream(struct isys_stream *stream)
 {
 	struct device *dev = &stream->isys->adev->auxdev.dev;
 	struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(stream->asd);
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h +3 -3
index 7deafead66cf..8b39c139a803 100644
@@ -16,7 +16,7 @@ struct v4l2_mbus_frame_desc_entry;
 
 struct ipu6_isys_video;
 struct ipu6_isys;
-struct ipu6_isys_stream;
+struct isys_stream;
 
 #define NR_OF_CSI2_VC		16
 #define INVALID_VC_ID		-1
@@ -65,8 +65,8 @@ s64 ipu6_isys_csi2_get_link_freq(struct ipu6_isys_csi2 *csi2);
 int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2, struct ipu6_isys *isys,
 			void __iomem *base, unsigned int index);
 void ipu6_isys_csi2_cleanup(struct ipu6_isys_csi2 *csi2);
-void ipu6_isys_csi2_sof_event_by_stream(struct ipu6_isys_stream *stream);
-void ipu6_isys_csi2_eof_event_by_stream(struct ipu6_isys_stream *stream);
+void ipu6_isys_csi2_sof_event_by_stream(struct isys_stream *stream);
+void ipu6_isys_csi2_eof_event_by_stream(struct isys_stream *stream);
 void ipu6_isys_register_errors(struct ipu6_isys_csi2 *csi2);
 void ipu6_isys_csi2_error(struct ipu6_isys_csi2 *csi2);
 int ipu6_isys_csi2_get_remote_desc(u32 source_stream,
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +77 -78

424 lines not on this page · raw message

drivers/media/pci/intel/ipu6/ipu6-isys-queue.h +5 -5
index 6a95858bfd59..10f0dad9964d 100644
@@ -7,13 +7,13 @@
 #include "ipu6-fw-isys.h"
 #include "isys.h"
 
-void ipu6_isys_buffer_list_queue(struct ipu6_isys_buffer_list *bl,
+void ipu6_isys_buffer_list_queue(struct isys_buffer_list *bl,
 				 unsigned long op_flags,
 				 enum vb2_buffer_state state);
 void
 ipu6_isys_buf_to_fw_frame_buf(struct ipu6_fw_isys_frame_buff_set_abi *set,
-			      struct ipu6_isys_stream *stream,
-			      struct ipu6_isys_buffer_list *bl);
-void ipu6_isys_queue_buf_ready(struct ipu6_isys_stream *stream, void *info);
-int ipu6_isys_queue_init(struct ipu6_isys_queue *aq);
+			      struct isys_stream *stream,
+			      struct isys_buffer_list *bl);
+void ipu6_isys_queue_buf_ready(struct isys_stream *stream, void *info);
+int ipu6_isys_queue_init(struct isys_queue *aq);
 #endif /* IPU6_ISYS_QUEUE_H */
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +26 -26

168 lines not on this page · raw message

drivers/media/pci/intel/ipu6/ipu6-isys-video.h +9 -9
index bca8e65dd5ec..402607242005 100644
@@ -28,7 +28,7 @@ struct video_stream_watermark {
 };
 
 struct ipu6_isys_video {
-	struct ipu6_isys_queue aq;
+	struct isys_queue aq;
 	/* Serialise access to other fields in the struct. */
 	struct mutex mutex;
 	struct media_pad pad;
@@ -37,7 +37,7 @@ struct ipu6_isys_video {
 	struct v4l2_meta_format meta_fmt;
 	struct ipu6_isys *isys;
 	struct ipu6_isys_csi2 *csi2;
-	struct ipu6_isys_stream *stream;
+	struct isys_stream *stream;
 	unsigned int streaming;
 	struct video_stream_watermark watermark;
 	u32 source_stream;
@@ -48,26 +48,26 @@ struct ipu6_isys_video {
 #define ipu6_isys_queue_to_video(__aq) \
 	container_of(__aq, struct ipu6_isys_video, aq)
 
-extern const struct ipu6_isys_pixelformat ipu6_isys_pfmts[];
-extern const struct ipu6_isys_pixelformat ipu6_isys_pfmts_packed[];
+extern const struct isys_pixelformat ipu6_isys_pfmts[];
+extern const struct isys_pixelformat ipu6_isys_pfmts_packed[];
 
-const struct ipu6_isys_pixelformat *
+const struct isys_pixelformat *
 ipu6_isys_get_isys_format(u32 pixelformat, u32 code);
 int ipu6_isys_video_prepare_stream(struct ipu6_isys_video *av,
 				   struct media_entity *source_entity,
 				   int nr_queues);
 int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state,
-				  struct ipu6_isys_buffer_list *bl);
+				  struct isys_buffer_list *bl);
 int ipu6_isys_fw_open(struct ipu6_isys *isys);
 void ipu6_isys_fw_close(struct ipu6_isys *isys);
 int ipu6_isys_setup_video(struct ipu6_isys_video *av,
 			  struct media_entity **source_entity, int *nr_queues);
 int ipu6_isys_video_init(struct ipu6_isys_video *av);
 void ipu6_isys_video_cleanup(struct ipu6_isys_video *av);
-void ipu6_isys_put_stream(struct ipu6_isys_stream *stream);
-struct ipu6_isys_stream *
+void ipu6_isys_put_stream(struct isys_stream *stream);
+struct isys_stream *
 ipu6_isys_query_stream_by_handle(struct ipu6_isys *isys, u8 stream_handle);
-struct ipu6_isys_stream *
+struct isys_stream *
 ipu6_isys_query_stream_by_source(struct ipu6_isys *isys, int source, u8 vc);
 
 void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av,
drivers/media/pci/intel/ipu6/ipu6-isys.c +7 -7
index 2267784b86bc..8ac0cc7574de 100644
@@ -249,7 +249,7 @@ static int isys_register_video_devices(struct ipu6_isys *isys)
 				 i * NR_OF_CSI2_SRC_PADS + j);
 			av->isys = isys;
 			av->aq.vbq.buf_struct_size =
-				sizeof(struct ipu6_isys_video_buffer);
+				sizeof(struct isys_video_buffer);
 
 			ret = ipu6_isys_video_init(av);
 			if (ret)
@@ -306,7 +306,7 @@ void isys_setup_hw(struct ipu6_isys *isys)
 
 static void ipu6_isys_csi2_isr(struct ipu6_isys_csi2 *csi2)
 {
-	struct ipu6_isys_stream *stream;
+	struct isys_stream *stream;
 	unsigned int i;
 	u32 status;
 	int source;
@@ -982,7 +982,7 @@ static int alloc_fw_msg_bufs(struct ipu6_isys *isys, int amount)
 	return -ENOMEM;
 }
 
-struct isys_fw_msgs *ipu6_get_fw_msg_buf(struct ipu6_isys_stream *stream)
+struct isys_fw_msgs *ipu6_get_fw_msg_buf(struct isys_stream *stream)
 {
 	struct ipu6_isys *isys = stream->isys;
 	struct device *dev = &isys->adev->auxdev.dev;
@@ -1221,7 +1221,7 @@ static int isys_isr_one(struct ipu6_bus_device *adev)
 {
 	struct ipu6_isys *isys = ipu6_bus_get_drvdata(adev);
 	struct ipu6_fw_isys_resp_info_abi *resp;
-	struct ipu6_isys_stream *stream;
+	struct isys_stream *stream;
 	struct ipu6_isys_csi2 *csi2 = NULL;
 	u32 index;
 	u64 ts;
@@ -1292,7 +1292,7 @@ static int isys_isr_one(struct ipu6_bus_device *adev)
 		 * get pin_data_ready event
 		 */
 		ipu6_put_fw_msg_buf(ipu6_bus_get_drvdata(adev), resp->buf_id);
-		if (resp->pin_id < IPU6_ISYS_OUTPUT_PINS &&
+		if (resp->pin_id < ISYS_OUTPUT_PINS &&
 		    stream->output_pins[resp->pin_id].pin_ready)
 			stream->output_pins[resp->pin_id].pin_ready(stream,
 								    resp);
@@ -1319,8 +1319,8 @@ static int isys_isr_one(struct ipu6_bus_device *adev)
 			"sof: handle %d: (index %u), timestamp 0x%16.16llx\n",
 			resp->stream_handle,
 			stream->seq[stream->seq_index].sequence, ts);
-		stream->seq_index = (stream->seq_index + 1)
-			% IPU6_ISYS_MAX_PARALLEL_SOF;
+		stream->seq_index =
+			(stream->seq_index + 1) % ISYS_MAX_PARALLEL_SOF;
 		break;
 	case IPU6_FW_ISYS_RESP_TYPE_FRAME_EOF:
 		ipu6_isys_csi2_eof_event_by_stream(stream);
drivers/media/pci/intel/ipu6/ipu6-isys.h +2 -2
index f488e782c26e..bf6008bfe539 100644
@@ -134,7 +134,7 @@ struct ipu6_isys {
 	u32 isr_csi2_bits;
 	u32 csi2_rx_ctrl_cached;
 	spinlock_t streams_lock;
-	struct ipu6_isys_stream streams[IPU6_ISYS_MAX_STREAMS];
+	struct isys_stream streams[IPU6_ISYS_MAX_STREAMS];
 	int streams_ref_count[IPU6_ISYS_MAX_STREAMS];
 	void *fwcom;
 	u32 phy_termcal_val;
@@ -175,7 +175,7 @@ struct isys_fw_msgs {
 	dma_addr_t dma_addr;
 };
 
-struct isys_fw_msgs *ipu6_get_fw_msg_buf(struct ipu6_isys_stream *stream);
+struct isys_fw_msgs *ipu6_get_fw_msg_buf(struct isys_stream *stream);
 void ipu6_put_fw_msg_buf(struct ipu6_isys *isys, uintptr_t data);
 void ipu6_cleanup_fw_msg_bufs(struct ipu6_isys *isys);
 
drivers/media/pci/intel/ipu6/isys.h +24 -24

103 lines not on this page · raw message

Signature · 1 line
2.34.1
#8 lore raw

PATCH 5/7 media: intel/ipu6: Remove deprecated lock comment

In reply to Stanislaw Gruszka

pre_streamon_queued is no longer used, remove comment about it.

---
 drivers/media/pci/intel/ipu6/isys.h | 3 ---
 1 file changed, 3 deletions(-)
drivers/media/pci/intel/ipu6/isys.h +0 -3
index d5736ea2b036..ef61dca085a6 100644
@@ -27,9 +27,6 @@ struct isys_subdev {
 struct isys_queue {
 	struct vb2_queue vbq;
 	struct list_head node;
-	/*
-	 * @lock: serialise access to queued and pre_streamon_queued
-	 */
 	spinlock_t lock;
 	struct list_head active;
 	struct list_head incoming;
Signature · 1 line
2.34.1
#9 lore raw

PATCH 6/7 media: intel/ipu6: Introduce isys and dev accessors macros

In reply to Stanislaw Gruszka

Add macro and inline function to get access ipu6_isys and device back pointer. Using the helpers will allow to transformation to common structures.

---
Note: this gives checkpatch error about space around ":" , but the same error is already in include/media/v4l2-common.h and include/media/v4l2-subdev.h , so ignore it.

 drivers/media/pci/intel/ipu6/ipu6-isys.h | 27 ++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
drivers/media/pci/intel/ipu6/ipu6-isys.h +27 -0
index bf6008bfe539..c753656b04f4 100644
@@ -16,6 +16,7 @@
 #include <media/v4l2-device.h>
 
 #include "ipu6.h"
+#include "ipu6-bus.h"
 #include "ipu6-fw-isys.h"
 #include "ipu6-isys-csi2.h"
 #include "ipu6-isys-video.h"
@@ -165,6 +166,32 @@ struct ipu6_isys {
 	struct isys_iwake_watermark iwake_watermark;
 };
 
+static inline struct ipu6_isys *stream_to_isys6(struct isys_stream *stream)
+{
+	return stream->isys;
+}
+
+static inline struct ipu6_isys *video_to_isys6(struct ipu6_isys_video *video)
+{
+	return video->isys;
+}
+
+static inline struct ipu6_isys *csi2_to_isys6(struct ipu6_isys_csi2 *csi2)
+{
+	return csi2->isys;
+}
+
+#define to_isys(p)                                      \
+	_Generic(p,                                     \
+		struct isys_stream *: stream_to_isys6,  \
+		struct ipu6_isys_csi2 *: csi2_to_isys6, \
+		struct ipu6_isys_video *: video_to_isys6)(p)
+
+static inline struct device *isys_to_dev(struct ipu6_isys *isys)
+{
+	return &isys->adev->auxdev.dev;
+}
+
 struct isys_fw_msgs {
 	union {
 		u64 dummy;
Signature · 1 line
2.34.1
#10 lore raw

PATCH 7/7 media: intel/ipu6: Start using accessors to get dev pointer

In reply to Stanislaw Gruszka

Use below cocci script to convert the code to use to_isys() and isys_to_dev() accessors.

@@
expression X;
@@
(
- &X->isys->adev->auxdev.dev
+ isys_to_dev(to_isys(X))
|
- &isys->adev->auxdev.dev
+ isys_to_dev(isys)
)

Having accessors in place will make separation between common code and fw/hw specific easier.

---
 drivers/media/pci/intel/ipu6/ipu6-fw-isys.c   | 14 ++++-----
 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 16 +++++-----
 .../media/pci/intel/ipu6/ipu6-isys-dwc-phy.c  | 16 +++++-----
 .../media/pci/intel/ipu6/ipu6-isys-jsl-phy.c  |  8 ++---
 .../media/pci/intel/ipu6/ipu6-isys-mcd-phy.c  | 10 +++----
 .../media/pci/intel/ipu6/ipu6-isys-queue.c    | 24 +++++++--------
 .../media/pci/intel/ipu6/ipu6-isys-video.c    | 30 +++++++++----------
 drivers/media/pci/intel/ipu6/ipu6-isys.c      | 20 ++++++-------
 8 files changed, 69 insertions(+), 69 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-fw-isys.c +7 -7
index 62ed92ff1d30..38548578b7a6 100644
@@ -28,7 +28,7 @@ static const char send_msg_types[N_IPU6_FW_ISYS_SEND_TYPE][32] = {
 
 static int handle_proxy_response(struct ipu6_isys *isys, unsigned int req_id)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct ipu6_fw_isys_proxy_resp_info_abi *resp;
 	int ret;
 
@@ -53,7 +53,7 @@ int ipu6_fw_isys_send_proxy_token(struct ipu6_isys *isys,
 				  unsigned int offset, u32 value)
 {
 	struct ipu6_fw_com_context *ctx = isys->fwcom;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct ipu6_fw_proxy_send_queue_token *token;
 	unsigned int timeout = 1000;
 	int ret;
@@ -97,7 +97,7 @@ int ipu6_fw_isys_complex_cmd(struct ipu6_isys *isys,
 			     size_t size, u16 send_type)
 {
 	struct ipu6_fw_com_context *ctx = isys->fwcom;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct ipu6_fw_send_queue_token *token;
 
 	if (send_type >= N_IPU6_FW_ISYS_SEND_TYPE)
@@ -135,7 +135,7 @@ int ipu6_fw_isys_simple_cmd(struct ipu6_isys *isys,
 
 int ipu6_fw_isys_close(struct ipu6_isys *isys)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	int retry = IPU6_ISYS_CLOSE_RETRY;
 	unsigned long flags;
 	void *fwcom;
@@ -178,7 +178,7 @@ void ipu6_fw_isys_cleanup(struct ipu6_isys *isys)
 
 	ret = ipu6_fw_com_release(isys->fwcom, 1);
 	if (ret < 0)
-		dev_warn(&isys->adev->auxdev.dev,
+		dev_warn(isys_to_dev(isys),
 			 "Device busy, fw_com release failed.");
 	isys->fwcom = NULL;
 }
@@ -218,7 +218,7 @@ static int ipu6_isys_fwcom_cfg_init(struct ipu6_isys *isys,
 	unsigned int max_send_queues, max_sram_blocks, max_devq_size;
 	struct ipu6_fw_syscom_queue_config *input_queue_cfg;
 	struct ipu6_fw_syscom_queue_config *output_queue_cfg;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	int type_proxy = IPU6_FW_ISYS_QUEUE_TYPE_PROXY;
 	int type_dev = IPU6_FW_ISYS_QUEUE_TYPE_DEV;
 	int type_msg = IPU6_FW_ISYS_QUEUE_TYPE_MSG;
@@ -323,7 +323,7 @@ static int ipu6_isys_fwcom_cfg_init(struct ipu6_isys *isys,
 
 int ipu6_fw_isys_init(struct ipu6_isys *isys, unsigned int num_streams)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	int retry = IPU6_ISYS_OPEN_RETRY;
 	struct ipu6_fw_com_cfg fwcom = {
 		.cell_start = start_sp,
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +8 -8
index ddd19cde69be..575b90625c89 100644
@@ -86,7 +86,7 @@ s64 ipu6_isys_csi2_get_link_freq(struct ipu6_isys_csi2 *csi2)
 
 	src_pad = media_entity_remote_source_pad_unique(&csi2->asd.sd.entity);
 	if (IS_ERR(src_pad)) {
-		dev_err(&csi2->isys->adev->auxdev.dev,
+		dev_err(isys_to_dev(to_isys(csi2)),
 			"can't get source pad of %s (%ld)\n",
 			csi2->asd.sd.name, PTR_ERR(src_pad));
 		return PTR_ERR(src_pad);
@@ -160,7 +160,7 @@ static int
 ipu6_isys_csi2_calc_timing(struct ipu6_isys_csi2 *csi2,
 			   struct ipu6_isys_csi2_timing *timing, s32 accinv)
 {
-	struct device *dev = &csi2->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(csi2));
 	s64 link_freq;
 
 	link_freq = ipu6_isys_csi2_get_link_freq(csi2);
@@ -202,7 +202,7 @@ void ipu6_isys_register_errors(struct ipu6_isys_csi2 *csi2)
 
 void ipu6_isys_csi2_error(struct ipu6_isys_csi2 *csi2)
 {
-	struct device *dev = &csi2->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(csi2));
 	const struct ipu6_csi2_error *errors;
 	u32 status;
 	u32 i;
@@ -227,7 +227,7 @@ static int ipu6_isys_csi2_set_stream(struct v4l2_subdev *sd,
 	struct isys_subdev *asd = to_isys_subdev(sd);
 	struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(asd);
 	struct ipu6_isys *isys = csi2->isys;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct ipu6_isys_csi2_config cfg;
 	unsigned int nports;
 	int ret = 0;
@@ -518,7 +518,7 @@ int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2,
 			struct ipu6_isys *isys,
 			void __iomem *base, unsigned int index)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	int ret;
 
 	csi2->isys = isys;
@@ -559,7 +559,7 @@ int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2,
 void ipu6_isys_csi2_sof_event_by_stream(struct isys_stream *stream)
 {
 	struct video_device *vdev = stream->asd->sd.devnode;
-	struct device *dev = &stream->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(stream));
 	struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(stream->asd);
 	struct v4l2_event ev = {
 		.type = V4L2_EVENT_FRAME_SYNC,
@@ -574,7 +574,7 @@ void ipu6_isys_csi2_sof_event_by_stream(struct isys_stream *stream)
 
 void ipu6_isys_csi2_eof_event_by_stream(struct isys_stream *stream)
 {
-	struct device *dev = &stream->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(stream));
 	struct ipu6_isys_csi2 *csi2 = to_ipu6_isys_csi2(stream->asd);
 	u32 frame_sequence = atomic_read(&stream->sequence);
 
@@ -588,7 +588,7 @@ int ipu6_isys_csi2_get_remote_desc(u32 source_stream,
 				   struct v4l2_mbus_frame_desc_entry *entry)
 {
 	struct v4l2_mbus_frame_desc_entry *desc_entry = NULL;
-	struct device *dev = &csi2->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(csi2));
 	struct v4l2_mbus_frame_desc desc;
 	struct v4l2_subdev *source;
 	struct media_pad *pad;
drivers/media/pci/intel/ipu6/ipu6-isys-dwc-phy.c +8 -8
index db2874843453..78c6db71d51d 100644
@@ -63,7 +63,7 @@ enum phy_fsm_state {
 static void dwc_dphy_write(struct ipu6_isys *isys, u32 phy_id, u32 addr,
 			   u32 data)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	void __iomem *base = isys_base + IPU6_DWC_DPHY_BASE(phy_id);
 
@@ -74,7 +74,7 @@ static void dwc_dphy_write(struct ipu6_isys *isys, u32 phy_id, u32 addr,
 
 static u32 dwc_dphy_read(struct ipu6_isys *isys, u32 phy_id, u32 addr)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	void __iomem *base = isys_base + IPU6_DWC_DPHY_BASE(phy_id);
 	u32 data;
@@ -112,7 +112,7 @@ static u32 __maybe_unused dwc_dphy_read_mask(struct ipu6_isys *isys, u32 phy_id,
 static int dwc_dphy_ifc_read(struct ipu6_isys *isys, u32 phy_id, u32 addr,
 			     u32 *val)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	void __iomem *base = isys_base + IPU6_DWC_DPHY_BASE(phy_id);
 	void __iomem *reg;
@@ -139,7 +139,7 @@ static int dwc_dphy_ifc_read(struct ipu6_isys *isys, u32 phy_id, u32 addr,
 static int dwc_dphy_ifc_write(struct ipu6_isys *isys, u32 phy_id, u32 addr,
 			      u32 data)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	void __iomem *base = isys_base + IPU6_DWC_DPHY_BASE(phy_id);
 	void __iomem *reg;
@@ -189,7 +189,7 @@ static u32 dwc_dphy_ifc_read_mask(struct ipu6_isys *isys, u32 phy_id, u32 addr,
 
 static int dwc_dphy_pwr_up(struct ipu6_isys *isys, u32 phy_id)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	u32 fsm_state;
 	int ret;
 
@@ -401,7 +401,7 @@ static void ipu6_isys_dwc_phy_aggr_setup(struct ipu6_isys *isys, u32 master,
 #define PHY_E	4
 static int ipu6_isys_dwc_phy_powerup_ack(struct ipu6_isys *isys, u32 phy_id)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	u32 rescal_done;
 	int ret;
 
@@ -434,7 +434,7 @@ static int ipu6_isys_dwc_phy_powerup_ack(struct ipu6_isys *isys, u32 phy_id)
 
 static void ipu6_isys_dwc_phy_reset(struct ipu6_isys *isys, u32 phy_id)
 {
-	dev_dbg(&isys->adev->auxdev.dev, "Reset phy %u", phy_id);
+	dev_dbg(isys_to_dev(isys), "Reset phy %u", phy_id);
 
 	dwc_dphy_write(isys, phy_id, IPU6_DWC_DPHY_SHUTDOWNZ, 0);
 	dwc_dphy_write(isys, phy_id, IPU6_DWC_DPHY_RSTZ, 0);
@@ -449,7 +449,7 @@ int ipu6_isys_dwc_phy_set_power(struct ipu6_isys *isys,
 				const struct ipu6_isys_csi2_timing *timing,
 				bool on)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	u32 phy_id, primary, secondary;
 	u32 nlanes, port, mbps;
drivers/media/pci/intel/ipu6/ipu6-isys-jsl-phy.c +4 -4
index c804291cfae9..73ac24c6853d 100644
@@ -63,7 +63,7 @@ static void ipu6_isys_csi2_phy_config_by_port(struct ipu6_isys *isys,
 					      unsigned int port,
 					      unsigned int nlanes)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *base = isys->adev->isp->base;
 	unsigned int bbnum;
 	u32 val, reg, i;
@@ -139,7 +139,7 @@ static void ipu6_isys_csi2_rx_control(struct ipu6_isys *isys)
 static int ipu6_isys_csi2_set_port_cfg(struct ipu6_isys *isys,
 				       unsigned int port, unsigned int nlanes)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	unsigned int sip = port / 2;
 	unsigned int index;
 
@@ -171,7 +171,7 @@ ipu6_isys_csi2_set_timing(struct ipu6_isys *isys,
 			  const struct ipu6_isys_csi2_timing *timing,
 			  unsigned int port, unsigned int nlanes)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *reg;
 	u32 port_base;
 	u32 i;
@@ -207,7 +207,7 @@ int ipu6_isys_jsl_phy_set_power(struct ipu6_isys *isys,
 				const struct ipu6_isys_csi2_timing *timing,
 				bool on)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	int ret = 0;
 	u32 nlanes;
drivers/media/pci/intel/ipu6/ipu6-isys-mcd-phy.c +5 -5
index 71aa5009512a..95e40f43aeb4 100644
@@ -502,7 +502,7 @@ static const struct phy_reg **config_regs[3] = {
 
 static int ipu6_isys_mcd_phy_powerup_ack(struct ipu6_isys *isys, u8 id)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	u32 val;
 	int ret;
@@ -522,7 +522,7 @@ static int ipu6_isys_mcd_phy_powerup_ack(struct ipu6_isys *isys, u8 id)
 
 static int ipu6_isys_mcd_phy_powerdown_ack(struct ipu6_isys *isys, u8 id)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	u32 val;
 	int ret;
@@ -553,7 +553,7 @@ static void ipu6_isys_mcd_phy_reset(struct ipu6_isys *isys, u8 id, bool assert)
 
 static int ipu6_isys_mcd_phy_ready(struct ipu6_isys *isys, u8 id)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	u32 val;
 	int ret;
@@ -621,7 +621,7 @@ static int ipu6_isys_driver_port_to_phy_port(struct ipu6_isys_csi2_config *cfg)
 
 static int ipu6_isys_mcd_phy_config(struct ipu6_isys *isys)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct ipu6_bus_device *adev = isys->adev;
 	const struct phy_reg **phy_config_regs;
 	struct ipu6_device *isp = adev->isp;
@@ -667,7 +667,7 @@ int ipu6_isys_mcd_phy_set_power(struct ipu6_isys *isys,
 				const struct ipu6_isys_csi2_timing *timing,
 				bool on)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	void __iomem *isys_base = isys->pdata->base;
 	u8 port, phy_id;
 	refcount_t *ref;
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +12 -12
index d9457176f32f..1e1ae13d5e07 100644
@@ -59,7 +59,7 @@ static int ipu6_isys_queue_setup(struct vb2_queue *q, unsigned int *num_buffers,
 {
 	struct isys_queue *aq = vb2_queue_to_isys_queue(q);
 	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	u32 size = ipu6_isys_get_data_size(av);
 
 	/* num_planes == 0: we're being called through VIDIOC_REQBUFS */
@@ -80,7 +80,7 @@ static int ipu6_isys_buf_prepare(struct vb2_buffer *vb)
 {
 	struct isys_queue *aq = vb2_queue_to_isys_queue(vb->vb2_queue);
 	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	u32 bytesperline = ipu6_isys_get_bytes_per_line(av);
 	u32 height = ipu6_isys_get_frame_height(av);
 	u32 size = ipu6_isys_get_data_size(av);
@@ -123,7 +123,7 @@ void ipu6_isys_buffer_list_queue(struct isys_buffer_list *bl,
 		struct device *dev;
 
 		av = ipu6_isys_queue_to_video(aq);
-		dev = &av->isys->adev->auxdev.dev;
+		dev = isys_to_dev(to_isys(av));
 		spin_lock_irqsave(&aq->lock, flags);
 		list_del(&ib->head);
 		if (op_flags & ISYS_BUFFER_LIST_ACTIVE)
@@ -155,7 +155,7 @@ void ipu6_isys_buffer_list_queue(struct isys_buffer_list *bl,
  */
 static void flush_firmware_streamon_fail(struct isys_stream *stream)
 {
-	struct device *dev = &stream->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(stream));
 	struct isys_queue *aq;
 	unsigned long flags;
 
@@ -197,7 +197,7 @@ static void flush_firmware_streamon_fail(struct isys_stream *stream)
 static int buffer_list_get(struct isys_stream *stream,
 			   struct isys_buffer_list *bl)
 {
-	struct device *dev = &stream->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(stream));
 	struct isys_queue *aq;
 	unsigned long flags;
 	unsigned long buf_flag = ISYS_BUFFER_LIST_INCOMING;
@@ -291,7 +291,7 @@ static int ipu6_isys_stream_start(struct ipu6_isys_video *av,
 				  struct isys_buffer_list *bl, bool error)
 {
 	struct isys_stream *stream = av->stream;
-	struct device *dev = &stream->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(stream));
 	struct isys_buffer_list __bl;
 	int ret;
 
@@ -353,7 +353,7 @@ static void buf_queue(struct vb2_buffer *vb)
 	struct isys_video_buffer *ivb =
 		vb2_buffer_to_isys_video_buffer(vvb);
 	struct isys_buffer *ib = &ivb->ib;
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct media_pipeline *media_pipe =
 		media_entity_pipeline(&av->vdev.entity);
 	struct ipu6_fw_isys_frame_buff_set_abi *buf = NULL;
@@ -436,7 +436,7 @@ static int ipu6_isys_link_fmt_validate(struct isys_queue *aq)
 {
 	struct v4l2_mbus_framefmt format;
 	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct media_pad *remote_pad =
 		media_pad_remote_pad_first(av->vdev.entity.pads);
 	struct v4l2_subdev *sd;
@@ -539,7 +539,7 @@ static int start_streaming(struct vb2_queue *q, unsigned int count)
 {
 	struct isys_queue *aq = vb2_queue_to_isys_queue(q);
 	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	const struct isys_pixelformat *pfmt =
 		ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0);
 	struct isys_buffer_list __bl, *bl = NULL;
@@ -654,7 +654,7 @@ static unsigned int
 get_sof_sequence_by_timestamp(struct isys_stream *stream, u64 time)
 {
 	struct ipu6_isys *isys = stream->isys;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	unsigned int i;
 
 	/*
@@ -700,7 +700,7 @@ ipu6_isys_buf_calc_sequence_time(struct isys_buffer *ib, u64 time)
 	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
 	struct isys_queue *aq = vb2_queue_to_isys_queue(vb->vb2_queue);
 	struct ipu6_isys_video *av = ipu6_isys_queue_to_video(aq);
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct isys_stream *stream = av->stream;
 	u64 ns;
 	u32 sequence;
@@ -739,7 +739,7 @@ ipu6_stream_buf_ready(struct isys_stream *stream, u8 pin_id, u32 pin_addr,
 {
 	struct isys_queue *aq = stream->output_pins[pin_id].aq;
 	struct ipu6_isys *isys = stream->isys;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct isys_buffer *ib;
 	struct vb2_buffer *vb;
 	unsigned long flags;
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +15 -15
index 71429e83d8aa..1bc55aa0e2d0 100644
@@ -366,7 +366,7 @@ static int link_validate(struct media_link *link)
 {
 	struct ipu6_isys_video *av =
 		container_of(link->sink, struct ipu6_isys_video, pad);
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct v4l2_subdev_state *s_state;
 	struct v4l2_subdev *s_sd;
 	struct v4l2_mbus_framefmt *s_fmt;
@@ -450,7 +450,7 @@ static int ipu6_isys_fw_pin_cfg(struct ipu6_isys_video *av,
 		ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0);
 	struct v4l2_rect v4l2_crop;
 	struct ipu6_isys *isys = av->isys;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	int input_pins = cfg->nof_input_pins++;
 	int output_pins;
 	u32 src_stream;
@@ -521,7 +521,7 @@ static int start_stream_firmware(struct ipu6_isys_video *av,
 	struct ipu6_fw_isys_stream_cfg_data_abi *stream_cfg;
 	struct ipu6_fw_isys_frame_buff_set_abi *buf = NULL;
 	struct isys_stream *stream = av->stream;
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct isys_fw_msgs *msg = NULL;
 	struct isys_queue *aq;
 	int ret, retout, tout;
@@ -658,7 +658,7 @@ static int start_stream_firmware(struct ipu6_isys_video *av,
 
 static void stop_streaming_firmware(struct ipu6_isys_video *av)
 {
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct isys_stream *stream = av->stream;
 	int ret, tout;
 
@@ -685,7 +685,7 @@ static void stop_streaming_firmware(struct ipu6_isys_video *av)
 static void close_streaming_firmware(struct ipu6_isys_video *av)
 {
 	struct isys_stream *stream = av->stream;
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	int ret, tout;
 
 	reinit_completion(&stream->stream_close_completion);
@@ -733,7 +733,7 @@ int ipu6_isys_video_prepare_stream(struct ipu6_isys_video *av,
 	csi2->receiver_errors = 0;
 	stream->source_entity = source_entity;
 
-	dev_dbg(&av->isys->adev->auxdev.dev,
+	dev_dbg(isys_to_dev(to_isys(av)),
 		"prepare stream: external entity %s\n",
 		stream->source_entity->name);
 
@@ -746,7 +746,7 @@ void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av,
 	struct ipu6_isys *isys = av->isys;
 	struct ipu6_isys_csi2 *csi2 = NULL;
 	struct isys_iwake_watermark *iwake_watermark = &isys->iwake_watermark;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct v4l2_mbus_framefmt format;
 	struct v4l2_subdev *esd;
 	struct v4l2_control hb = { .id = V4L2_CID_HBLANK, .value = 0 };
@@ -852,7 +852,7 @@ void ipu6_isys_put_stream(struct isys_stream *stream)
 		return;
 	}
 
-	dev = &stream->isys->adev->auxdev.dev;
+	dev = isys_to_dev(to_isys(stream));
 
 	spin_lock_irqsave(&stream->isys->streams_lock, flags);
 	for (i = 0; i < IPU6_ISYS_MAX_STREAMS; i++) {
@@ -916,7 +916,7 @@ ipu6_isys_query_stream_by_handle(struct ipu6_isys *isys, u8 stream_handle)
 		return NULL;
 
 	if (stream_handle >= IPU6_ISYS_MAX_STREAMS) {
-		dev_err(&isys->adev->auxdev.dev,
+		dev_err(isys_to_dev(isys),
 			"stream_handle %d is invalid\n", stream_handle);
 		return NULL;
 	}
@@ -942,7 +942,7 @@ ipu6_isys_query_stream_by_source(struct ipu6_isys *isys, int source, u8 vc)
 		return NULL;
 
 	if (source < 0) {
-		dev_err(&isys->adev->auxdev.dev,
+		dev_err(isys_to_dev(isys),
 			"query stream with invalid port number\n");
 		return NULL;
 	}
@@ -987,7 +987,7 @@ int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state,
 	struct v4l2_subdev_krouting *routing;
 	struct isys_stream *stream = av->stream;
 	struct v4l2_subdev_state *subdev_state;
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct v4l2_subdev *sd;
 	struct media_pad *r_pad;
 	u32 sink_pad, sink_stream;
@@ -1151,7 +1151,7 @@ void ipu6_isys_fw_close(struct ipu6_isys *isys)
 		ipu6_fw_isys_close(isys);
 		if (isys->fwcom) {
 			isys->need_reset = true;
-			dev_warn(&isys->adev->auxdev.dev,
+			dev_warn(isys_to_dev(isys),
 				 "failed to close fw isys\n");
 		}
 	}
@@ -1159,9 +1159,9 @@ void ipu6_isys_fw_close(struct ipu6_isys *isys)
 	mutex_unlock(&isys->mutex);
 
 	if (isys->need_reset)
-		pm_runtime_put_sync(&isys->adev->auxdev.dev);
+		pm_runtime_put_sync(isys_to_dev(isys));
 	else
-		pm_runtime_put(&isys->adev->auxdev.dev);
+		pm_runtime_put(isys_to_dev(isys));
 }
 
 int ipu6_isys_setup_video(struct ipu6_isys_video *av,
@@ -1169,7 +1169,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av,
 {
 	const struct isys_pixelformat *pfmt =
 		ipu6_isys_get_isys_format(ipu6_isys_get_format(av), 0);
-	struct device *dev = &av->isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(to_isys(av));
 	struct v4l2_mbus_frame_desc_entry entry;
 	struct v4l2_subdev_route *route = NULL;
 	struct v4l2_subdev_route *r;
drivers/media/pci/intel/ipu6/ipu6-isys.c +10 -10
index 8ac0cc7574de..827ae7b9bfc8 100644
@@ -107,7 +107,7 @@ isys_complete_ext_device_registration(struct ipu6_isys *isys,
 				      struct v4l2_subdev *sd,
 				      struct ipu6_isys_csi2_config *csi2)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	unsigned int i;
 	int ret;
 
@@ -198,7 +198,7 @@ static int isys_csi2_create_media_links(struct ipu6_isys *isys)
 {
 	const struct ipu6_isys_internal_csi2_pdata *csi2_pdata =
 		&isys->pdata->ipdata->csi2;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	unsigned int i, j;
 	int ret;
 
@@ -418,7 +418,7 @@ static void get_lut_ltrdid(struct ipu6_isys *isys, struct ltr_did *pltr_did)
 
 static int set_iwake_register(struct ipu6_isys *isys, u32 index, u32 value)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	u32 req_id = index;
 	u32 offset = 0;
 	int ret;
@@ -448,7 +448,7 @@ static int set_iwake_register(struct ipu6_isys *isys, u32 index, u32 value)
 static void set_iwake_ltrdid(struct ipu6_isys *isys, u16 ltr, u16 did,
 			     enum ltr_did_type use)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	u16 ltr_val, ltr_scale = LTR_SCALE_1024NS;
 	u16 did_val, did_scale = DID_SCALE_1US;
 	struct ipu6_device *isp = isys->adev->isp;
@@ -532,7 +532,7 @@ void update_watermark_setting(struct ipu6_isys *isys)
 {
 	struct isys_iwake_watermark *iwake_watermark = &isys->iwake_watermark;
 	u32 iwake_threshold, iwake_critical_threshold, page_num;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	u32 calc_fill_time_us = 0, ltr = 0, did = 0;
 	struct video_stream_watermark *p_watermark;
 	enum ltr_did_type ltr_did_type;
@@ -680,18 +680,18 @@ static int isys_notifier_bound(struct v4l2_async_notifier *notifier,
 	int ret;
 
 	if (s_asd->csi2.port >= isys->pdata->ipdata->csi2.nports) {
-		dev_err(&isys->adev->auxdev.dev, "invalid csi2 port %u\n",
+		dev_err(isys_to_dev(isys), "invalid csi2 port %u\n",
 			s_asd->csi2.port);
 		return -EINVAL;
 	}
 
 	ret = ipu_bridge_instantiate_vcm(sd->dev);
 	if (ret) {
-		dev_err(&isys->adev->auxdev.dev, "instantiate vcm failed\n");
+		dev_err(isys_to_dev(isys), "instantiate vcm failed\n");
 		return ret;
 	}
 
-	dev_dbg(&isys->adev->auxdev.dev, "bind %s nlanes is %d port is %d\n",
+	dev_dbg(isys_to_dev(isys), "bind %s nlanes is %d port is %d\n",
 		sd->name, s_asd->csi2.nlanes, s_asd->csi2.port);
 	ret = isys_complete_ext_device_registration(isys, sd, &s_asd->csi2);
 	if (ret)
@@ -782,7 +782,7 @@ static void isys_notifier_cleanup(struct ipu6_isys *isys)
 
 static int isys_register_devices(struct ipu6_isys *isys)
 {
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct pci_dev *pdev = isys->adev->isp->pdev;
 	int ret;
 
@@ -985,7 +985,7 @@ static int alloc_fw_msg_bufs(struct ipu6_isys *isys, int amount)
 struct isys_fw_msgs *ipu6_get_fw_msg_buf(struct isys_stream *stream)
 {
 	struct ipu6_isys *isys = stream->isys;
-	struct device *dev = &isys->adev->auxdev.dev;
+	struct device *dev = isys_to_dev(isys);
 	struct isys_fw_msgs *msg;
 	unsigned long flags;
 	int ret;
Signature · 1 line
2.34.1
maintainer
#11 lore raw
In reply to Stanislaw Gruszka

Hi Stanislaw,

Quoted 9 lines · Stanislaw Gruszka

Move and rename more structures to isys.h. Add accessors to make further transformation easier.

This is on top of:
https://git.linuxtv.org/sailus/media_tree.git/log/?h=devel
plus:
https://lore.kernel.org/linux-media/[email protected]/
https://lore.kernel.org/linux-media/[email protected]/

Quoted 8 lines

Stanislaw Gruszka (7):
media: intel/ipu6: Use isd name in isys.h
media: intel/ipu6: Remove line_align
media: intel/ipu6: Move common structures definitions to isys.h
media: intel/ipu6: Rename common structures
media: intel/ipu6: Remove deprecated lock comment
media: intel/ipu6: Introduce isys and dev accessors macros
media: intel/ipu6: Start using accessors to get dev pointer

My main comment to the set is naming. Can we do so that we keep the current scheme (ipu or ipu-isys prefix, with or without IPU generation number) and then reconsider this question when the result (hopefully including IPU 7 ISYS support) is in upstream?

The rest seems entirely reasonable to me -- but see my other comments, too.

Signature · 3 lines
Kind regards,

Sakari Ailus
#12 lore raw
Quoted 21 lines · Sakari Ailus

Hi Stanislaw,

Quoted 9 lines · Stanislaw Gruszka

Move and rename more structures to isys.h. Add accessors to make further transformation easier.

This is on top of:
https://git.linuxtv.org/sailus/media_tree.git/log/?h=devel
plus:
https://lore.kernel.org/linux-media/[email protected]/
https://lore.kernel.org/linux-media/[email protected]/

Quoted 8 lines

Stanislaw Gruszka (7):
media: intel/ipu6: Use isd name in isys.h
media: intel/ipu6: Remove line_align
media: intel/ipu6: Move common structures definitions to isys.h
media: intel/ipu6: Rename common structures
media: intel/ipu6: Remove deprecated lock comment
media: intel/ipu6: Introduce isys and dev accessors macros
media: intel/ipu6: Start using accessors to get dev pointer

Quoted 4 lines

My main comment to the set is naming. Can we do so that we keep the current scheme (ipu or ipu-isys prefix, with or without IPU generation number) and then reconsider this question when the result (hopefully including IPU 7 ISYS support) is in upstream?

Ok, I'll use ipu_isys_ prefix for functions, structures and some macros. However for some macros I think it would make sense to skip ipu prefix to make the names shorter.

Regards
Stanislaw

Quoted 6 lines

The rest seems entirely reasonable to me -- but see my other comments, too.

Signature · 3 lines
Kind regards,

Sakari Ailus
maintainer
#13 lore raw
Quoted 22 lines · Stanislaw Gruszka
Quoted 21 lines · Sakari Ailus

Hi Stanislaw,

Quoted 17 lines · Stanislaw Gruszka

Move and rename more structures to isys.h. Add accessors to make further transformation easier.

This is on top of:
https://git.linuxtv.org/sailus/media_tree.git/log/?h=devel
plus:
https://lore.kernel.org/linux-media/[email protected]/
https://lore.kernel.org/linux-media/[email protected]/

Stanislaw Gruszka (7):
media: intel/ipu6: Use isd name in isys.h
media: intel/ipu6: Remove line_align
media: intel/ipu6: Move common structures definitions to isys.h
media: intel/ipu6: Rename common structures
media: intel/ipu6: Remove deprecated lock comment
media: intel/ipu6: Introduce isys and dev accessors macros
media: intel/ipu6: Start using accessors to get dev pointer

Quoted 8 lines
Quoted 4 lines

My main comment to the set is naming. Can we do so that we keep the current scheme (ipu or ipu-isys prefix, with or without IPU generation number) and then reconsider this question when the result (hopefully including IPU 7 ISYS support) is in upstream?

Ok, I'll use ipu_isys_ prefix for functions, structures and some macros. However for some macros I think it would make sense to skip ipu prefix to make the names shorter.

I'd keep it also in macro names, but not necessarily twice as in some cases currently.

Signature · 1 line
Sakari Ailus