diff --git a/drivers/ub/ubus/Makefile b/drivers/ub/ubus/Makefile
index 59505977dd2f3e15e2ce3f7f7ab94a5651c67cb2..96efd80d502fb6ec9352c28430b90bb02c1e95a1 100644
--- a/drivers/ub/ubus/Makefile
+++ b/drivers/ub/ubus/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_UB_UBUS) += ub-driver.o controller.o config.o entity.o ras.o
 obj-$(CONFIG_UB_UBUS) += msi/
 
 ubus-y := ubus_driver.o sysfs.o ubus_controller.o msg.o ubus_config.o port.o cc.o eid.o cna.o route.o
-ubus-y += enum.o resource.o ubus_entity.o reset.o cap.o interrupt.o decoder.o omm.o ioctl.o eu.o link.o
+ubus-y += enum.o resource.o ubus_entity.o reset.o cap.o interrupt.o decoder.o ioctl.o eu.o link.o
 ubus-y += instance.o pool.o memory.o
 
 ubus-y += services/ras.o services/service.o services/gucd.o
diff --git a/drivers/ub/ubus/decoder.c b/drivers/ub/ubus/decoder.c
index f5a8e69fd1cf8bebe0503a75ec00e6c5a96d2d2f..288e33a960381c96543237aa7a80e3c7eee3810c 100644
--- a/drivers/ub/ubus/decoder.c
+++ b/drivers/ub/ubus/decoder.c
@@ -13,7 +13,6 @@
 
 #include "ubus.h"
 #include "ubus_controller.h"
-#include "omm.h"
 #include "decoder.h"
 
 #define MMIO_SIZE_MASK		GENMASK_ULL(18, 16)
@@ -33,8 +32,6 @@
 #define EVTQ_ENABLE		0x1
 #define EVT_ENTRY_SIZE		16
 
-#define DECODER_PAGE_TABLE_ENTRY_SIZE 8
-
 #define DECODER_QUEUE_TIMEOUT_US 1000000 /* 1s */
 
 static void ub_decoder_uninit_queue(struct ub_decoder *decoder)
@@ -170,68 +167,24 @@ static u32 ub_decoder_device_set(struct ub_decoder *decoder)
 	return ret;
 }
 
-static int ub_decoder_create_page_table(struct ub_decoder *decoder)
+static int ub_decoder_create_page_table(struct ub_bus_controller *ubc,
+					struct ub_decoder *decoder)
 {
-	struct page_table_desc *invalid_desc = &decoder->invalid_desc;
-	struct ub_entity *uent = decoder->uent;
-	struct page_table *pgtlb;
-	void *pgtlb_base;
-	size_t size;
-
-	size = DECODER_PAGE_TABLE_ENTRY_SIZE * DECODER_PAGE_TABLE_SIZE;
-	pgtlb = &decoder->pgtlb;
-	pgtlb_base = dmam_alloc_coherent(decoder->dev, size,
-					 &pgtlb->pgtlb_dma, GFP_KERNEL);
-	if (!pgtlb_base) {
-		ub_err(uent, "allocate ub decoder page table fail\n");
-		return -ENOMEM;
-	}
-	pgtlb->pgtlb_base = pgtlb_base;
-
-	size = sizeof(*pgtlb->desc_base) * DECODER_PAGE_TABLE_SIZE;
-	pgtlb->desc_base = kzalloc(size, GFP_KERNEL);
-	if (!pgtlb->desc_base) {
-		ub_err(uent, "allocate ub decoder page table desc fail\n");
-		goto release_pgtlb;
-	}
-
-	invalid_desc->page_base = dmam_alloc_coherent(decoder->dev,
-						      RANGE_TABLE_PAGE_SIZE,
-						      &invalid_desc->page_dma,
-						      GFP_KERNEL);
-	if (!invalid_desc->page_base) {
-		ub_err(uent, "decoder alloc free page fail\n");
-		goto release_desc;
-	}
-	decoder->invalid_page_dma = (invalid_desc->page_dma &
-				     DECODER_PGTBL_PGPRT_MASK) >>
-				     DECODER_DMA_PAGE_ADDR_OFFSET;
-
-	ub_decoder_init_page_table(decoder, pgtlb_base);
+	if (ubc->ops->create_decoder_table)
+		return ubc->ops->create_decoder_table(decoder);
 
-	return 0;
-
-release_desc:
-	kfree(pgtlb->desc_base);
-	pgtlb->desc_base = NULL;
-release_pgtlb:
-	size = DECODER_PAGE_TABLE_ENTRY_SIZE * DECODER_PAGE_TABLE_SIZE;
-	dmam_free_coherent(decoder->dev, size, pgtlb_base, pgtlb->pgtlb_dma);
-	return -ENOMEM;
+	ub_err(decoder->uent, "ub bus controller can't create decoder table\n");
+	return -EPERM;
 }
 
