Commit 78a632a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v6.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci 

Pull pci fixes from Bjorn Helgaas:

 - Update a BUILD_BUG_ON() usage that works on current compilers, but
   breaks compilation on gcc 5.3.1 (Alex Williamson)

 - Avoid use of FLR for Mediatek MT7922 WiFi; the device previously
   worked after a long timeout and fallback to SBR, but after a recent
   RRS change it doesn't work at all after FLR (Bjorn Helgaas)

* tag 'pci-v6.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: Avoid FLR for Mediatek MT7922 WiFi
  PCI: Fix BUILD_BUG_ON usage for old gcc
parents 3f2ca7b8 81f64e92

drivers/pci/probe.c

+3 −2
Original line number Diff line number Diff line
@@ -339,13 +339,14 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
	return (res->flags & IORESOURCE_MEM_64) ? 1 : 0;

}



static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)

static __always_inline void pci_read_bases(struct pci_dev *dev,

					   unsigned int howmany, int rom)

{

	u32 rombar, stdbars[PCI_STD_NUM_BARS];

	unsigned int pos, reg;

	u16 orig_cmd;



	BUILD_BUG_ON(howmany > PCI_STD_NUM_BARS);

	BUILD_BUG_ON(statically_true(howmany > PCI_STD_NUM_BARS));



	if (dev->non_compliant_bars)

		return;

drivers/pci/quirks.c

+2 −1
Original line number Diff line number Diff line
@@ -5522,7 +5522,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x443, quirk_intel_qat_vf_cap); 
 * AMD Matisse USB 3.0 Host Controller 0x149c

 * Intel 82579LM Gigabit Ethernet Controller 0x1502

 * Intel 82579V Gigabit Ethernet Controller 0x1503

 *

 * Mediatek MT7922 802.11ax PCI Express Wireless Network Adapter

 */

static void quirk_no_flr(struct pci_dev *dev)

{
@@ -5534,6 +5534,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x149c, quirk_no_flr); 
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_MEDIATEK, 0x0616, quirk_no_flr);



/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */

static void quirk_no_flr_snet(struct pci_dev *dev)