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

Commit 6a25f5e3 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Bjorn Helgaas
Browse files

PCI/MSI: Export pci_msi_set_enable(), pci_msix_clear_and_set_ctrl() 



Move pci_msi_set_enable() and pci_msix_clear_and_set_ctrl() to
drivers/pci/pci.h so they're available even when MSI isn't configured
into the kernel.

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 61b64abd

drivers/pci/msi.c

+0 −21
Original line number Diff line number Diff line
@@ -185,27 +185,6 @@ void __weak arch_restore_msi_irqs(struct pci_dev *dev) 
	return default_restore_msi_irqs(dev);

}



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

{

	u16 control;



	pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);

	control &= ~PCI_MSI_FLAGS_ENABLE;

	if (enable)

		control |= PCI_MSI_FLAGS_ENABLE;

	pci_write_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, control);

}



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

{

	u16 ctrl;



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

	ctrl &= ~clear;

	ctrl |= set;

	pci_write_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, ctrl);

}



static inline __attribute_const__ u32 msi_mask(unsigned x)

{

	/* Don't shift by >= width of type */

drivers/pci/pci.h

+21 −0
Original line number Diff line number Diff line
@@ -146,6 +146,27 @@ static inline void pci_no_msi(void) { } 
static inline void pci_msi_init_pci_dev(struct pci_dev *dev) { }

#endif



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

{

	u16 control;



	pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);

	control &= ~PCI_MSI_FLAGS_ENABLE;

	if (enable)

		control |= PCI_MSI_FLAGS_ENABLE;

	pci_write_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, control);

}



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

{

	u16 ctrl;



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

	ctrl &= ~clear;

	ctrl |= set;

	pci_write_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, ctrl);

}



void pci_realloc_get_opt(char *);



static inline int pci_no_d1d2(struct pci_dev *dev)