Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61b64abd authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Bjorn Helgaas
Browse files

PCI/MSI: Rename msi_set_enable(), msix_clear_and_set_ctrl() 



Rename msi_set_enable() to pci_msi_set_enable() and
msix_clear_and_set_ctrl() to pci_msix_clear_and_set_ctrl().

No functional change.

[bhelgaas: changelog, split into separate patch]
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
parent 5ebe6afa

drivers/pci/msi.c

+14 −14
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void __weak arch_restore_msi_irqs(struct pci_dev *dev) 
	return default_restore_msi_irqs(dev);

}



static void msi_set_enable(struct pci_dev *dev, int enable)

static void pci_msi_set_enable(struct pci_dev *dev, int enable)

{

	u16 control;
@@ -196,7 +196,7 @@ static void msi_set_enable(struct pci_dev *dev, int enable) 
	pci_write_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, control);

}



static void msix_clear_and_set_ctrl(struct pci_dev *dev, u16 clear, u16 set)

static void pci_msix_clear_and_set_ctrl(struct pci_dev *dev, u16 clear, u16 set)

{

	u16 ctrl;
@@ -452,7 +452,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev) 
	entry = irq_get_msi_desc(dev->irq);



	pci_intx_for_msi(dev, 0);

	msi_set_enable(dev, 0);

	pci_msi_set_enable(dev, 0);

	arch_restore_msi_irqs(dev);



	pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
@@ -473,14 +473,14 @@ static void __pci_restore_msix_state(struct pci_dev *dev) 


	/* route the table */

	pci_intx_for_msi(dev, 0);

	msix_clear_and_set_ctrl(dev, 0,

	pci_msix_clear_and_set_ctrl(dev, 0,

				PCI_MSIX_FLAGS_ENABLE | PCI_MSIX_FLAGS_MASKALL);



	arch_restore_msi_irqs(dev);

	list_for_each_entry(entry, &dev->msi_list, list)

		msix_mask_irq(entry, entry->masked);



	msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);

	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);

}



void pci_restore_msi_state(struct pci_dev *dev)
@@ -647,7 +647,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) 
	int ret;

	unsigned mask;



	msi_set_enable(dev, 0);	/* Disable MSI during set up */

	pci_msi_set_enable(dev, 0);	/* Disable MSI during set up */



	entry = msi_setup_entry(dev, nvec);

	if (!entry)
@@ -683,7 +683,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) 


	/* Set MSI enabled bits	 */

	pci_intx_for_msi(dev, 0);

	msi_set_enable(dev, 1);

	pci_msi_set_enable(dev, 1);

	dev->msi_enabled = 1;



	dev->irq = entry->irq;
@@ -775,7 +775,7 @@ static int msix_capability_init(struct pci_dev *dev, 
	void __iomem *base;



	/* Ensure MSI-X is disabled while it is set up */

	msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);



	pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control);

	/* Request & Map MSI-X table region */
@@ -801,7 +801,7 @@ static int msix_capability_init(struct pci_dev *dev, 
	 * 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_clear_and_set_ctrl(dev, 0,

				PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE);



	msix_program_entries(dev, entries);
@@ -814,7 +814,7 @@ static int msix_capability_init(struct pci_dev *dev, 
	pci_intx_for_msi(dev, 0);

	dev->msix_enabled = 1;



	msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);

	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0);



	return 0;
@@ -919,7 +919,7 @@ void pci_msi_shutdown(struct pci_dev *dev) 
	BUG_ON(list_empty(&dev->msi_list));

	desc = list_first_entry(&dev->msi_list, struct msi_desc, list);



	msi_set_enable(dev, 0);

	pci_msi_set_enable(dev, 0);

	pci_intx_for_msi(dev, 1);

	dev->msi_enabled = 0;
@@ -1027,7 +1027,7 @@ void pci_msix_shutdown(struct pci_dev *dev) 
		__pci_msix_desc_mask_irq(entry, 1);

	}



	msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

	pci_intx_for_msi(dev, 1);

	dev->msix_enabled = 0;

}
@@ -1069,11 +1069,11 @@ void pci_msi_init_pci_dev(struct pci_dev *dev) 
	 */

	dev->msi_cap = pci_find_capability(dev, PCI_CAP_ID_MSI);

	if (dev->msi_cap)

		msi_set_enable(dev, 0);

		pci_msi_set_enable(dev, 0);



	dev->msix_cap = pci_find_capability(dev, PCI_CAP_ID_MSIX);

	if (dev->msix_cap)

		msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

		pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

}



/**