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

Commit 386ead1d authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Greg Kroah-Hartman
Browse files

PCI/MSI: Correct misleading comments 



commit 689e6b5351573c38ccf92a0dd8b3e2c2241e4aff upstream.

The comments about preserving the cached state in pci_msi[x]_shutdown() are
misleading as the MSI descriptors are freed right after those functions
return. So there is nothing to restore. Preparatory change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210729222542.621609423@linutronix.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76d81dec

drivers/pci/msi.c

+1 −4
Original line number Diff line number Diff line
@@ -960,7 +960,6 @@ static void pci_msi_shutdown(struct pci_dev *dev) 


	/* Return the device with MSI unmasked as initial states */

	mask = msi_mask(desc->msi_attrib.multi_cap);

	/* Keep cached state to be restored */

	__pci_msi_desc_mask_irq(desc, mask, 0);



	/* Restore dev->irq to its default pin-assertion IRQ */
@@ -1046,10 +1045,8 @@ static void pci_msix_shutdown(struct pci_dev *dev) 
	}



	/* Return the device with MSI-X masked as initial states */

	for_each_pci_msi_entry(entry, dev) {

		/* Keep cached states to be restored */

	for_each_pci_msi_entry(entry, dev)

		__pci_msix_desc_mask_irq(entry, 1);

	}



	pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_ENABLE, 0);

	pci_intx_for_msi(dev, 1);