diff --git a/tzdriver/Makefile b/tzdriver/Makefile
index 3f9ef62cdb7a14394dc9b427e38928c9e4e38d00..a6621aed4580e4ad694b7f0ce9067ddca63d79d3 100644
--- a/tzdriver/Makefile
+++ b/tzdriver/Makefile
@@ -1,7 +1,7 @@
 ifeq ($(CONFIG_TZDRIVER),y)
 KERNEL_DIR := $(srctree)
 
-EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../third_party/bounds_checking_function/include/
+EXTRA_CFLAGS += -I$(KERNEL_DIR)/bounds_checking_function/include/
 
 obj-$(CONFIG_TZDRIVER) += agent_rpmb/
 obj-$(CONFIG_TZDRIVER) += auth/
diff --git a/tzdriver/agent_rpmb/Makefile b/tzdriver/agent_rpmb/Makefile
old mode 100755
new mode 100644
index 3cbd7b78e61efec18414f28d7c0b998aaccb48f0..df4e0f80a87074db449377b37f8a681143465f47
--- a/tzdriver/agent_rpmb/Makefile
+++ b/tzdriver/agent_rpmb/Makefile
@@ -6,7 +6,7 @@ endif
 
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/platform_drivers/tzdriver
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/platform_drivers/tzdriver/core
-EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../third_party/bounds_checking_function/include
+EXTRA_CFLAGS += -I$(KERNEL_DIR)/bounds_checking_function/include
 
 ifeq ($(CONFIG_MEDIATEK_SOLUTION),y)
 	MTK_PLATFORM := $(subst ",,$(CONFIG_MTK_PLATFORM))
diff --git a/tzdriver/auth/Makefile b/tzdriver/auth/Makefile
index 0e68fe89777f932e4607f2d4f86379c428fdb696..c92958770d0bde94db3aaa9e5776dad0bca12803 100644
--- a/tzdriver/auth/Makefile
+++ b/tzdriver/auth/Makefile
@@ -3,7 +3,7 @@ KERNEL_DIR :=$(srctree)
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/core
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/tlogger
-EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../third_party/bounds_checking_function/include
+EXTRA_CFLAGS += -I$(KERNEL_DIR)/bounds_checking_function/include
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/include
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../base/security/selinux/include
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../base/security/selinux
diff --git a/tzdriver/core/Makefile b/tzdriver/core/Makefile
index 6edab430d76f0c20e37d74373fa1cf19e988f134..326399f6e0c458732f37a0fc74a674132da1ce12 100644
--- a/tzdriver/core/Makefile
+++ b/tzdriver/core/Makefile
@@ -4,7 +4,7 @@ ifneq ($(TARGET_BUILD_VARIANT), user)
 	ccflags-y += -DDEF_ENG
 endif
 
-EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../third_party/bounds_checking_function/include
+EXTRA_CFLAGS += -I$(KERNEL_DIR)/bounds_checking_function/include
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/agent_rpmb/core
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/auth
diff --git a/tzdriver/core/tc_client_driver.c b/tzdriver/core/tc_client_driver.c
index 5d3c2b851ccdd7eef836d2d5eda2b727cc3bbeed..76bf1f97adecb95a6ef371aa1aeb9fd51b4bda2d 100644
--- a/tzdriver/core/tc_client_driver.c
+++ b/tzdriver/core/tc_client_driver.c
@@ -1263,7 +1263,11 @@ static int tc_ns_client_init(void)
 	ret = load_tz_shared_mem(g_dev_node);
 	if (ret != 0)
 		goto unmap_res_mem;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
 	g_driver_class = class_create(THIS_MODULE, TC_NS_CLIENT_DEV);
+#else
+	g_driver_class = class_create(TC_NS_CLIENT_DEV);
+#endif
 	if (IS_ERR_OR_NULL(g_driver_class)) {
 		tloge("class create failed");
 		ret = -ENOMEM;
diff --git a/tzdriver/core/tz_spi_notify.c b/tzdriver/core/tz_spi_notify.c
index 1f5f33fbcd21726c132b98886077be760c3ebb58..9051ea35dd3a3e32c6d1c112e46cc5b02e5ec7b8 100644
--- a/tzdriver/core/tz_spi_notify.c
+++ b/tzdriver/core/tz_spi_notify.c
@@ -447,7 +447,11 @@ static void spi_broadcast_notifications(void)
 		return;
 	}
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 6, 0)
+	missed = (uint32_t)__arch_xchg(0, &g_notify_data->meta.context.meta.missed, MISSED_COUNT);
+#else
 	missed = (uint32_t)__xchg(0, &g_notify_data->meta.context.meta.missed, MISSED_COUNT);
