~hc/RK356X_SDK_RELEASE.git

..	..	@@ -33,7 +33,6 @@
33	33	#include <linux/pm_runtime.h>
34	34	#include <linux/devfreq_cooling.h>
35	35	#include <linux/regmap.h>
36		-#include <linux/dma-iommu.h>
37	36	#include <linux/of_address.h>
38	37
39	38	#ifndef FPGA_PLATFORM
..	..	@@ -79,36 +78,29 @@
79	78	MODULE_PARM_DESC(bypass_soft_reset,
80	79	"bypass RKNPU soft reset if set it to 1, disabled by default");
81	80
82		-struct npu_irqs_data {
	81	+struct rknpu_irqs_data {
83	82	const char *name;
84	83	irqreturn_t (irq_hdl)(int irq, void ctx);
85	84	};
86	85
87		-static const struct npu_irqs_data rk356x_npu_irqs[] = {
	86	+static const struct rknpu_irqs_data rknpu_irqs[] = {
88	87	{ "npu_irq", rknpu_core0_irq_handler }
89	88	};
90	89
91		-static const struct npu_irqs_data rk3588_npu_irqs[] = {
	90	+static const struct rknpu_irqs_data rk3588_npu_irqs[] = {
92	91	{ "npu0_irq", rknpu_core0_irq_handler },
93	92	{ "npu1_irq", rknpu_core1_irq_handler },
94	93	{ "npu2_irq", rknpu_core2_irq_handler }
95	94	};
96	95
97		-static const struct npu_irqs_data rv110x_npu_irqs[] = {
98		- { "npu_irq", rknpu_core0_irq_handler }
99		-};
	96	+static const struct rknpu_reset_data rknpu_resets[] = { { "srst_a",
	97	+ "srst_h" } };
100	98
101		-static const struct npu_reset_data rk356x_npu_resets[] = { { "srst_a",
102		- "srst_h" } };
103		-
104		-static const struct npu_reset_data rk3588_npu_resets[] = {
	99	+static const struct rknpu_reset_data rk3588_npu_resets[] = {
105	100	{ "srst_a0", "srst_h0" },
106	101	{ "srst_a1", "srst_h1" },
107	102	{ "srst_a2", "srst_h2" }
108	103	};
109		-
110		-static const struct npu_reset_data rv110x_npu_resets[] = { { "srst_a",
111		- "srst_h" } };
112	104
113	105	static const struct rknpu_config rk356x_rknpu_config = {
114	106	.bw_priority_addr = 0xfe180008,
..	..	@@ -117,11 +109,16 @@
117	109	.pc_data_amount_scale = 1,
118	110	.pc_task_number_bits = 12,
119	111	.pc_task_number_mask = 0xfff,
	112	+ .pc_task_status_offset = 0x3c,
	113	+ .pc_dma_ctrl = 0,
120	114	.bw_enable = 1,
121		- .irqs = rk356x_npu_irqs,
122		- .resets = rk356x_npu_resets,
123		- .num_irqs = ARRAY_SIZE(rk356x_npu_irqs),
124		- .num_resets = ARRAY_SIZE(rk356x_npu_resets)
	115	+ .irqs = rknpu_irqs,
	116	+ .resets = rknpu_resets,
	117	+ .num_irqs = ARRAY_SIZE(rknpu_irqs),
	118	+ .num_resets = ARRAY_SIZE(rknpu_resets),
	119	+ .nbuf_phyaddr = 0,
	120	+ .nbuf_size = 0,
	121	+ .max_submit_number = (1 << 12) - 1
125	122	};
126	123
127	124	static const struct rknpu_config rk3588_rknpu_config = {
..	..	@@ -131,11 +128,16 @@
131	128	.pc_data_amount_scale = 2,
132	129	.pc_task_number_bits = 12,
133	130	.pc_task_number_mask = 0xfff,
	131	+ .pc_task_status_offset = 0x3c,
	132	+ .pc_dma_ctrl = 0,
134	133	.bw_enable = 0,
135	134	.irqs = rk3588_npu_irqs,
136	135	.resets = rk3588_npu_resets,
137	136	.num_irqs = ARRAY_SIZE(rk3588_npu_irqs),
138		- .num_resets = ARRAY_SIZE(rk3588_npu_resets)
	137	+ .num_resets = ARRAY_SIZE(rk3588_npu_resets),
	138	+ .nbuf_phyaddr = 0,
	139	+ .nbuf_size = 0,
	140	+ .max_submit_number = (1 << 12) - 1
139	141	};
140	142
141	143	static const struct rknpu_config rv1106_rknpu_config = {
..	..	@@ -145,11 +147,35 @@
145	147	.pc_data_amount_scale = 2,
146	148	.pc_task_number_bits = 16,
147	149	.pc_task_number_mask = 0xffff,
	150	+ .pc_task_status_offset = 0x3c,
	151	+ .pc_dma_ctrl = 0,
148	152	.bw_enable = 1,
149		- .irqs = rv110x_npu_irqs,
150		- .resets = rv110x_npu_resets,
151		- .num_irqs = ARRAY_SIZE(rv110x_npu_irqs),
152		- .num_resets = ARRAY_SIZE(rv110x_npu_resets)
	153	+ .irqs = rknpu_irqs,
	154	+ .resets = rknpu_resets,
	155	+ .num_irqs = ARRAY_SIZE(rknpu_irqs),
	156	+ .num_resets = ARRAY_SIZE(rknpu_resets),
	157	+ .nbuf_phyaddr = 0,
	158	+ .nbuf_size = 0,
	159	+ .max_submit_number = (1 << 16) - 1
	160	+};
	161	+
	162	+static const struct rknpu_config rk3562_rknpu_config = {
	163	+ .bw_priority_addr = 0x0,
	164	+ .bw_priority_length = 0x0,
	165	+ .dma_mask = DMA_BIT_MASK(40),
	166	+ .pc_data_amount_scale = 2,
	167	+ .pc_task_number_bits = 16,
	168	+ .pc_task_number_mask = 0xffff,
	169	+ .pc_task_status_offset = 0x48,
	170	+ .pc_dma_ctrl = 1,
	171	+ .bw_enable = 1,
	172	+ .irqs = rknpu_irqs,
	173	+ .resets = rknpu_resets,
	174	+ .num_irqs = ARRAY_SIZE(rknpu_irqs),
	175	+ .num_resets = ARRAY_SIZE(rknpu_resets),
	176	+ .nbuf_phyaddr = 0xfe400000,
	177	+ .nbuf_size = 256 * 1024,
	178	+ .max_submit_number = (1 << 16) - 1
153	179	};
154	180
155	181	/* driver probe and init */
..	..	@@ -169,6 +195,10 @@
169	195	{
170	196	.compatible = "rockchip,rv1106-rknpu",
171	197	.data = &rv1106_rknpu_config,
	198	+ },
	199	+ {
	200	+ .compatible = "rockchip,rk3562-rknpu",
	201	+ .data = &rk3562_rknpu_config,
172	202	},
173	203	{},
174	204	};
..	..	@@ -198,7 +228,6 @@
198	228	{
199	229	int ret = 0;
200	230
201		- cancel_delayed_work(&rknpu_dev->power_off_work);
202	231	mutex_lock(&rknpu_dev->power_lock);
203	232	if (atomic_inc_return(&rknpu_dev->power_refcount) == 1)
204	233	ret = rknpu_power_on(rknpu_dev);
..	..	@@ -221,6 +250,9 @@
221	250
222	251	static int rknpu_power_put_delay(struct rknpu_device *rknpu_dev)
223	252	{
	253	+ if (rknpu_dev->power_put_delay == 0)
	254	+ return rknpu_power_put(rknpu_dev);
	255	+
224	256	mutex_lock(&rknpu_dev->power_lock);
225	257	if (atomic_read(&rknpu_dev->power_refcount) == 1)
226	258	queue_delayed_work(
..	..	@@ -229,6 +261,7 @@
229	261	else
230	262	atomic_dec_if_positive(&rknpu_dev->power_refcount);
231	263	mutex_unlock(&rknpu_dev->power_lock);
	264	+
232	265	return 0;
233	266	}
234	267
..	..	@@ -245,13 +278,17 @@
245	278	ret = rknpu_get_drv_version(&args->value);
246	279	break;
247	280	case RKNPU_GET_FREQ:
	281	+#ifndef FPGA_PLATFORM
248	282	args->value = clk_get_rate(rknpu_dev->clks[0].clk);
	283	+#endif
249	284	ret = 0;
250	285	break;
251	286	case RKNPU_SET_FREQ:
252	287	break;
253	288	case RKNPU_GET_VOLT:
	289	+#ifndef FPGA_PLATFORM
254	290	args->value = regulator_get_voltage(rknpu_dev->vdd);
	291	+#endif
255	292	ret = 0;
256	293	break;
257	294	case RKNPU_SET_VOLT:
..	..	@@ -330,11 +367,56 @@
330	367	#ifdef CONFIG_ROCKCHIP_RKNPU_DMA_HEAP
331	368	static int rknpu_open(struct inode inode, struct file file)
332	369	{
	370	+ struct rknpu_device *rknpu_dev =
	371	+ container_of(file->private_data, struct rknpu_device, miscdev);
	372	+ struct rknpu_session *session = NULL;
	373	+
	374	+ session = kzalloc(sizeof(*session), GFP_KERNEL);
	375	+ if (!session) {
	376	+ LOG_ERROR("rknpu session alloc failed\n");
	377	+ return -ENOMEM;
	378	+ }
	379	+
	380	+ session->rknpu_dev = rknpu_dev;
	381	+ INIT_LIST_HEAD(&session->list);
	382	+
	383	+ file->private_data = (void *)session;
	384	+
333	385	return nonseekable_open(inode, file);
334	386	}
335	387
336	388	static int rknpu_release(struct inode inode, struct file file)
337	389	{
	390	+ struct rknpu_mem_object *entry;
	391	+ struct rknpu_session *session = file->private_data;
	392	+ struct rknpu_device *rknpu_dev = session->rknpu_dev;
	393	+ LIST_HEAD(local_list);
	394	+
	395	+ spin_lock(&rknpu_dev->lock);
	396	+ list_replace_init(&session->list, &local_list);
	397	+ file->private_data = NULL;
	398	+ spin_unlock(&rknpu_dev->lock);
	399	+
	400	+ while (!list_empty(&local_list)) {
	401	+ entry = list_first_entry(&local_list, struct rknpu_mem_object,
	402	+ head);
	403	+
	404	+ LOG_DEBUG(
	405	+ "Fd close free rknpu_obj: %#llx, rknpu_obj->dma_addr: %#llx\n",
	406	+ (__u64)(uintptr_t)entry, (__u64)entry->dma_addr);
	407	+
	408	+ vunmap(entry->kv_addr);
	409	+ entry->kv_addr = NULL;
	410	+
	411	+ if (!entry->owner)
	412	+ dma_buf_put(entry->dmabuf);
	413	+
	414	+ list_del(&entry->head);
	415	+ kfree(entry);
	416	+ }
	417	+
	418	+ kfree(session);
	419	+
338	420	return 0;
339	421	}
340	422
..	..	@@ -366,8 +448,12 @@
366	448	static long rknpu_ioctl(struct file *file, uint32_t cmd, unsigned long arg)
367	449	{
368	450	long ret = -EINVAL;
369		- struct rknpu_device *rknpu_dev =
370		- container_of(file->private_data, struct rknpu_device, miscdev);
	451	+ struct rknpu_device *rknpu_dev = NULL;
	452	+
	453	+ if (!file->private_data)
	454	+ return -EINVAL;
	455	+
	456	+ rknpu_dev = ((struct rknpu_session *)file->private_data)->rknpu_dev;
371	457
372	458	rknpu_power_get(rknpu_dev);
373	459
..	..	@@ -379,12 +465,12 @@
379	465	ret = rknpu_submit_ioctl(rknpu_dev, arg);
380	466	break;
381	467	case IOCTL_RKNPU_MEM_CREATE:
382		- ret = rknpu_mem_create_ioctl(rknpu_dev, arg);
	468	+ ret = rknpu_mem_create_ioctl(rknpu_dev, arg, file);
383	469	break;
384	470	case RKNPU_MEM_MAP:
385	471	break;
386	472	case IOCTL_RKNPU_MEM_DESTROY:
387		- ret = rknpu_mem_destroy_ioctl(rknpu_dev, arg);
	473	+ ret = rknpu_mem_destroy_ioctl(rknpu_dev, arg, file);
388	474	break;
389	475	case IOCTL_RKNPU_MEM_SYNC:
390	476	ret = rknpu_mem_sync_ioctl(rknpu_dev, arg);
..	..	@@ -409,11 +495,13 @@
409	495	#endif
410	496
411	497	#ifdef CONFIG_ROCKCHIP_RKNPU_DRM_GEM
	498	+#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
412	499	static const struct vm_operations_struct rknpu_gem_vm_ops = {
413	500	.fault = rknpu_gem_fault,
414	501	.open = drm_gem_vm_open,
415	502	.close = drm_gem_vm_close,
416	503	};
	504	+#endif
417	505
418	506	static int rknpu_action_ioctl(struct drm_device dev, void data,
419	507	struct drm_file *file_priv)
..	..	@@ -455,6 +543,9 @@
455	543	DRM_RENDER_ALLOW),
456	544	};
457	545
	546	+#if KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE
	547	+DEFINE_DRM_GEM_FOPS(rknpu_drm_driver_fops);
	548	+#else
458	549	static const struct file_operations rknpu_drm_driver_fops = {
459	550	.owner = THIS_MODULE,
460	551	.open = drm_open,
..	..	@@ -468,6 +559,7 @@
468	559	.release = drm_release,
469	560	.llseek = noop_llseek,
470	561	};
	562	+#endif
471	563
472	564	static struct drm_driver rknpu_drm_driver = {
473	565	#if KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE
..	..	@@ -475,28 +567,34 @@
475	567	#else
476	568	.driver_features = DRIVER_GEM \| DRIVER_PRIME \| DRIVER_RENDER,
477	569	#endif
	570	+#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
478	571	.gem_free_object_unlocked = rknpu_gem_free_object,
479	572	.gem_vm_ops = &rknpu_gem_vm_ops,
	573	+ .dumb_destroy = drm_gem_dumb_destroy,
	574	+ .gem_prime_export = drm_gem_prime_export,
	575	+ .gem_prime_get_sg_table = rknpu_gem_prime_get_sg_table,
	576	+ .gem_prime_vmap = rknpu_gem_prime_vmap,
	577	+ .gem_prime_vunmap = rknpu_gem_prime_vunmap,
	578	+#endif
480	579	.dumb_create = rknpu_gem_dumb_create,
481	580	#if KERNEL_VERSION(4, 19, 0) > LINUX_VERSION_CODE
482	581	.dumb_map_offset = rknpu_gem_dumb_map_offset,
483	582	#else
484	583	.dumb_map_offset = drm_gem_dumb_map_offset,
485	584	#endif
486		- .dumb_destroy = drm_gem_dumb_destroy,
487	585	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
488	586	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
489		- .gem_prime_export = drm_gem_prime_export,
490	587	#if KERNEL_VERSION(4, 13, 0) <= LINUX_VERSION_CODE
491	588	.gem_prime_import = rknpu_gem_prime_import,
492	589	#else
493	590	.gem_prime_import = drm_gem_prime_import,
494	591	#endif
495		- .gem_prime_get_sg_table = rknpu_gem_prime_get_sg_table,
496	592	.gem_prime_import_sg_table = rknpu_gem_prime_import_sg_table,
497		- .gem_prime_vmap = rknpu_gem_prime_vmap,
498		- .gem_prime_vunmap = rknpu_gem_prime_vunmap,
	593	+#if KERNEL_VERSION(6, 1, 0) <= LINUX_VERSION_CODE
	594	+ .gem_prime_mmap = drm_gem_prime_mmap,
	595	+#else
499	596	.gem_prime_mmap = rknpu_gem_prime_mmap,
	597	+#endif
500	598	.ioctls = rknpu_ioctls,
501	599	.num_ioctls = ARRAY_SIZE(rknpu_ioctls),
502	600	.fops = &rknpu_drm_driver_fops,
..	..	@@ -516,7 +614,7 @@
516	614	container_of(timer, struct rknpu_device, timer);
517	615	struct rknpu_subcore_data *subcore_data = NULL;
518	616	struct rknpu_job *job = NULL;
519		- ktime_t now = ktime_get();
	617	+ ktime_t now;
520	618	unsigned long flags;
521	619	int i;
522	620
..	..	@@ -527,9 +625,10 @@
527	625
528	626	job = subcore_data->job;
529	627	if (job) {
	628	+ now = ktime_get();
530	629	subcore_data->timer.busy_time +=
531	630	ktime_us_delta(now, job->hw_recoder_time);
532		- job->hw_recoder_time = ktime_get();
	631	+ job->hw_recoder_time = now;
533	632	}
534	633
535	634	subcore_data->timer.busy_time_record =
..	..	@@ -581,6 +680,42 @@
581	680	}
582	681
583	682	#ifdef CONFIG_ROCKCHIP_RKNPU_DRM_GEM
	683	+static int drm_fake_dev_register(struct rknpu_device *rknpu_dev)
	684	+{
	685	+ const struct platform_device_info rknpu_dev_info = {
	686	+ .name = "rknpu_dev",
	687	+ .id = PLATFORM_DEVID_AUTO,
	688	+ .dma_mask = rknpu_dev->config->dma_mask,
	689	+ };
	690	+ struct platform_device *pdev = NULL;
	691	+ int ret = -EINVAL;
	692	+
	693	+ pdev = platform_device_register_full(&rknpu_dev_info);
	694	+ if (pdev) {
	695	+ ret = of_dma_configure(&pdev->dev, NULL, true);
	696	+ if (ret) {
	697	+ platform_device_unregister(pdev);
	698	+ pdev = NULL;
	699	+ }
	700	+ }
	701	+
	702	+ rknpu_dev->fake_dev = pdev ? &pdev->dev : NULL;
	703	+
	704	+ return ret;
	705	+}
	706	+
	707	+static void drm_fake_dev_unregister(struct rknpu_device *rknpu_dev)
	708	+{
	709	+ struct platform_device *pdev = NULL;
	710	+
	711	+ if (!rknpu_dev->fake_dev)
	712	+ return;
	713	+
	714	+ pdev = to_platform_device(rknpu_dev->fake_dev);
	715	+
	716	+ platform_device_unregister(pdev);
	717	+}
	718	+
584	719	static int rknpu_drm_probe(struct rknpu_device *rknpu_dev)
585	720	{
586	721	struct device *dev = rknpu_dev->dev;
..	..	@@ -599,6 +734,8 @@
599	734	drm_dev->dev_private = rknpu_dev;
600	735	rknpu_dev->drm_dev = drm_dev;
601	736
	737	+ drm_fake_dev_register(rknpu_dev);
	738	+
602	739	return 0;
603	740
604	741	err_free_drm:
..	..	@@ -614,6 +751,8 @@
614	751	static void rknpu_drm_remove(struct rknpu_device *rknpu_dev)
615	752	{
616	753	struct drm_device *drm_dev = rknpu_dev->drm_dev;
	754	+
	755	+ drm_fake_dev_unregister(rknpu_dev);
617	756
618	757	drm_dev_unregister(drm_dev);
619	758
..	..	@@ -662,7 +801,8 @@
662	801	}
663	802
664	803	#ifndef FPGA_PLATFORM
665		-#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	804	+#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE && \
	805	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
666	806	rockchip_monitor_volt_adjust_lock(rknpu_dev->mdev_info);
667	807	#endif
668	808	#endif
..	..	@@ -723,7 +863,8 @@
723	863
724	864	out:
725	865	#ifndef FPGA_PLATFORM
726		-#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	866	+#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE && \
	867	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
727	868	rockchip_monitor_volt_adjust_unlock(rknpu_dev->mdev_info);
728	869	#endif
729	870	#endif
..	..	@@ -739,7 +880,8 @@
739	880	int ret;
740	881	bool val;
741	882
742		-#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	883	+#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE && \
	884	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
743	885	rockchip_monitor_volt_adjust_lock(rknpu_dev->mdev_info);
744	886	#endif
745	887	#endif
..	..	@@ -763,7 +905,8 @@
763	905	if (ret) {
764	906	LOG_DEV_ERROR(dev, "iommu still enabled\n");
765	907	pm_runtime_get_sync(dev);
766		-#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	908	+#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE && \
	909	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
767	910	rockchip_monitor_volt_adjust_unlock(
768	911	rknpu_dev->mdev_info);
769	912	#endif
..	..	@@ -782,7 +925,8 @@
782	925	}
783	926
784	927	#ifndef FPGA_PLATFORM
785		-#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	928	+#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE && \
	929	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
786	930	rockchip_monitor_volt_adjust_unlock(rknpu_dev->mdev_info);
787	931	#endif
788	932	#endif
..	..	@@ -801,8 +945,9 @@
801	945	}
802	946
803	947	#ifndef FPGA_PLATFORM
	948	+#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
804	949	static struct monitor_dev_profile npu_mdevp = {
805		- .type = MONITOR_TPYE_DEV,
	950	+ .type = MONITOR_TYPE_DEV,
806	951	.low_temp_adjust = rockchip_monitor_dev_low_temp_adjust,
807	952	.high_temp_adjust = rockchip_monitor_dev_high_temp_adjust,
808	953	#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
..	..	@@ -1063,6 +1208,7 @@
1063	1208	.get_dev_status = npu_devfreq_get_dev_status,
1064	1209	.get_cur_freq = npu_devfreq_get_cur_freq,
1065	1210	};
	1211	+#endif
1066	1212
1067	1213	#ifdef CONFIG_PM_DEVFREQ
1068	1214	static int devfreq_rknpu_ondemand_func(struct devfreq df, unsigned long freq)
..	..	@@ -1090,6 +1236,7 @@
1090	1236	};
1091	1237	#endif
1092	1238
	1239	+#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
1093	1240	static unsigned long npu_get_static_power(struct devfreq *devfreq,
1094	1241	unsigned long voltage)
1095	1242	{
..	..	@@ -1107,6 +1254,66 @@
1107	1254	};
1108	1255
1109	1256	#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	1257	+static int rk3588_npu_get_soc_info(struct device dev, struct device_node np,
	1258	+ int bin, int process)
	1259	+{
	1260	+ int ret = 0;
	1261	+ u8 value = 0;
	1262	+
	1263	+ if (!bin)
	1264	+ return 0;
	1265	+
	1266	+ if (of_property_match_string(np, "nvmem-cell-names",
	1267	+ "specification_serial_number") >= 0) {
	1268	+ ret = rockchip_nvmem_cell_read_u8(
	1269	+ np, "specification_serial_number", &value);
	1270	+ if (ret) {
	1271	+ LOG_DEV_ERROR(
	1272	+ dev,
	1273	+ "Failed to get specification_serial_number\n");
	1274	+ return ret;
	1275	+ }
	1276	+ /* RK3588M */
	1277	+ if (value == 0xd)
	1278	+ *bin = 1;
	1279	+ /* RK3588J */
	1280	+ else if (value == 0xa)
	1281	+ *bin = 2;
	1282	+ }
	1283	+ if (*bin < 0)
	1284	+ *bin = 0;
	1285	+ LOG_DEV_INFO(dev, "bin=%d\n", *bin);
	1286	+
	1287	+ return ret;
	1288	+}
	1289	+
	1290	+static int rk3588_npu_set_soc_info(struct device dev, struct device_node np,
	1291	+ int bin, int process, int volt_sel)
	1292	+{
	1293	+ struct opp_table *opp_table;
	1294	+ u32 supported_hw[2];
	1295	+
	1296	+ if (volt_sel < 0)
	1297	+ return 0;
	1298	+ if (bin < 0)
	1299	+ bin = 0;
	1300	+
	1301	+ if (!of_property_read_bool(np, "rockchip,supported-hw"))
	1302	+ return 0;
	1303	+
	1304	+ /* SoC Version */
	1305	+ supported_hw[0] = BIT(bin);
	1306	+ /* Speed Grade */
	1307	+ supported_hw[1] = BIT(volt_sel);
	1308	+ opp_table = dev_pm_opp_set_supported_hw(dev, supported_hw, 2);
	1309	+ if (IS_ERR(opp_table)) {
	1310	+ LOG_DEV_ERROR(dev, "failed to set supported opp\n");
	1311	+ return PTR_ERR(opp_table);
	1312	+ }
	1313	+
	1314	+ return 0;
	1315	+}
	1316	+
1110	1317	static int rk3588_npu_set_read_margin(struct device *dev,
1111	1318	struct rockchip_opp_info *opp_info,
1112	1319	u32 rm)
..	..	@@ -1139,6 +1346,8 @@
1139	1346	}
1140	1347
1141	1348	static const struct rockchip_opp_data rk3588_npu_opp_data = {
	1349	+ .get_soc_info = rk3588_npu_get_soc_info,
	1350	+ .set_soc_info = rk3588_npu_set_soc_info,
1142	1351	.set_read_margin = rk3588_npu_set_read_margin,
1143	1352	};
1144	1353
..	..	@@ -1401,6 +1610,7 @@
1401	1610	return ret;
1402	1611	}
1403	1612	#endif
	1613	+#endif
