[RFC PATCH 07/11] PCI/MSI: Mask MSI-X entry in msix_setup_entries()

Yijing Wang
2014-07-26T03:08:44Z

Save the MSI-X entry initial mask status in
msix_setup_entries(), also mask the entry.
This is preparation for generic MSI.

Signed-off-by: Yijing Wang <wangyijing at huawei.com>
---
 drivers/pci/msi.c |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index f96dd38..41c33da 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -672,7 +672,7 @@ static int msix_setup_entries(struct pci_dev *dev, void
__iomem *base,
 			      struct msix_entry *entries, int nvec)
 {
 	struct msi_desc *entry;
-	int i;
+	int i, offset;

 	for (i = 0; i < nvec; i++) {
 		entry = alloc_msi_entry(dev);
@@ -691,6 +691,15 @@ static int msix_setup_entries(struct pci_dev *dev, void
__iomem *base,
 		entry->msi_attrib.default_irq	= dev->irq;
 		entry->mask_base		= base;

+		msix_clear_and_set_ctrl(dev, 0,
+				PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE);
+		offset = entries[i].entry * PCI_MSIX_ENTRY_SIZE +
+						PCI_MSIX_ENTRY_VECTOR_CTRL;
+		entry->masked = readl(entry->mask_base + offset);
+		msix_mask_irq(entry, 1);
+		msix_clear_and_set_ctrl(dev,
+				PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE, 0);
+
 		list_add_tail(&entry->list, &dev->msi_list);
 	}

@@ -704,13 +713,8 @@ static void msix_program_entries(struct pci_dev *dev,
 	int i = 0;

 	list_for_each_entry(entry, &dev->msi_list, list) {
-		int offset = entries[i].entry * PCI_MSIX_ENTRY_SIZE +
-						PCI_MSIX_ENTRY_VECTOR_CTRL;
-
 		entries[i].vector = entry->irq;
 		irq_set_msi_desc(entry->irq, entry);
-		entry->masked = readl(entry->mask_base + offset);
-		msix_mask_irq(entry, 1);
 		i++;
 	}
 }
@@ -746,16 +750,13 @@ static int msix_capability_init(struct pci_dev *dev, void
__iomem *base,
 	 * MSI-X registers.  We need to mask all the vectors to prevent
 	 * interrupts coming in before they're fully set up.
 	 */
-	msix_clear_and_set_ctrl(dev, 0,
-				PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE);
-
 	msix_program_entries(dev, entries);

 	/* Set MSI-X enabled bits and unmask the function */
 	pci_intx_for_msi(dev, 0);
 	dev->msix_enabled = 1;

-	msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);
+	msix_clear_and_set_ctrl(dev, 0, PCI_MSIX_FLAGS_ENABLE);

 	return 0;

--
1.7.1