]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
NTB: epf: Report 0-based doorbell vector via ntb_db_event()
authorKoichiro Den <den@valinux.co.jp>
Wed, 13 May 2026 02:49:21 +0000 (11:49 +0900)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 23 Jun 2026 16:37:44 +0000 (11:37 -0500)
ntb_db_event() expects the vector number to be relative to the first
doorbell vector starting at 0.

Vector 0 is reserved for link events in the EPF driver, so doorbells
start at vector 1. However, both supported peers (ntb_hw_epf with
pci-epf-ntb, and pci-epf-vntb) have historically skipped vector 1 and
started doorbells at vector 2.

Pass (irq_no - 2) to ntb_db_event() so doorbells are reported as 0..N-1.
If irq_no == 1 is ever observed, warn and ignore it, since the slot is
reserved in the legacy layout and reporting it as DB#0 would collide with
the real DB#0 slot.

Fixes: 812ce2f8d14e ("NTB: Add support for EPF PCI Non-Transparent Bridge")
Suggested-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Koichiro Den <den@valinux.co.jp>
Signed-off-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Dave Jiang <dave.jiang@intel.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://patch.msgid.link/20260513024923.451765-11-den@valinux.co.jp
drivers/ntb/hw/epf/ntb_hw_epf.c

index c0bab3292075ce40bf624ce61eb0a491f3d41a3c..7b0fc7ef00c6716ba77b75d263da25aecab0439b 100644 (file)
@@ -81,6 +81,12 @@ enum epf_ntb_bar {
        NTB_BAR_NUM,
 };
 
+enum epf_irq_slot {
+       EPF_IRQ_LINK = 0,
+       EPF_IRQ_RESERVED_DB, /* Historically skipped slot */
+       EPF_IRQ_DB_START,
+};
+
 #define NTB_EPF_MAX_MW_COUNT   (NTB_BAR_NUM - BAR_MW1)
 
 struct ntb_epf_dev {
@@ -334,10 +340,14 @@ static irqreturn_t ntb_epf_vec_isr(int irq, void *dev)
        irq_no = irq - ndev->irq_base;
        ndev->db_val = irq_no + 1;
 
-       if (irq_no == 0)
+       if (irq_no == EPF_IRQ_LINK) {
                ntb_link_event(&ndev->ntb);
-       else
-               ntb_db_event(&ndev->ntb, irq_no);
+       } else if (irq_no == EPF_IRQ_RESERVED_DB) {
+               dev_warn_ratelimited(ndev->dev,
+                                    "Unexpected reserved doorbell slot IRQ received\n");
+       } else {
+               ntb_db_event(&ndev->ntb, irq_no - EPF_IRQ_DB_START);
+       }
 
        return IRQ_HANDLED;
 }