update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/rockchip/cif/dev.c
..
..
@@ -20,7 +20,6 @@
20
20
 #include <media/videobuf2-dma-contig.h>
21
21
 #include <media/v4l2-fwnode.h>
22
22
 #include <linux/iommu.h>
23
-#include <dt-bindings/soc/rockchip-system-status.h>
24
23
 #include <soc/rockchip/rockchip-system-status.h>
25
24
 #include <linux/io.h>
26
25
 #include <linux/mfd/syscon.h>
..
..
@@ -1134,6 +1133,7 @@
1134
1133
 			cif_dev->reset_watchdog_timer.is_triggered = false;
1135
1134
 			cif_dev->reset_watchdog_timer.is_running = false;
1136
1135
 			cif_dev->err_state_work.last_timestamp = 0;
1136
+			cif_dev->is_toisp_reset = false;
1137
1137
 			for (i = 0; i < cif_dev->num_channels; i++)
1138
1138
 				cif_dev->reset_watchdog_timer.last_buf_wakeup_cnt[i] = 0;
1139
1139
 			cif_dev->reset_watchdog_timer.run_cnt = 0;
..
..
@@ -1218,6 +1218,7 @@
1218
1218
 				cif_dev->is_start_hdr = true;
1219
1219
 				cif_dev->reset_watchdog_timer.is_triggered = false;
1220
1220
 				cif_dev->reset_watchdog_timer.is_running = false;
1221
+				cif_dev->is_toisp_reset = false;
1221
1222
 				for (i = 0; i < cif_dev->num_channels; i++)
1222
1223
 					cif_dev->reset_watchdog_timer.last_buf_wakeup_cnt[i] = 0;
1223
1224
 				cif_dev->reset_watchdog_timer.run_cnt = 0;
..
..
@@ -1908,6 +1909,32 @@
1908
1909
 	INIT_WORK(&dev->reset_work.work, rkcif_reset_work);
1909
1910
 }
1910
1911
 
1912
+void rkcif_set_sensor_stream(struct work_struct *work)
1913
+{
1914
+	struct rkcif_sensor_work *sensor_work = container_of(work,
1915
+						struct rkcif_sensor_work,
1916
+						work);
1917
+	struct rkcif_device *cif_dev = container_of(sensor_work,
1918
+						    struct rkcif_device,
1919
+						    sensor_work);
1920
+
1921
+	v4l2_subdev_call(cif_dev->terminal_sensor.sd,
1922
+			core, ioctl,
1923
+			RKMODULE_SET_QUICK_STREAM,
1924
+			&sensor_work->on);
1925
+}
1926
+
1927
+static void rkcif_deal_err_intr(struct work_struct *work)
1928
+{
1929
+	struct delayed_work *dwork = to_delayed_work(work);
1930
+	struct rkcif_device *cif_dev = container_of(dwork,
1931
+						    struct rkcif_device,
1932
+						    work_deal_err);
1933
+
1934
+	cif_dev->intr_mask |= CSI_BANDWIDTH_LACK_V1;
1935
+	rkcif_write_register_or(cif_dev, CIF_REG_MIPI_LVDS_INTEN, CSI_BANDWIDTH_LACK_V1);
1936
+}
1937
+
1911
1938
 int rkcif_plat_init(struct rkcif_device *cif_dev, struct device_node *node, int inf_id)
