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

Commit d83f0b39 authored by Marek Behún's avatar Marek Behún Committed by Greg Kroah-Hartman
Browse files

PCI: Call Max Payload Size-related fixup quirks early 

commit b8da302e2955fe4d41eb9d48199242674d77dbe0 upstream.

pci_device_add() calls HEADER fixups after pci_configure_device(), which
configures Max Payload Size.

Convert MPS-related fixups to EARLY fixups so pci_configure_mps() takes
them into account.

Fixes: 27d868b5 ("PCI: Set MPS to match upstream bridge")
Link: https://lore.kernel.org/r/20210624171418.27194-1-kabel@kernel.org


Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c8277e3

drivers/pci/quirks.c

+6 −6
Original line number Diff line number Diff line
@@ -3246,11 +3246,11 @@ static void fixup_mpss_256(struct pci_dev *dev) 
{

	dev->pcie_mpss = 1; /* 256 bytes */

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SOLARFLARE,

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLARFLARE,

			PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0, fixup_mpss_256);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SOLARFLARE,

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLARFLARE,

			PCI_DEVICE_ID_SOLARFLARE_SFC4000A_1, fixup_mpss_256);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SOLARFLARE,

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLARFLARE,

			PCI_DEVICE_ID_SOLARFLARE_SFC4000B, fixup_mpss_256);



/*