Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-3
+3
-2
drivers/pci/probe.c
+3
-2
drivers/pci/probe.c
···
339
339
return (res->flags & IORESOURCE_MEM_64) ? 1 : 0;
340
340
}
341
341
342
-
static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
342
+
static __always_inline void pci_read_bases(struct pci_dev *dev,
343
+
unsigned int howmany, int rom)
343
344
{
344
345
u32 rombar, stdbars[PCI_STD_NUM_BARS];
345
346
unsigned int pos, reg;
346
347
u16 orig_cmd;
347
348
348
-
BUILD_BUG_ON(howmany > PCI_STD_NUM_BARS);
349
+
BUILD_BUG_ON(statically_true(howmany > PCI_STD_NUM_BARS));
349
350
350
351
if (dev->non_compliant_bars)
351
352
return;
+2
-1
drivers/pci/quirks.c
+2
-1
drivers/pci/quirks.c
···
5522
5522
* AMD Matisse USB 3.0 Host Controller 0x149c
5523
5523
* Intel 82579LM Gigabit Ethernet Controller 0x1502
5524
5524
* Intel 82579V Gigabit Ethernet Controller 0x1503
5525
-
*
5525
+
* Mediatek MT7922 802.11ax PCI Express Wireless Network Adapter
5526
5526
*/
5527
5527
static void quirk_no_flr(struct pci_dev *dev)
5528
5528
{
···
5534
5534
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
5535
5535
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
5536
5536
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
5537
+
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_MEDIATEK, 0x0616, quirk_no_flr);
5537
5538
5538
5539
/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
5539
5540
static void quirk_no_flr_snet(struct pci_dev *dev)