Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1441177

[PATCH 2/5] pci: switch msix_program_entries to use pci_msix_desc_addr

Show all headers | View raw

Instead of relying on the msix_entry structure for the vector number read
it from the msi_desc.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/pci/msi.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 0d94fbf..a385f39 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -713,11 +713,9 @@ static void msix_program_entries(struct pci_dev *dev,
 	int i = 0;
 
 	for_each_pci_msi_entry(entry, dev) {
-		int offset = entries[i].entry * PCI_MSIX_ENTRY_SIZE +
-						PCI_MSIX_ENTRY_VECTOR_CTRL;
-
 		entries[i].vector = entry->irq;
-		entry->masked = readl(entry->mask_base + offset);
+		entry->masked = readl(pci_msix_desc_addr(entry) +
+				PCI_MSIX_ENTRY_VECTOR_CTRL);
 		msix_mask_irq(entry, 1);
 		i++;
 	}
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

pci: automatic interrupt affinity for MSI/MSI-X capable devices V2 Christoph Hellwig <hch@lst.de> - 2016-07-12 11:30 +0200
  [PATCH 4/5] pci: Provide sensible irq vector alloc/free routines Christoph Hellwig <hch@lst.de> - 2016-07-12 11:30 +0200
    Re: [PATCH 4/5] pci: Provide sensible irq vector alloc/free routines Alexander Gordeev <agordeev@redhat.com> - 2016-07-12 15:00 +0200
  [PATCH 2/5] pci: switch msix_program_entries to use pci_msix_desc_addr Christoph Hellwig <hch@lst.de> - 2016-07-12 11:30 +0200
    Re: [PATCH 2/5] pci: switch msix_program_entries to use  pci_msix_desc_addr Alexander Gordeev <agordeev@redhat.com> - 2016-07-12 15:00 +0200
  Re: pci: automatic interrupt affinity for MSI/MSI-X capable devices  V2 Bjorn Helgaas <helgaas@kernel.org> - 2016-07-21 23:10 +0200
    Re: pci: automatic interrupt affinity for MSI/MSI-X capable  devices V2 Christoph Hellwig <hch@lst.de> - 2016-07-21 23:20 +0200

csiph-web