From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/media/platform/rockchip/cif/dev.c | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/cif/dev.c b/kernel/drivers/media/platform/rockchip/cif/dev.c
index ca18756..260fb83 100644
--- a/kernel/drivers/media/platform/rockchip/cif/dev.c
+++ b/kernel/drivers/media/platform/rockchip/cif/dev.c
@@ -20,7 +20,6 @@
#include <media/videobuf2-dma-contig.h>
#include <media/v4l2-fwnode.h>
#include <linux/iommu.h>
-#include <dt-bindings/soc/rockchip-system-status.h>
#include <soc/rockchip/rockchip-system-status.h>
#include <linux/io.h>
#include <linux/mfd/syscon.h>
@@ -644,12 +643,16 @@
}
}
if (index < CIF_REG_INDEX_MAX) {
- if (index == CIF_REG_DVP_CTRL || reg->offset != 0x0)
+ if (index == CIF_REG_DVP_CTRL || reg->offset != 0x0) {
write_cif_reg(base, reg->offset + csi_offset, val);
- else
+ v4l2_dbg(4, rkcif_debug, &dev->v4l2_dev,
+ "write reg[0x%x]:0x%x!!!\n",
+ reg->offset + csi_offset, val);
+ } else {
v4l2_dbg(1, rkcif_debug, &dev->v4l2_dev,
"write reg[%d]:0x%x failed, maybe useless!!!\n",
index, val);
+ }
}
}
@@ -681,6 +684,9 @@
reg_val = read_cif_reg(base, reg->offset + csi_offset);
reg_val |= val;
write_cif_reg(base, reg->offset + csi_offset, reg_val);
+ v4l2_dbg(4, rkcif_debug, &dev->v4l2_dev,
+ "write or reg[0x%x]:0x%x!!!\n",
+ reg->offset + csi_offset, val);
} else {
v4l2_dbg(1, rkcif_debug, &dev->v4l2_dev,
"write reg[%d]:0x%x with OR failed, maybe useless!!!\n",
@@ -717,6 +723,9 @@
reg_val = read_cif_reg(base, reg->offset + csi_offset);
reg_val &= val;
write_cif_reg(base, reg->offset + csi_offset, reg_val);
+ v4l2_dbg(4, rkcif_debug, &dev->v4l2_dev,
+ "write and reg[0x%x]:0x%x!!!\n",
+ reg->offset + csi_offset, val);
} else {
v4l2_dbg(1, rkcif_debug, &dev->v4l2_dev,
"write reg[%d]:0x%x with OR failed, maybe useless!!!\n",
@@ -1124,6 +1133,7 @@
cif_dev->reset_watchdog_timer.is_triggered = false;
cif_dev->reset_watchdog_timer.is_running = false;
cif_dev->err_state_work.last_timestamp = 0;
+ cif_dev->is_toisp_reset = false;
for (i = 0; i < cif_dev->num_channels; i++)
cif_dev->reset_watchdog_timer.last_buf_wakeup_cnt[i] = 0;
cif_dev->reset_watchdog_timer.run_cnt = 0;
@@ -1208,6 +1218,7 @@
cif_dev->is_start_hdr = true;
cif_dev->reset_watchdog_timer.is_triggered = false;
cif_dev->reset_watchdog_timer.is_running = false;
+ cif_dev->is_toisp_reset = false;
for (i = 0; i < cif_dev->num_channels; i++)
cif_dev->reset_watchdog_timer.last_buf_wakeup_cnt[i] = 0;
cif_dev->reset_watchdog_timer.run_cnt = 0;
@@ -1561,16 +1572,6 @@
if (!completion_done(&dev->cmpl_ntf))
complete(&dev->cmpl_ntf);
- if (dev->active_sensor &&
- (dev->active_sensor->mbus.type == V4L2_MBUS_CSI2_DPHY ||
- dev->active_sensor->mbus.type == V4L2_MBUS_CSI2_CPHY)) {
- ret = v4l2_subdev_call(dev->active_sensor->sd,
- core, ioctl,
- RKCIF_CMD_SET_CSI_IDX,
- &dev->csi_host_idx);
- if (ret)
- v4l2_err(&dev->v4l2_dev, "set csi idx %d fail\n", dev->csi_host_idx);
- }
v4l2_info(&dev->v4l2_dev, "Async subdev notifier completed\n");
return ret;
@@ -1908,6 +1909,32 @@
INIT_WORK(&dev->reset_work.work, rkcif_reset_work);
}
+void rkcif_set_sensor_stream(struct work_struct *work)
+{
+ struct rkcif_sensor_work *sensor_work = container_of(work,
+ struct rkcif_sensor_work,
+ work);
+ struct rkcif_device *cif_dev = container_of(sensor_work,
+ struct rkcif_device,
+ sensor_work);
+
+ v4l2_subdev_call(cif_dev->terminal_sensor.sd,
+ core, ioctl,
+ RKMODULE_SET_QUICK_STREAM,
+ &sensor_work->on);
+}
+
+static void rkcif_deal_err_intr(struct work_struct *work)
+{
+ struct delayed_work *dwork = to_delayed_work(work);
+ struct rkcif_device *cif_dev = container_of(dwork,
+ struct rkcif_device,
+ work_deal_err);
+
+ cif_dev->intr_mask |= CSI_BANDWIDTH_LACK_V1;
+ rkcif_write_register_or(cif_dev, CIF_REG_MIPI_LVDS_INTEN, CSI_BANDWIDTH_LACK_V1);
+}
+
int rkcif_plat_init(struct rkcif_device *cif_dev, struct device_node *node, int inf_id)
{
struct device *dev = cif_dev->dev;
@@ -1927,6 +1954,7 @@
atomic_set(&cif_dev->pipe.power_cnt, 0);
atomic_set(&cif_dev->pipe.stream_cnt, 0);
atomic_set(&cif_dev->power_cnt, 0);
+ atomic_set(&cif_dev->streamoff_cnt, 0);
cif_dev->is_start_hdr = false;
cif_dev->pipe.open = rkcif_pipeline_open;
cif_dev->pipe.close = rkcif_pipeline_close;
@@ -1940,10 +1968,15 @@
cif_dev->early_line = 0;
cif_dev->is_thunderboot = false;
cif_dev->rdbk_debug = 0;
+
+ cif_dev->resume_mode = 0;
+ memset(&cif_dev->channels[0].capture_info, 0, sizeof(cif_dev->channels[0].capture_info));
if (cif_dev->chip_id == CHIP_RV1126_CIF_LITE)
cif_dev->isr_hdl = rkcif_irq_lite_handler;
INIT_WORK(&cif_dev->err_state_work.work, rkcif_err_print_work);
+ INIT_WORK(&cif_dev->sensor_work.work, rkcif_set_sensor_stream);
+ INIT_DELAYED_WORK(&cif_dev->work_deal_err, rkcif_deal_err_intr);
if (cif_dev->chip_id < CHIP_RV1126_CIF) {
if (cif_dev->inf_id == RKCIF_MIPI_LVDS) {
@@ -1997,6 +2030,17 @@
cif_dev->csi_host_idx = of_alias_get_id(node, "rkcif_mipi_lvds");
if (cif_dev->csi_host_idx < 0 || cif_dev->csi_host_idx > 5)
cif_dev->csi_host_idx = 0;
+ if (cif_dev->hw_dev->is_rk3588s2) {
+ if (cif_dev->csi_host_idx == 0)
+ cif_dev->csi_host_idx = 2;
+ else if (cif_dev->csi_host_idx == 2)
+ cif_dev->csi_host_idx = 4;
+ else if (cif_dev->csi_host_idx == 3)
+ cif_dev->csi_host_idx = 5;
+ v4l2_info(&cif_dev->v4l2_dev, "rk3588s2 attach to mipi%d\n",
+ cif_dev->csi_host_idx);
+ }
+ cif_dev->csi_host_idx_def = cif_dev->csi_host_idx;
cif_dev->media_dev.dev = dev;
v4l2_dev = &cif_dev->v4l2_dev;
v4l2_dev->mdev = &cif_dev->media_dev;
@@ -2106,6 +2150,8 @@
struct resource r;
int ret;
+ cif_dev->is_thunderboot = false;
+ cif_dev->is_rtt_suspend = false;
/* Get reserved memory region from Device-tree */
np = of_parse_phandle(dev->of_node, "memory-region-thunderboot", 0);
if (!np) {
@@ -2121,7 +2167,14 @@
cif_dev->resmem_pa = r.start;
cif_dev->resmem_size = resource_size(&r);
- cif_dev->is_thunderboot = true;
+ cif_dev->resmem_addr = dma_map_single(dev, phys_to_virt(r.start),
+ sizeof(struct rkisp_thunderboot_resmem_head),
+ DMA_BIDIRECTIONAL);
+
+ if (device_property_read_bool(dev, "rtt-suspend"))
+ cif_dev->is_rtt_suspend = true;
+ if (IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP))
+ cif_dev->is_thunderboot = true;
dev_info(dev, "Allocated reserved memory, paddr: 0x%x, size 0x%x\n",
(u32)cif_dev->resmem_pa,
(u32)cif_dev->resmem_size);
@@ -2159,7 +2212,9 @@
if (sysfs_create_group(&pdev->dev.kobj, &dev_attr_grp))
return -ENODEV;
- rkcif_attach_hw(cif_dev);
+ ret = rkcif_attach_hw(cif_dev);
+ if (ret)
+ return ret;
rkcif_parse_dts(cif_dev);
@@ -2194,6 +2249,22 @@
sysfs_remove_group(&pdev->dev.kobj, &dev_attr_grp);
del_timer_sync(&cif_dev->reset_watchdog_timer.timer);
+ return 0;
+}
+
+static int __maybe_unused rkcif_sleep_suspend(struct device *dev)
+{
+ struct rkcif_device *cif_dev = dev_get_drvdata(dev);
+
+ rkcif_stream_suspend(cif_dev, RKCIF_RESUME_CIF);
+ return 0;
+}
+
+static int __maybe_unused rkcif_sleep_resume(struct device *dev)
+{
+ struct rkcif_device *cif_dev = dev_get_drvdata(dev);
+
+ rkcif_stream_resume(cif_dev, RKCIF_RESUME_CIF);
return 0;
}
@@ -2267,8 +2338,7 @@
#endif
static const struct dev_pm_ops rkcif_plat_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
- pm_runtime_force_resume)
+ SET_SYSTEM_SLEEP_PM_OPS(rkcif_sleep_suspend, rkcif_sleep_resume)
SET_RUNTIME_PM_OPS(rkcif_runtime_suspend, rkcif_runtime_resume, NULL)
};
--
Gitblit v1.6.2