-static void ub_decoder_free_page_table(struct ub_decoder *decoder)
+static void ub_decoder_free_page_table(struct ub_bus_controller *ubc,
+				       struct ub_decoder *decoder)
 {
-	struct page_table_desc *invalid_desc = &decoder->invalid_desc;
-	size_t size;
-
-	dmam_free_coherent(decoder->dev, RANGE_TABLE_PAGE_SIZE,
-			   invalid_desc->page_base, invalid_desc->page_dma);
-	kfree(decoder->pgtlb.desc_base);
-
-	size = DECODER_PAGE_TABLE_ENTRY_SIZE * DECODER_PAGE_TABLE_SIZE;
-	dmam_free_coherent(decoder->dev, size, decoder->pgtlb.pgtlb_base,
-			   decoder->pgtlb.pgtlb_dma);
+	if (ubc->ops->free_decoder_table)
+		ubc->ops->free_decoder_table(decoder);
+	else
+		ub_err(decoder->uent,
+			"ub bus controller can't free decoder table\n");
 }
 
 static void ub_get_decoder_mmio_base(struct ub_bus_controller *ubc,
@@ -302,7 +255,7 @@ static int ub_create_decoder(struct ub_bus_controller *ubc)
 	if (ret)
 		goto release_decoder;
 
-	ret = ub_decoder_create_page_table(decoder);
+	ret = ub_decoder_create_page_table(ubc, decoder);
 	if (ret) {
 		ub_err(uent, "decoder create page table failed\n");
 		goto release_queue;
@@ -321,7 +274,7 @@ static int ub_create_decoder(struct ub_bus_controller *ubc)
 	return ret;
 
 release_page_table:
-	ub_decoder_free_page_table(decoder);
+	ub_decoder_free_page_table(ubc, decoder);
 release_queue:
 	ub_decoder_uninit_queue(decoder);
 release_decoder:
@@ -397,7 +350,7 @@ static void ub_remove_decoder(struct ub_bus_controller *ubc)
 
 	ub_decoder_device_unset(decoder);
 
-	ub_decoder_free_page_table(decoder);
+	ub_decoder_free_page_table(ubc, decoder);
 
 	ub_decoder_uninit_queue(decoder);
 
@@ -635,6 +588,7 @@ int ub_decoder_cmd_request(struct ub_decoder *decoder, phys_addr_t addr,
 	ret = wait_for_cmdq_notify(decoder);
 	return ret;
 }
+EXPORT_SYMBOL_GPL(ub_decoder_cmd_request);
 
 static bool queue_empty(struct ub_decoder_queue *q)
 {
@@ -839,3 +793,38 @@ void ub_decoder_uninit(struct ub_entity *uent)
 
 	ub_remove_decoder(uent->ubc);
 }
+
+int ub_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size)
+{
+	struct ub_bus_controller *ubc;
+
+	if (!decoder) {
+		pr_err("unmap mmio decoder ptr is null\n");
+		return -EINVAL;
+	}
+
+	ubc = decoder->uent->ubc;
+	if (!ubc->ops->decoder_unmap) {
+		pr_err("decoder_unmap ops not exist\n");
+		return -EINVAL;
+	}
+	return ubc->ops->decoder_unmap(ubc->decoder, addr, size);
+}
+
+int ub_decoder_map(struct ub_decoder *decoder, struct decoder_map_info *info)
+{
+	struct ub_bus_controller *ubc;
+
+	if (!decoder || !info) {
+		pr_err("decoder or map info is null\n");
+		return -EINVAL;
+	}
+
+	ubc = decoder->uent->ubc;
+	if (!ubc->ops->decoder_map) {
+		pr_err("decoder_map ops not exist\n");
+		return -EINVAL;
+	}
+
+	return ubc->ops->decoder_map(ubc->decoder, info);
+}
diff --git a/drivers/ub/ubus/decoder.h b/drivers/ub/ubus/decoder.h
index 47710ead71db6414f26f26b8492eb0c0c8b2048b..37d628dc45e278865e364931619e42548edf7480 100644
--- a/drivers/ub/ubus/decoder.h
+++ b/drivers/ub/ubus/decoder.h
@@ -87,33 +87,20 @@ struct ub_decoder {
 	struct mutex table_lock;
 };
 
-#define DECODER_PGTBL_PGPRT_MASK GENMASK_ULL(47, 12)
-#define DECODER_DMA_PAGE_ADDR_OFFSET 12
-
-#define PGTLB_CACHE_IR_NC	0b00
-#define PGTLB_CACHE_IR_WBRA	0b01
-#define PGTLB_CACHE_IR_WT	0b10
-#define PGTLB_CACHE_IR_WB	0b11
-#define PGTLB_CACHE_OR_NC	0b0000
-#define PGTLB_CACHE_OR_WBRA	0b0100
-#define PGTLB_CACHE_OR_WT	0b1000
-#define PGTLB_CACHE_OR_WB	0b1100
-#define PGTLB_CACHE_SH_NSH	0b000000
-#define PGTLB_CACHE_SH_OSH	0b100000
-#define PGTLB_CACHE_SH_ISH	0b110000
-
-#define PGTLB_ATTR_DEFAULT	(PGTLB_CACHE_IR_WBRA |	\
-				 PGTLB_CACHE_OR_WBRA |	\
-				 PGTLB_CACHE_SH_ISH)
-
-#define RGTLB_TO_PGTLB 8
-#define DECODER_PAGE_ENTRY_SIZE 64
-#define DECODER_PAGE_SIZE (1 << 12)
-#define DECODER_PAGE_TABLE_SIZE (1 << 12)
-#define PAGE_TABLE_PAGE_SIZE (DECODER_PAGE_ENTRY_SIZE * DECODER_PAGE_SIZE)
-#define RANGE_TABLE_PAGE_SIZE (DECODER_PAGE_ENTRY_SIZE * \
-			       DECODER_PAGE_SIZE * \
-			       RGTLB_TO_PGTLB)
+struct decoder_map_info {
+	phys_addr_t pa;
+	phys_addr_t uba;
+	u64 size;
+	u32 tpg_num;
+	u8 order_id;
+	u8 order_type;
+	u64 eid_low;
+	u64 eid_high;
+	u32 token_id;
+	u32 token_value;
+	u32 upi;
+	u32 src_eid;
+};
 
 void ub_decoder_init(struct ub_entity *uent);
 void ub_decoder_uninit(struct ub_entity *uent);
