Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pci-v5.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull pci fixes from Bjorn Helgaas:
- Fix compilation warnings in new mt7621 driver (Sergio Paracuellos)
- Restore the sysfs "rom" file for VGA shadow ROMs, which was broken
when converting "rom" to be a static attribute (Bjorn Helgaas)
* tag 'pci-v5.17-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/sysfs: Find shadow ROM before static attribute initialization
PCI: mt7621: Remove unused function pcie_rmw()
PCI: mt7621: Drop of_match_ptr() to avoid unused variable
+9
-19
+2
-2
arch/ia64/pci/fixup.c
+2
-2
arch/ia64/pci/fixup.c
+4
-5
arch/mips/loongson64/vbios_quirk.c
+4
-5
arch/mips/loongson64/vbios_quirk.c
···
3
3
#include <linux/pci.h>
4
4
#include <loongson.h>
5
5
6
-
static void pci_fixup_radeon(struct pci_dev *pdev)
6
+
static void pci_fixup_video(struct pci_dev *pdev)
7
7
{
8
8
struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
9
9
···
22
22
res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |
23
23
IORESOURCE_PCI_FIXED;
24
24
25
-
dev_info(&pdev->dev, "BAR %d: assigned %pR for Radeon ROM\n",
26
-
PCI_ROM_RESOURCE, res);
25
+
dev_info(&pdev->dev, "Video device with shadowed ROM at %pR\n", res);
27
26
}
28
-
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, 0x9615,
29
-
PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_radeon);
27
+
DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_ATI, 0x9615,
28
+
PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
+2
-2
arch/x86/pci/fixup.c
+2
-2
arch/x86/pci/fixup.c
···
353
353
}
354
354
}
355
355
}
356
-
DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,
357
-
PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
356
+
DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID,
357
+
PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);
358
358
359
359
360
360
static const struct dmi_system_id msi_k8t_dmi_table[] = {
+1
-10
drivers/pci/controller/pcie-mt7621.c
+1
-10
drivers/pci/controller/pcie-mt7621.c
···
109
109
writel_relaxed(val, pcie->base + reg);
110
110
}
111
111
112
-
static inline void pcie_rmw(struct mt7621_pcie *pcie, u32 reg, u32 clr, u32 set)
113
-
{
114
-
u32 val = readl_relaxed(pcie->base + reg);
115
-
116
-
val &= ~clr;
117
-
val |= set;
118
-
writel_relaxed(val, pcie->base + reg);
119
-
}
120
-
121
112
static inline u32 pcie_port_read(struct mt7621_pcie_port *port, u32 reg)
122
113
{
123
114
return readl_relaxed(port->base + reg);
···
548
557
.remove = mt7621_pcie_remove,
549
558
.driver = {
550
559
.name = "mt7621-pci",
551
-
.of_match_table = of_match_ptr(mt7621_pcie_ids),
560
+
.of_match_table = mt7621_pcie_ids,
552
561
},
553
562
};
554
563
builtin_platform_driver(mt7621_pcie_driver);