From f0942c09a5cf0eb52de419aeaf1067d7798fd60e Mon Sep 17 00:00:00 2001 From: Junlong Zheng Date: Wed, 10 Dec 2025 20:24:13 +0800 Subject: [PATCH 1/2] ub:hisi-ubus: fix MUE unreg msg rsp time drivers inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ID700V CVE: NA ----------------------------------------------------------- 1. During MUE deregistration processing, first send a response to the control plane, then proceed with the device destruction process. 2. Add entity number to the uent release log. Fixes: 86fec00cb73a ("ub:hisi-ubus: Support UBUS vdm entity enable message") Signed-off-by: Junlong Zheng --- drivers/ub/ubus/ubus_entity.c | 4 +++- drivers/ub/ubus/vendor/hisilicon/vdm.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/ub/ubus/ubus_entity.c b/drivers/ub/ubus/ubus_entity.c index b43d682ba3d8..105c6f396b44 100644 --- a/drivers/ub/ubus/ubus_entity.c +++ b/drivers/ub/ubus/ubus_entity.c @@ -463,6 +463,7 @@ EXPORT_SYMBOL_GPL(ub_start_ent); static void ub_release_ent(struct device *dev) { struct ub_entity *uent; + u32 uent_num; uent = to_ub_entity(dev); if (is_primary(uent) && !is_p_device(uent)) { @@ -480,8 +481,9 @@ static void ub_release_ent(struct device *dev) kfree(uent->driver_override); uent->token_value = 0; + uent_num = uent->uent_num; kfree(uent); - pr_info("uent release\n"); + pr_info("uent[%#x] release\n", uent_num); } void ub_stop_ent(struct ub_entity *uent) diff --git a/drivers/ub/ubus/vendor/hisilicon/vdm.c b/drivers/ub/ubus/vendor/hisilicon/vdm.c index 4a19e0fb8d57..329bc51b5a0e 100644 --- a/drivers/ub/ubus/vendor/hisilicon/vdm.c +++ b/drivers/ub/ubus/vendor/hisilicon/vdm.c @@ -256,10 +256,11 @@ static u8 ub_idevice_pue_rls_handler(struct ub_bus_controller *ubc, struct vdm_m status = UB_MSG_RSP_SUCCESS; } + ub_vdm_msg_rsp(ubc, pkt, status); + if (status == UB_MSG_RSP_SUCCESS) ub_disable_ent(uent); - ub_vdm_msg_rsp(ubc, pkt, status); return status; } -- Gitee From 9147e429cddb371664aeb08f8ed5af680cb6054a Mon Sep 17 00:00:00 2001 From: Jianquan-Lin Date: Tue, 16 Dec 2025 09:58:16 +0800 Subject: [PATCH 2/2] ub:ubus: Change create device irq domain debug info drivers inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/ID700V CVE: NA ----------------------------------------------------------- Change create device irq domain debug info. Fixes: 81962d0ecc6e ("ub:ubus: Support UBUS Interrupt framework") Signed-off-by: Junlong Zheng Signed-off-by: Jianquan Lin --- drivers/ub/ubus/msi/irqdomain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ub/ubus/msi/irqdomain.c b/drivers/ub/ubus/msi/irqdomain.c index 5a01c40368bc..83da28e03fc7 100644 --- a/drivers/ub/ubus/msi/irqdomain.c +++ b/drivers/ub/ubus/msi/irqdomain.c @@ -95,7 +95,7 @@ static bool ub_create_device_domain(struct ub_entity *uent, return true; if (WARN_ON_ONCE(1)) - pr_info("TODO: create device irq domain.\n"); + pr_err("Create device irq domain failed.\n"); return false; } -- Gitee