@@ -121,4 +108,6 @@ void ub_init_decoder_usi(struct ub_entity *uent);
 void ub_uninit_decoder_usi(struct ub_entity *uent);
 int ub_decoder_cmd_request(struct ub_decoder *decoder, phys_addr_t addr,
 			   u64 size, enum ub_cmd_op_type op);
+int ub_decoder_map(struct ub_decoder *decoder, struct decoder_map_info *info);
+int ub_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size);
 #endif /* __DECODER_H__ */
diff --git a/drivers/ub/ubus/omm.h b/drivers/ub/ubus/omm.h
deleted file mode 100644
index e90ce9cb1f7f2d83fcbac386c95e8c2134ded6dc..0000000000000000000000000000000000000000
--- a/drivers/ub/ubus/omm.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) HiSilicon Technologies Co., Ltd. 2025. All rights reserved.
- */
-
-#ifndef __OMM_H__
-#define __OMM_H__
-
-#include <linux/types.h>
-
-extern u8 ubc_feature;
-
-struct decoder_map_info {
-	phys_addr_t pa;
-	phys_addr_t uba;
-	u64 size;
-	u32 tpg_num;
-	u8 order_id;
-	u8 order_type;
-	u64 eid_low;
-	u64 eid_high;
-	u32 token_id;
-	u32 token_value;
-	u32 upi;
-	u32 src_eid;
-};
-
-void ub_decoder_init_page_table(struct ub_decoder *decoder, void *pgtlb_base);
-int ub_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size);
-int ub_decoder_map(struct ub_decoder *decoder, struct decoder_map_info *info);
-
-#endif /* __OMM_H__ */
diff --git a/drivers/ub/ubus/resource.c b/drivers/ub/ubus/resource.c
index d4516d672bb5c92a5f53bb73a1b1718560cc73ff..6e8ceeb9fa93fe172409a258602f158ed4d4fab7 100644
--- a/drivers/ub/ubus/resource.c
+++ b/drivers/ub/ubus/resource.c
@@ -12,7 +12,6 @@
 #include "ubus.h"
 #include "msg.h"
 #include "decoder.h"