1404	1614
1405	1615	static int rknpu_devfreq_remove(struct rknpu_device *rknpu_dev)
1406	1616	{
..	..	@@ -1423,9 +1633,12 @@
1423	1633	{
1424	1634	const struct rknpu_config *config = rknpu_dev->config;
1425	1635	struct device *dev = &pdev->dev;
	1636	+#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
1426	1637	struct resource *res;
	1638	+#endif
1427	1639	int i, ret, irq;
1428	1640
	1641	+#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
1429	1642	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ,
1430	1643	config->irqs[0].name);
1431	1644	if (res) {
..	..	@@ -1464,6 +1677,25 @@
1464	1677	return ret;
1465	1678	}
1466	1679	}
	1680	+#else
	1681	+ /* there are irq names in dts */
	1682	+ for (i = 0; i < config->num_irqs; i++) {
	1683	+ irq = platform_get_irq_byname(pdev, config->irqs[i].name);
	1684	+ if (irq < 0) {
	1685	+ LOG_DEV_ERROR(dev, "no npu %s in dts\n",
	1686	+ config->irqs[i].name);
	1687	+ return irq;
	1688	+ }
	1689	+
	1690	+ ret = devm_request_irq(dev, irq, config->irqs[i].irq_hdl,
	1691	+ IRQF_SHARED, dev_name(dev), rknpu_dev);
	1692	+ if (ret < 0) {
	1693	+ LOG_DEV_ERROR(dev, "request %s failed: %d\n",
	1694	+ config->irqs[i].name, ret);
	1695	+ return ret;
	1696	+ }
	1697	+ }
	1698	+#endif
1467	1699
1468	1700	return 0;
1469	1701	}
..	..	@@ -1514,6 +1746,31 @@
1514	1746	LOG_DEV_INFO(dev, "sram region: [%pa, %pa), sram size: %#x\n",
1515	1747	&rknpu_dev->sram_start, &rknpu_dev->sram_end,
1516	1748	rknpu_dev->sram_size);
	1749	+
	1750	+ return 0;
	1751	+}
	1752	+
	1753	+static int rknpu_find_nbuf_resource(struct rknpu_device *rknpu_dev)
	1754	+{
	1755	+ struct device *dev = rknpu_dev->dev;
	1756	+
	1757	+ if (rknpu_dev->config->nbuf_size == 0)
	1758	+ return -EINVAL;
	1759	+
	1760	+ rknpu_dev->nbuf_start = rknpu_dev->config->nbuf_phyaddr;
	1761	+ rknpu_dev->nbuf_size = rknpu_dev->config->nbuf_size;
	1762	+ rknpu_dev->nbuf_base_io =
	1763	+ devm_ioremap(dev, rknpu_dev->nbuf_start, rknpu_dev->nbuf_size);
	1764	+ if (IS_ERR(rknpu_dev->nbuf_base_io)) {
	1765	+ LOG_DEV_ERROR(dev, "failed to remap nbuf base io!\n");
	1766	+ rknpu_dev->nbuf_base_io = NULL;
	1767	+ }
	1768	+
	1769	+ rknpu_dev->nbuf_end = rknpu_dev->nbuf_start + rknpu_dev->nbuf_size;
	1770	+
	1771	+ LOG_DEV_INFO(dev, "nbuf region: [%pa, %pa), nbuf size: %#x\n",
	1772	+ &rknpu_dev->nbuf_start, &rknpu_dev->nbuf_end,
	1773	+ rknpu_dev->nbuf_size);
1517	1774
1518	1775	return 0;
1519	1776	}
..	..	@@ -1577,7 +1834,8 @@
1577	1834	}
1578	1835
1579	1836	#ifndef FPGA_PLATFORM
1580		-#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	1837	+#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE && \
	1838	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
1581	1839	if (strstr(__clk_get_name(rknpu_dev->clks[0].clk), "scmi"))
1582	1840	rknpu_dev->opp_info.scmi_clk = rknpu_dev->clks[0].clk;
1583	1841	#endif
..	..	@@ -1719,7 +1977,9 @@
1719	1977	goto err_remove_drv;
1720	1978
1721	1979	#ifndef FPGA_PLATFORM
	1980	+#if KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
1722	1981	rknpu_devfreq_init(rknpu_dev);
	1982	+#endif
1723	1983	#endif
1724	1984
1725	1985	// set default power put delay to 3s
..	..	@@ -1734,7 +1994,8 @@
1734	1994	INIT_DEFERRABLE_WORK(&rknpu_dev->power_off_work,
1735	1995	rknpu_power_off_delay_work);
1736	1996
1737		- if (IS_ENABLED(CONFIG_ROCKCHIP_RKNPU_SRAM) && rknpu_dev->iommu_en) {
	1997	+ if (IS_ENABLED(CONFIG_NO_GKI) &&
	1998	+ IS_ENABLED(CONFIG_ROCKCHIP_RKNPU_SRAM) && rknpu_dev->iommu_en) {
1738	1999	if (!rknpu_find_sram_resource(rknpu_dev)) {
1739	2000	ret = rknpu_mm_create(rknpu_dev->sram_size, PAGE_SIZE,
1740	2001	&rknpu_dev->sram_mm);
..	..	@@ -1744,6 +2005,10 @@
1744	2005	LOG_DEV_WARN(dev, "could not find sram resource!\n");
1745	2006	}
1746	2007	}
	2008	+
	2009	+ if (IS_ENABLED(CONFIG_NO_GKI) && rknpu_dev->iommu_en &&
	2010	+ rknpu_dev->config->nbuf_size > 0)
	2011	+ rknpu_find_nbuf_resource(rknpu_dev);
1747	2012
1748	2013	rknpu_power_off(rknpu_dev);
1749	2014	atomic_set(&rknpu_dev->power_refcount, 0);
..	..	@@ -1823,7 +2088,8 @@
1823	2088	}
1824	2089
1825	2090	#ifndef FPGA_PLATFORM
1826		-#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE
	2091	+#if KERNEL_VERSION(5, 10, 0) <= LINUX_VERSION_CODE && \
	2092	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
