diff mbox series

[2/2] PCI/portdrv: allocate MSI/MSIx vector for DPC RP service

Message ID 1494930342-7132-3-git-send-email-gabriele.paoloni@huawei.com
State Superseded
Headers show
Series PCI/portdrv: add MSI support for PCIe port services and DPC IRQ support | expand

Commit Message

Gabriele Paoloni May 16, 2017, 10:25 a.m. UTC 
From: gabriele paoloni <gabriele.paoloni@huawei.com>


Currently the MSI/MSIx vectors for the root port services are
allocated calling pcie_init_service_irqs(). At the moment these
vectors are only allocated for AER, PME, HP.
This patch allocate an MSI/MSIx vector also for DPC.

Signed-off-by: Liudongdong <liudongdong3@huawei.com>

Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com>

---
 drivers/pci/pcie/portdrv_core.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

-- 
2.7.4

Comments

Christoph Hellwig May 16, 2017, 12:11 p.m. UTC | #1 
> +		 * pci_irq_vector() below is able to handle entry differently

> +		 * depending on MSI vs MSI-x case

> +		 *


No need to mention that for every users.

Except for that this looks fine:

Reviewed-by: Christoph Hellwig <hch@lst.de>
Gabriele Paoloni May 16, 2017, 3:27 p.m. UTC | #2 
Hi Christoph

> -----Original Message-----

> From: Christoph Hellwig [mailto:hch@infradead.org]

> Sent: 16 May 2017 13:11

> To: Gabriele Paoloni

> Cc: bhelgaas@google.com; helgaas@kernel.org; Linuxarm; linux-

> pci@vger.kernel.org; lukas@wunner.de; linux-kernel@vger.kernel.org;

> mika.westerberg@linux.intel.com

> Subject: Re: [PATCH 2/2] PCI/portdrv: allocate MSI/MSIx vector for DPC

> RP service

> 

> > +		 * pci_irq_vector() below is able to handle entry

> differently

> > +		 * depending on MSI vs MSI-x case

> > +		 *


Ok I'll remove this in V2

> 

> No need to mention that for every users.

> 

> Except for that this looks fine:

> 

> Reviewed-by: Christoph Hellwig <hch@lst.de>


Many thanks
Gab
diff mbox series

Patch

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index e2c7bfd..477bf14 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -131,6 +131,35 @@  int pcie_port_enable_msix_or_msi(struct pci_dev *dev, int *irqs, int mask)
 		nvec = max(nvec, entry + 1);
 	}
 
+	if (mask & PCIE_PORT_SERVICE_DPC) {
+		u16 reg16, pos;
+
+		/*
+		 * The code below follows Section 6.2.10.1 of the PCI Express
+		 * Base Specification 4.0 stating that bits 4-0 of DPC
+		 * Capability Register contain a value indicating which of the
+		 * MSI/MSI-X vectors assigned to the port is going to be used
+		 * for DPC, where "For MSI-X, the value in this register
+		 * indicates which MSI-X Table entry is used to generate the
+		 * interrupt message." and "For MSI, the value in this field
+		 * indicates the offset between the base Message Data and the
+		 * interrupt message that is generated."
+		 *
+		 * pci_irq_vector() below is able to handle entry differently
+		 * depending on MSI vs MSI-x case
+		 *
+		 */
+		pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_DPC);
+		pci_read_config_word(dev, pos + PCI_EXP_DPC_CAP, &reg16);
+		entry = reg16 & 0x1f;
+		if (entry >= nr_entries)
+			goto out_free_irqs;
+
+		irqs[PCIE_PORT_SERVICE_DPC_SHIFT] = pci_irq_vector(dev, entry);
+
+		nvec = max(nvec, entry + 1);
+	}
+
 	/*
 	 * If nvec is equal to the allocated number of entries, we can just use
 	 * what we have.  Otherwise, the port has some extra entries not for the