On Thu Dec 18 15:09:18 2025 +0200, Sakari Ailus wrote:
> Re-purpose the unused stream_lock in struct ipu6_isys to serialise access
> to streams_by_handle (struct ipu6_isys) and streams_by_vc (struct
> ipu6_isys_csi2). Switch to scoped_guard() while at it.
>
> Signed-off-by: Sakari Ailus <[email protected]>
> Reviewed-by: Antti Laakso <[email protected]>
Patch committed.
Thanks,
Sakari Ailus
drivers/media/pci/intel/ipu6/ipu6-fw-isys.c | 24 ++++++++++++++++--------
drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 7 +++----
drivers/media/pci/intel/ipu6/ipu7-fw-isys.c | 8 +++++++-
3 files changed, 26 insertions(+), 13 deletions(-)
---
diff --git a/drivers/media/pci/intel/ipu6/ipu6-fw-isys.c
b/drivers/media/pci/intel/ipu6/ipu6-fw-isys.c
index 5e1b57ef650f..0214d7105fbe 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-fw-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-fw-isys.c
@@ -556,6 +556,8 @@ int ipu6_isys_isr_one(struct ipu6_bus_device *adev)
"FW error resp error %d, details %d\n",
resp->error_info.error, resp->error_info.error_details);
+ guard(spinlock_irqsave)(&isys->streams_lock);
+
if (resp->stream_handle >= IPU6_ISYS_MAX_STREAMS) {
dev_err(&adev->auxdev.dev, "bad stream handle %u\n",
resp->stream_handle);
@@ -670,17 +672,23 @@ static void ipu6_isys_csi2_isr(struct ipu6_isys_csi2
*csi2)
writel(status, csi2->base + CSI_PORT_REG_BASE_IRQ_CSI_SYNC +
CSI_PORT_REG_BASE_IRQ_CLEAR_OFFSET);
- for (i = 0; i < NR_OF_CSI2_VC; i++) {
- if (status & IPU_CSI_RX_IRQ_FS_VC(i)) {
- stream = csi2->streams_by_vc[i];
- if (stream)
+ scoped_guard(spinlock, &csi2->isys->streams_lock) {
+ for (i = 0; i < NR_OF_CSI2_VC; i++) {
+ if (status & IPU_CSI_RX_IRQ_FS_VC(i)) {
+ stream = csi2->streams_by_vc[i];
+ if (!stream)
+ continue;
+
ipu6_isys_csi2_sof_event_by_stream(stream);
- }
+ }
+
+ if (status & IPU_CSI_RX_IRQ_FE_VC(i)) {
+ stream = csi2->streams_by_vc[i];
+ if (!stream)
+ continue;
- if (status & IPU_CSI_RX_IRQ_FE_VC(i)) {
- stream = csi2->streams_by_vc[i];
- if (stream)
ipu6_isys_csi2_eof_event_by_stream(stream);
+ }
}
}
}
diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
index cea37442866e..feb0ad261252 100644
--- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
+++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c
@@ -628,7 +628,7 @@ void ipu6_isys_close_stream_firmware(struct
ipu6_isys_stream *stream)
else
dev_dbg(dev, "close stream: complete\n");
- scoped_guard(spinlock_irqsave, &stream->isys->power_lock) {
+ scoped_guard(spinlock_irqsave, &stream->isys->streams_lock) {
stream->isys->streams_by_handle[stream->stream_handle] = NULL;
csi2->streams_by_vc[stream->vc] = NULL;
}
@@ -695,9 +695,8 @@ ipu6_isys_alloc_stream_firmware(struct ipu6_isys_csi2 *csi2,
stream->asd = &csi2->asd;
stream->vc = vc;
- scoped_guard(spinlock_irqsave, &stream->isys->power_lock) {
- stream->isys->streams_by_handle[stream->stream_handle] =
- stream;
+ scoped_guard(spinlock_irqsave, &stream->isys->streams_lock) {
+ stream->isys->streams_by_handle[stream->stream_handle] = stream;
csi2->streams_by_vc[stream->vc] = stream;
}
diff --git a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
index 1cfd7b8ee2b3..50219b210ae9 100644
--- a/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
+++ b/drivers/media/pci/intel/ipu6/ipu7-fw-isys.c
@@ -549,6 +549,7 @@ static int ipu7_isys_isr_one(struct ipu6_bus_device *adev)
struct ipu7_fw_isys_msg_err err_info;
struct isys_fw_msgs *isys_fw_msg;
struct ipu7_insys_resp *resp;
+ unsigned long flags;
u64 ts;
if (!isys->fwctx)
@@ -596,9 +597,11 @@ static int ipu7_isys_isr_one(struct ipu6_bus_device *adev)
if (resp->stream_id >= IPU7_ISYS_MAX_STREAMS) {
dev_err(dev, "bad stream handle %u\n",
resp->stream_id);
- goto leave;
+ goto leave_nounlock;
}
+ spin_lock_irqsave(&isys->streams_lock, flags);
+
stream = resp->stream_id < IPU6_ISYS_MAX_STREAMS ?
isys->streams_by_handle[resp->stream_id] : NULL;
if (!stream) {
@@ -681,6 +684,9 @@ static int ipu7_isys_isr_one(struct ipu6_bus_device *adev)
}
leave:
+ spin_unlock_irqrestore(&isys->streams_lock, flags);
+
+leave_nounlock:
ipu7_fw_isys_put_resp(isys);
return 0;
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