+#endif
 	if (missed == 0)
 		return;
 	if ((missed & (1U << NOTIFY_DATA_ENTRY_WAKEUP)) != 0) {
diff --git a/tzdriver/core/tzdebug.c b/tzdriver/core/tzdebug.c
index f57562ed1cb3aa41b63df2f3d194ea4d0d0adc00..4c4b83355c7aa114f83d0513d3303f5f15eaee04 100644
--- a/tzdriver/core/tzdebug.c
+++ b/tzdriver/core/tzdebug.c
@@ -24,7 +24,12 @@
 #include <linux/debugfs.h>
 #include <linux/module.h>
 #include <linux/seq_file.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
 #include <stdarg.h>
+#else
+#include <linux/stdarg.h>
+#endif
 #include <linux/mm.h>
 #include <asm/tlbflush.h>
 #include <asm/cacheflush.h>
diff --git a/tzdriver/ion/dynamic_ion_mem.c b/tzdriver/ion/dynamic_ion_mem.c
index dce1516c693874b044a96a1b635c5c263a9397c9..feb38d0e0b97d88197fe852b4cedbcc891e5e35e 100644
--- a/tzdriver/ion/dynamic_ion_mem.c
+++ b/tzdriver/ion/dynamic_ion_mem.c
@@ -13,7 +13,12 @@
  */
 
 #include "dynamic_ion_mem.h"
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0)
 #include <stdarg.h>
+#else
+#include <linux/stdarg.h>
+#endif
 #include <linux/workqueue.h>
 #include <linux/kthread.h>
 #include <linux/list.h>
diff --git a/tzdriver/tlogger/Makefile b/tzdriver/tlogger/Makefile
index 00c3f02d0e899d840bc309aa68fd7233ed26d40d..8a909abe06afa1a93211ba272bfb88a13f691532 100644
--- a/tzdriver/tlogger/Makefile
+++ b/tzdriver/tlogger/Makefile
@@ -4,7 +4,7 @@ ifneq ($(TARGET_BUILD_VARIANT), user)
 	ccflags-y += -DDEF_ENG
 endif
 
-EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../third_party/bounds_checking_function/include
+EXTRA_CFLAGS += -I$(KERNEL_DIR)/bounds_checking_function/include
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/core
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/include
diff --git a/tzdriver/tlogger/tlogger.c b/tzdriver/tlogger/tlogger.c
index 81fd888c0fd62fa67d379a48015ca817ddda02e9..dcfc50bec7aceff94207ab5639212c013a08bd5d 100644
--- a/tzdriver/tlogger/tlogger.c
+++ b/tzdriver/tlogger/tlogger.c
@@ -1030,16 +1030,19 @@ static int tlogger_chown(const char *file_path, uint32_t file_path_len)
 	uid_t user = ROOT_UID;
 	gid_t group = ROOT_GID;
 	int ret;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
 	mm_segment_t old_fs;
-
+#endif
 	get_log_chown(&user, &group);
 
 	/* not need modify chown attr */
 	if (group == ROOT_GID && user == ROOT_UID)
 		return 0;
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
 	old_fs = get_fs();
 	set_fs(KERNEL_DS);
+#endif
 #if (KERNEL_VERSION(5, 4, 0) <= LINUX_VERSION_CODE)
 	ret = (int)ksys_chown((const char __user *)file_path, user, group);
 #else
@@ -1047,11 +1050,15 @@ static int tlogger_chown(const char *file_path, uint32_t file_path_len)
 #endif
 	if (ret != 0) {
 		tloge("sys chown for last teemsg file error\n");
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
 		set_fs(old_fs);
+#endif
 		return -1;
 	}
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0))
 	set_fs(old_fs);
+#endif
 	return 0;
 }
 #endif
diff --git a/tzdriver/tui/Makefile b/tzdriver/tui/Makefile
index ad0d6d9571d53309f86072591ff5959a5f040aa4..2ed000ad0380949447ebb8186825def82afd167e 100644
--- a/tzdriver/tui/Makefile
+++ b/tzdriver/tui/Makefile
@@ -12,7 +12,7 @@ ifeq ($(CONFIG_TEE_TUI_MTK), y)
 EXTRA_CFLAGS += -Idrivers/tzdriver
 EXTRA_CFLAGS += -Idrivers/tzdriver/core
 
-EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../third_party/bounds_checking_function/include
+EXTRA_CFLAGS += -I$(KERNEL_DIR)/bounds_checking_function/include
 EXTRA_CFLAGS += -Idrivers/gpu/drm/mediatek
 EXTRA_CFLAGS += -Idrivers/misc/mediatek/memory-ssmr
 EXTRA_CFLAGS += -Idrivers/devkit/lcdkit/lcdkit3.0/kernel/mtk/include
diff --git a/tzdriver/whitelist/Makefile b/tzdriver/whitelist/Makefile
index 730246c1b86ecfa20837651516d7bb4890981bb5..7044f255c53e738660e3b5622da9843e453e2612 100644
--- a/tzdriver/whitelist/Makefile
+++ b/tzdriver/whitelist/Makefile
@@ -4,7 +4,7 @@ ifneq ($(TARGET_BUILD_VARIANT), user)
 	ccflags-y += -DDEF_ENG
 endif
 
-EXTRA_CFLAGS += -I$(KERNEL_DIR)/../../../../third_party/bounds_checking_function/include
+EXTRA_CFLAGS += -I$(KERNEL_DIR)/bounds_checking_function/include
 EXTRA_CFLAGS += -I$(KERNEL_DIR)/drivers/tzdriver/include
 EXTRA_CFLAGS += -include internal_functions.h