From 7a5520a675d383c8baa5d03cef49f63b92614701 Mon Sep 17 00:00:00 2001 From: Anmeng Zhang Date: Mon, 2 Mar 2026 16:13:24 +0800 Subject: [PATCH] anolis:gic: fix merge conflict for phytium 2000plus ANBZ: #31042 After merging patch1, qemu vm system bootup failed on ft2000plus host machine, as udev service stuck on installing kernel modules. Fix this by solvethe conflict between patch1 and patch2 properly. patch1:ed63cbbcbcb9a4259e5e701e88f8e9a565f2c730 patch2:264ad5f02b3ecde37c9079e592704a75b5f65cb0 Fixes: ed63cbbcbcb9 ("genirq/msi: Refactor iommu_dma_compose_msi_msg()") Signed-off-by: Anmeng Zhang Reviewed-by: gaorui Reviewed-by: luohaiyang --- drivers/irqchip/irq-gic-v3-its.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 99488ff0bb13..d0c8ae162673 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1731,13 +1731,17 @@ static u64 its_irq_get_msi_base(struct its_device *its_dev) static void its_irq_compose_msi_msg(struct irq_data *d, struct msi_msg *msg) { struct its_device *its_dev = irq_data_get_irq_chip_data(d); + msg->data = its_get_event_id(d); #ifdef CONFIG_ARCH_PHYTIUM - if (typeof_ft2000plus()) + if (typeof_ft2000plus()) { + u64 addr = its_dev->its->get_msi_base(its_dev); + msg->address_hi = upper_32_bits(addr); + msg->address_lo = lower_32_bits(addr); return; + } #endif - msg->data = its_get_event_id(d); msi_msg_set_addr(irq_data_get_msi_desc(d), msg, its_dev->its->get_msi_base(its_dev)); } -- Gitee