From aa034b2ab786f470d85757a7020efeb9735553e0 Mon Sep 17 00:00:00 2001 From: Old-Ding <35417409+Old-Ding@users.noreply.github.com> Date: Mon, 6 Jul 2026 04:30:13 +0800 Subject: [PATCH] drivers: pci: Fix endpoint MSI setup rt_pci_ep_set_msi() checked the set_msix callback before calling set_msi. That rejects endpoint controllers that implement MSI without MSI-X, and can call through a NULL set_msi pointer when only MSI-X is provided. The same helper converts a requested MSI vector count into the log2 field passed to the controller. Stop after the first value large enough for the request so smaller requests are not widened by later loop iterations. Generated-by: OpenAI Codex Signed-off-by: Old-Ding <35417409+Old-Ding@users.noreply.github.com> --- components/drivers/pci/endpoint/endpoint.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/drivers/pci/endpoint/endpoint.c b/components/drivers/pci/endpoint/endpoint.c index 70dbe2ad27e..a69384bd43e 100644 --- a/components/drivers/pci/endpoint/endpoint.c +++ b/components/drivers/pci/endpoint/endpoint.c @@ -182,7 +182,7 @@ rt_err_t rt_pci_ep_set_msi(struct rt_pci_ep *ep, rt_uint8_t func_no, if (ep && ep->ops && func_no < ep->max_functions) { - if (ep->ops->set_msix) + if (ep->ops->set_msi) { err = -RT_EINVAL; @@ -193,6 +193,7 @@ rt_err_t rt_pci_ep_set_msi(struct rt_pci_ep *ep, rt_uint8_t func_no, rt_mutex_take(&ep->lock, RT_WAITING_FOREVER); err = ep->ops->set_msi(ep, func_no, log2); rt_mutex_release(&ep->lock); + break; } } }