1912
1939
 {
1913
1940
 	struct device *dev = cif_dev->dev;
..
..
@@ -1927,6 +1954,7 @@
1927
1954
 	atomic_set(&cif_dev->pipe.power_cnt, 0);
1928
1955
 	atomic_set(&cif_dev->pipe.stream_cnt, 0);
1929
1956
 	atomic_set(&cif_dev->power_cnt, 0);
1957
+	atomic_set(&cif_dev->streamoff_cnt, 0);
1930
1958
 	cif_dev->is_start_hdr = false;
1931
1959
 	cif_dev->pipe.open = rkcif_pipeline_open;
1932
1960
 	cif_dev->pipe.close = rkcif_pipeline_close;
..
..
@@ -1940,11 +1968,15 @@
1940
1968
 	cif_dev->early_line = 0;
1941
1969
 	cif_dev->is_thunderboot = false;
1942
1970
 	cif_dev->rdbk_debug = 0;
1971
+
1972
+	cif_dev->resume_mode = 0;
1943
1973
 	memset(&cif_dev->channels[0].capture_info, 0, sizeof(cif_dev->channels[0].capture_info));
1944
1974
 	if (cif_dev->chip_id == CHIP_RV1126_CIF_LITE)
1945
1975
 		cif_dev->isr_hdl = rkcif_irq_lite_handler;
1946
1976
 
1947
1977
 	INIT_WORK(&cif_dev->err_state_work.work, rkcif_err_print_work);
1978
+	INIT_WORK(&cif_dev->sensor_work.work, rkcif_set_sensor_stream);
1979
+	INIT_DELAYED_WORK(&cif_dev->work_deal_err, rkcif_deal_err_intr);
1948
1980
 
1949
1981
 	if (cif_dev->chip_id < CHIP_RV1126_CIF) {
1950
1982
 		if (cif_dev->inf_id == RKCIF_MIPI_LVDS) {
..
..
@@ -2118,6 +2150,8 @@
2118
2150
 	struct resource r;
2119
2151
 	int ret;
2120
2152
 
2153
+	cif_dev->is_thunderboot = false;
2154
+	cif_dev->is_rtt_suspend = false;
2121
2155
 	/* Get reserved memory region from Device-tree */
2122
2156
 	np = of_parse_phandle(dev->of_node, "memory-region-thunderboot", 0);
2123
2157
 	if (!np) {
..
..
@@ -2133,7 +2167,14 @@
2133
2167
 
2134
2168
 	cif_dev->resmem_pa = r.start;
2135
2169
 	cif_dev->resmem_size = resource_size(&r);
2136
-	cif_dev->is_thunderboot = true;
2170
+	cif_dev->resmem_addr = dma_map_single(dev, phys_to_virt(r.start),
2171
+					      sizeof(struct rkisp_thunderboot_resmem_head),
2172
+					      DMA_BIDIRECTIONAL);
2173
+
2174
+	if (device_property_read_bool(dev, "rtt-suspend"))
2175
+		cif_dev->is_rtt_suspend = true;
2176
+	if (IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP))
2177
+		cif_dev->is_thunderboot = true;
2137
2178
 	dev_info(dev, "Allocated reserved memory, paddr: 0x%x, size 0x%x\n",
2138
2179
 		 (u32)cif_dev->resmem_pa,
2139
2180
 		 (u32)cif_dev->resmem_size);
..
..
@@ -2211,6 +2252,22 @@
2211
2252
 	return 0;
2212
2253
 }
2213
2254
 
2255
+static int __maybe_unused rkcif_sleep_suspend(struct device *dev)
2256
+{
2257
+	struct rkcif_device *cif_dev = dev_get_drvdata(dev);
2258
+
2259
+	rkcif_stream_suspend(cif_dev, RKCIF_RESUME_CIF);
2260
+	return 0;
2261
+}
2262
+
2263
+static int __maybe_unused rkcif_sleep_resume(struct device *dev)
2264
+{
2265
+	struct rkcif_device *cif_dev = dev_get_drvdata(dev);
2266
+
2267
+	rkcif_stream_resume(cif_dev, RKCIF_RESUME_CIF);
2268
+	return 0;
2269
+}
2270
+
2214
2271
 static int __maybe_unused rkcif_runtime_suspend(struct device *dev)
2215
2272
 {
2216
2273
 	struct rkcif_device *cif_dev = dev_get_drvdata(dev);
..
..
@@ -2281,8 +2338,7 @@
2281
2338
 #endif
2282
2339
 
2283
2340
 static const struct dev_pm_ops rkcif_plat_pm_ops = {
2284
-	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
2285
-				pm_runtime_force_resume)
2341
+	SET_SYSTEM_SLEEP_PM_OPS(rkcif_sleep_suspend, rkcif_sleep_resume)
2286
2342
 	SET_RUNTIME_PM_OPS(rkcif_runtime_suspend, rkcif_runtime_resume, NULL)
2287
2343
 };
2288
2344