1827	2093	static int rknpu_runtime_suspend(struct device *dev)
1828	2094	{
1829	2095	struct rknpu_device *rknpu_dev = dev_get_drvdata(dev);
..	..	@@ -1882,7 +2148,8 @@
1882	2148	.owner = THIS_MODULE,
1883	2149	.name = "RKNPU",
1884	2150	#ifndef FPGA_PLATFORM
1885		-#if KERNEL_VERSION(5, 5, 0) < LINUX_VERSION_CODE
	2151	+#if KERNEL_VERSION(5, 5, 0) < LINUX_VERSION_CODE && \
	2152	+ KERNEL_VERSION(6, 1, 0) > LINUX_VERSION_CODE
1886	2153	.pm = &rknpu_pm_ops,
1887	2154	#endif
1888	2155	#endif
..	..	@@ -1909,3 +2176,6 @@
1909	2176	MODULE_LICENSE("GPL v2");
1910	2177	MODULE_VERSION(RKNPU_GET_DRV_VERSION_STRING(DRIVER_MAJOR, DRIVER_MINOR,
1911	2178	DRIVER_PATCHLEVEL));
	2179	+#if KERNEL_VERSION(5, 16, 0) < LINUX_VERSION_CODE
	2180	+MODULE_IMPORT_NS(DMA_BUF);
	2181	+#endif