-#include "omm.h"
 #include "resource.h"
 
 struct query_token_msg_pld_req {
diff --git a/drivers/ub/ubus/ubus_controller.h b/drivers/ub/ubus/ubus_controller.h
index 4b3c7a74a41407bcd5cbbb5827acb45a4fda4f87..04eb4a3d76480619d66af0f44e2af07ab91e01a5 100644
--- a/drivers/ub/ubus/ubus_controller.h
+++ b/drivers/ub/ubus/ubus_controller.h
@@ -6,6 +6,9 @@
 #ifndef __UBUS_CONTROLLER_H__
 #define __UBUS_CONTROLLER_H__
 
+#include <ub/ubus/ubus.h>
+#include "decoder.h"
+
 struct ub_bus_controller;
 struct ub_bus_controller_ops {
 	int (*eu_table_init)(struct ub_bus_controller *ubc);
@@ -18,6 +21,12 @@ struct ub_bus_controller_ops {
 	void (*register_decoder_base_addr)(struct ub_bus_controller *ubc,
 					   u64 *cmd_queue, u64 *event_queue);
 	int (*entity_enable)(struct ub_entity *uent, u8 enable);
+	int (*create_decoder_table)(struct ub_decoder *decoder);
+	void (*free_decoder_table)(struct ub_decoder *decoder);
+	int (*decoder_map)(struct ub_decoder *decoder,
+			   struct decoder_map_info *info);
+	int (*decoder_unmap)(struct ub_decoder *decoder, phys_addr_t addr,
+			     u64 size);
 
 	KABI_RESERVE(1)
 	KABI_RESERVE(2)
diff --git a/drivers/ub/ubus/vendor/hisilicon/Makefile b/drivers/ub/ubus/vendor/hisilicon/Makefile
index 998c0e09aeef1019f8ad67987bc616dacb1a7005..fec1dbe157969f5b1c643383ce4998a5bdef6bb2 100644
--- a/drivers/ub/ubus/vendor/hisilicon/Makefile
+++ b/drivers/ub/ubus/vendor/hisilicon/Makefile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 hisi_ubus-objs := hisi-ubus.o controller.o vdm.o local-ras.o msg.o msg-core.o
-hisi_ubus-objs += msg-debugfs.o eu-table.o memory.o
+hisi_ubus-objs += msg-debugfs.o eu-table.o memory.o hisi-decoder.o
 
 obj-$(CONFIG_UB_HISI_UBUS) += hisi_ubus.o
diff --git a/drivers/ub/ubus/vendor/hisilicon/controller.c b/drivers/ub/ubus/vendor/hisilicon/controller.c
index d7ea5c118d32bbf04e81ccf1dce37666b0890cf4..6c9c8e32047999d91bde3635bb3b6d9447dbd86a 100644
--- a/drivers/ub/ubus/vendor/hisilicon/controller.c
+++ b/drivers/ub/ubus/vendor/hisilicon/controller.c
@@ -10,6 +10,7 @@
 #include <ub/ubus/ubus.h>
 
 #include "../../ubus_controller.h"
+#include "hisi-decoder.h"
 #include "hisi-ubus.h"
 #include "hisi-msg.h"
 
@@ -23,17 +24,12 @@ static struct ub_bus_controller_ops hi_ubc_ops = {
 	.unregister_ubmem_irq = hi_unregister_ubmem_irq,
 	.register_decoder_base_addr = hi_register_decoder_base_addr,
 	.entity_enable = hi_send_entity_enable_msg,
+	.create_decoder_table = hi_create_decoder_table,
+	.free_decoder_table = hi_free_decoder_table,
+	.decoder_map = hi_decoder_map,
+	.decoder_unmap = hi_decoder_unmap,
 };
 
-void hi_register_decoder_base_addr(struct ub_bus_controller *ubc, u64 *cmd_queue,
-				   u64 *event_queue)
-{
-	struct hi_ubc_private_data *data = (struct hi_ubc_private_data *)ubc->data;
-
-	*cmd_queue = data->io_decoder_cmdq;
-	*event_queue = data->io_decoder_evtq;
-}
-
 static void ub_bus_controller_debugfs_init(struct ub_bus_controller *ubc)
 {
 	if (!debugfs_initialized())
diff --git a/drivers/ub/ubus/omm.c b/drivers/ub/ubus/vendor/hisilicon/hisi-decoder.c
similarity index 86%
rename from drivers/ub/ubus/omm.c
rename to drivers/ub/ubus/vendor/hisilicon/hisi-decoder.c
index b8b59a9da4f16f2fe7f1baab7ea0b23ab3f903fe..ac1fa0498ffc57783c454a789824c3001fcf9c95 100644
--- a/drivers/ub/ubus/omm.c
+++ b/drivers/ub/ubus/vendor/hisilicon/hisi-decoder.c
@@ -3,11 +3,13 @@
  * Copyright (c) HiSilicon Technologies Co., Ltd. 2025. All rights reserved.
  */
 
-#define pr_fmt(fmt)	"ubus omm: " fmt
+#define pr_fmt(fmt)	"ubus hisi decoder: " fmt
 
 #include <linux/dma-mapping.h>
-#include "decoder.h"
-#include "omm.h"
+#include <ub/ubfi/ubfi.h>
+#include "../../ubus.h"
+#include "hisi-ubus.h"
+#include "hisi-decoder.h"
 
 enum entry_type {
 	INVALID_ENTRY = 0x0,
@@ -95,6 +97,7 @@ struct range_table_entry {
 	u64 reserve11 : 12;
 };
 
+#define DECODER_PAGE_TABLE_ENTRY_SIZE	8
 #define UBA_ADDR_OFFSET			12
 
 #define DECODER_PAGE_INDEX_LOC		20
@@ -107,6 +110,11 @@ struct range_table_entry {
 #define DECODER_RGTLB_ADDRESS_MASK	GENMASK_ULL(34, 20)
 #define DECODER_RGTLB_ADDRESS_OFFSET	20
 #define TOKEN_VALID_MASK		GENMASK(0, 0)
+#define MEM_LMT_MAX			0x7FFF
+#define RANGE_UBA_LOW_MASK		GENMASK_ULL(34, 20)
+#define RANGE_UBA_HIGH_MASK		GENMASK_ULL(63, 35)
+#define UBA_CARRY			0x800000000
+#define UBA_NOCARRY			0x0
 
 #define get_pgtlb_idx(decoder, pa) ((((pa) - (decoder)->mmio_base_addr) & \
 				    DECODER_PAGE_TABLE_MASK) >> \
@@ -485,12 +493,6 @@ static int handle_page_table(struct ub_decoder *decoder, u64 *offset,
 	return ret;
 }
 
-#define MEM_LMT_MAX		0x7FFF
-#define RANGE_UBA_LOW_MASK	GENMASK_ULL(34, 20)
-#define RANGE_UBA_HIGH_MASK	GENMASK_ULL(63, 35)
-#define UBA_CARRY		0x800000000
-#define UBA_NOCARRY		0x0
-
 static void fill_range_table(struct ub_decoder *decoder,
 			     struct range_table_entry *rg_entry,
 			     struct decoder_map_info *info, u64 *offset)
@@ -593,7 +595,7 @@ static int handle_table(struct ub_decoder *decoder,
 			       ret);
 			/* if it is map operation, revert it. unmap operation can't revert */
 			if (is_map)
-				(void)ub_decoder_unmap(decoder, info->pa,
+				(void)hi_decoder_unmap(decoder, info->pa,
 						       rollback_size);
 			break;
 		}
@@ -601,7 +603,88 @@ static int handle_table(struct ub_decoder *decoder,
 	return ret;
 }
 
-int ub_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size)
+static void ub_decoder_init_page_table(struct ub_decoder *decoder, void *pgtlb_base)
+{
+	struct page_table_entry *pgtlb_entry;
+	int i;
+
+	for (i = 0; i < DECODER_PAGE_TABLE_SIZE; i++) {
+		pgtlb_entry = (struct page_table_entry *)pgtlb_base + i;
+		pgtlb_entry->entry_type = PAGE_TABLE;
+		pgtlb_entry->next_lv_addr = decoder->invalid_page_dma;
+		pgtlb_entry->pgtlb_attr = PGTLB_ATTR_DEFAULT;
+	}
+}
+
+void hi_register_decoder_base_addr(struct ub_bus_controller *ubc,
+				   u64 *cmd_queue, u64 *event_queue)
+{
+	struct hi_ubc_private_data *data = (struct hi_ubc_private_data *)ubc->data;
+
+	*cmd_queue = data->io_decoder_cmdq;
+	*event_queue = data->io_decoder_evtq;
+}
+
+int hi_create_decoder_table(struct ub_decoder *decoder)
+{
+	struct page_table_desc *invalid_desc = &decoder->invalid_desc;
+	struct page_table *pgtlb;
+	void *pgtlb_base;
+	size_t size;
+
+	size = DECODER_PAGE_TABLE_ENTRY_SIZE * DECODER_PAGE_TABLE_SIZE;
+	pgtlb = &decoder->pgtlb;
+	pgtlb_base = dmam_alloc_coherent(decoder->dev, size,
+					 &pgtlb->pgtlb_dma, GFP_KERNEL);
+	if (!pgtlb_base)
+		return -ENOMEM;
+
+	pgtlb->pgtlb_base = pgtlb_base;
+
+	size = sizeof(*pgtlb->desc_base) * DECODER_PAGE_TABLE_SIZE;
+	pgtlb->desc_base = kzalloc(size, GFP_KERNEL);
+	if (!pgtlb->desc_base)
+		goto release_pgtlb;
+
+	invalid_desc->page_base = dmam_alloc_coherent(decoder->dev,
+						      RANGE_TABLE_PAGE_SIZE,
+						      &invalid_desc->page_dma,
+						      GFP_KERNEL);
+	if (!invalid_desc->page_base)
+		goto release_desc;
+
+	decoder->invalid_page_dma = (invalid_desc->page_dma &
+				     DECODER_PGTBL_PGPRT_MASK) >>
+				     DECODER_DMA_PAGE_ADDR_OFFSET;
+
+	ub_decoder_init_page_table(decoder, pgtlb_base);
+
+	return 0;
+
+release_desc:
+	kfree(pgtlb->desc_base);
+	pgtlb->desc_base = NULL;
+release_pgtlb:
+	size = DECODER_PAGE_TABLE_ENTRY_SIZE * DECODER_PAGE_TABLE_SIZE;
+	dmam_free_coherent(decoder->dev, size, pgtlb_base, pgtlb->pgtlb_dma);
+	return -ENOMEM;
+}
+
+void hi_free_decoder_table(struct ub_decoder *decoder)
+{
+	struct page_table_desc *invalid_desc = &decoder->invalid_desc;
+	size_t size;
+
+	dmam_free_coherent(decoder->dev, RANGE_TABLE_PAGE_SIZE,
+			   invalid_desc->page_base, invalid_desc->page_dma);
+	kfree(decoder->pgtlb.desc_base);
+
+	size = DECODER_PAGE_TABLE_ENTRY_SIZE * DECODER_PAGE_TABLE_SIZE;
+	dmam_free_coherent(decoder->dev, size, decoder->pgtlb.pgtlb_base,
+			   decoder->pgtlb.pgtlb_dma);
+}
+
+int hi_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size)
 {
 	int ret;
 	struct decoder_map_info info = {
@@ -609,10 +692,6 @@ int ub_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size)
 		.size = size,
 	};
 
-	if (!decoder) {
-		pr_err("unmap mmio decoder ptr is null\n");
-		return -EINVAL;
-	}
 	if (size < SZ_1M)
 		size = SZ_1M;
 	ret = handle_table(decoder, &info, false);
@@ -621,12 +700,8 @@ int ub_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size)
 	return ub_decoder_cmd_request(decoder, addr, size, TLBI_PARTIAL);
 }
 
-int ub_decoder_map(struct ub_decoder *decoder, struct decoder_map_info *info)
+int hi_decoder_map(struct ub_decoder *decoder, struct decoder_map_info *info)
 {
-	if (!decoder || !info) {
-		pr_err("decoder or map info is null\n");
-		return -EINVAL;
-	}
 	if (info->size < SZ_1M)
 		info->size = SZ_1M;
 	ub_info(decoder->uent,
@@ -637,16 +712,3 @@ int ub_decoder_map(struct ub_decoder *decoder, struct decoder_map_info *info)
 
 	return handle_table(decoder, info, true);
 }
-
-void ub_decoder_init_page_table(struct ub_decoder *decoder, void *pgtlb_base)
-{
-	struct page_table_entry *pgtlb_entry;
-	int i;
-
-	for (i = 0; i < DECODER_PAGE_TABLE_SIZE; i++) {
-		pgtlb_entry = (struct page_table_entry *)pgtlb_base + i;
-		pgtlb_entry->entry_type = PAGE_TABLE;
-		pgtlb_entry->next_lv_addr = decoder->invalid_page_dma;
-		pgtlb_entry->pgtlb_attr = PGTLB_ATTR_DEFAULT;
-	}
-}
diff --git a/drivers/ub/ubus/vendor/hisilicon/hisi-decoder.h b/drivers/ub/ubus/vendor/hisilicon/hisi-decoder.h
new file mode 100644
index 0000000000000000000000000000000000000000..50658ef7b9cbd5bf3598b43c1d8b7853c0e53d1c
--- /dev/null
+++ b/drivers/ub/ubus/vendor/hisilicon/hisi-decoder.h
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (c) HiSilicon Technologies Co., Ltd. 2025. All rights reserved.
+ */
+
+#ifndef __HISI_DECODER_H__
+#define __HISI_DECODER_H__
+
+#include <linux/types.h>
+#include <ub/ubus/ubus.h>
+#include "../../decoder.h"
+
+#define DECODER_PGTBL_PGPRT_MASK GENMASK_ULL(47, 12)
+#define DECODER_DMA_PAGE_ADDR_OFFSET 12
+
+#define PGTLB_CACHE_IR_NC	0b00
+#define PGTLB_CACHE_IR_WBRA	0b01
+#define PGTLB_CACHE_IR_WT	0b10
+#define PGTLB_CACHE_IR_WB	0b11
+#define PGTLB_CACHE_OR_NC	0b0000
+#define PGTLB_CACHE_OR_WBRA	0b0100
+#define PGTLB_CACHE_OR_WT	0b1000
+#define PGTLB_CACHE_OR_WB	0b1100
+#define PGTLB_CACHE_SH_NSH	0b000000
+#define PGTLB_CACHE_SH_OSH	0b100000
+#define PGTLB_CACHE_SH_ISH	0b110000
+
+#define PGTLB_ATTR_DEFAULT	(PGTLB_CACHE_IR_WBRA |	\
+				 PGTLB_CACHE_OR_WBRA |	\
+				 PGTLB_CACHE_SH_ISH)
+
+#define RGTLB_TO_PGTLB 8
+#define DECODER_PAGE_ENTRY_SIZE 64
+#define DECODER_PAGE_SIZE (1 << 12)
+#define DECODER_PAGE_TABLE_SIZE (1 << 12)
+#define PAGE_TABLE_PAGE_SIZE (DECODER_PAGE_ENTRY_SIZE * DECODER_PAGE_SIZE)
+#define RANGE_TABLE_PAGE_SIZE (DECODER_PAGE_ENTRY_SIZE * \
+			       DECODER_PAGE_SIZE * \
+			       RGTLB_TO_PGTLB)
+
+void hi_register_decoder_base_addr(struct ub_bus_controller *ubc,
+				   u64 *cmd_queue, u64 *event_queue);
+
+int hi_create_decoder_table(struct ub_decoder *decoder);
+void hi_free_decoder_table(struct ub_decoder *decoder);
+
+int hi_decoder_map(struct ub_decoder *decoder, struct decoder_map_info *info);
+int hi_decoder_unmap(struct ub_decoder *decoder, phys_addr_t addr, u64 size);
+
+#endif /* __HISI_DECODER_H__ */
diff --git a/drivers/ub/ubus/vendor/hisilicon/hisi-ubus.h b/drivers/ub/ubus/vendor/hisilicon/hisi-ubus.h
index 092695e9d43c349054e4827bb188fe23f96843f6..92e97c257302baf453aba889309ed4c31e0f006c 100644
--- a/drivers/ub/ubus/vendor/hisilicon/hisi-ubus.h
+++ b/drivers/ub/ubus/vendor/hisilicon/hisi-ubus.h
@@ -43,8 +43,6 @@ int hi_mem_decoder_create(struct ub_bus_controller *ubc);
 void hi_mem_decoder_remove(struct ub_bus_controller *ubc);
 void hi_register_ubmem_irq(struct ub_bus_controller *ubc);
 void hi_unregister_ubmem_irq(struct ub_bus_controller *ubc);
-void hi_register_decoder_base_addr(struct ub_bus_controller *ubc, u64 *cmd_queue,
-				   u64 *event_queue);
 int hi_send_entity_enable_msg(struct ub_entity *uent, u8 enable);
 
 int ub_bus_controller_probe(struct ub_bus_controller *ubc);
diff --git a/drivers/ub/ubus/vendor/hisilicon/memory.c b/drivers/ub/ubus/vendor/hisilicon/memory.c
index fa9747171eeaa791ef30eb6b112ed032ffdd1924..e49a4a82322fd521c42a16c406a5c91ab18e2211 100644
--- a/drivers/ub/ubus/vendor/hisilicon/memory.c
+++ b/drivers/ub/ubus/vendor/hisilicon/memory.c
@@ -301,8 +301,8 @@ static u8 get_mem_decoder_number(struct hi_ubc_private_data *data)
 
 int hi_mem_decoder_create(struct ub_bus_controller *ubc)
 {
+	struct hi_ubc_private_data *data = ubc->data;
 	struct ub_mem_device *mem_device;
-	struct hi_ubc_private_data *data;
 	void *priv_data;
 	int ret;