Commit 830dfe88 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI/MSI: Move MSI/MSI-X flags updaters to msi.c 

pci_msi_set_enable() and pci_msix_clear_and_set_ctrl() are only used from
msi.c, so move them from drivers/pci/pci.h to msi.c.  No functional change
intended.

Link: https://lore.kernel.org/r/20201203185110.1583077-3-helgaas@kernel.org


Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
parent cbc40d5c

drivers/pci/msi.c

+21 −0
Original line number Diff line number Diff line
@@ -412,6 +412,17 @@ static void pci_intx_for_msi(struct pci_dev *dev, int enable) 
		pci_intx(dev, enable);

}



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_restore_msi_state(struct pci_dev *dev)

{

	u16 control;
@@ -434,6 +445,16 @@ static void __pci_restore_msi_state(struct pci_dev *dev) 
	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 void __pci_restore_msix_state(struct pci_dev *dev)

{

	struct msi_desc *entry;

drivers/pci/pci.h

+0 −21
Original line number Diff line number Diff line
@@ -187,27 +187,6 @@ void pci_no_msi(void); 
static inline void pci_no_msi(void) { }

#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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE