Commit f8c7e4ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4cd90083 66d28b21

arch/ia64/pci/fixup.c

+2 −2
Original line number Diff line number Diff line
@@ -76,5 +76,5 @@ static void pci_fixup_video(struct pci_dev *pdev) 
		}

	}

}

DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,

DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID,

			       PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);

arch/mips/loongson64/vbios_quirk.c

+4 −5
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <linux/pci.h>

#include <loongson.h>



static void pci_fixup_radeon(struct pci_dev *pdev)

static void pci_fixup_video(struct pci_dev *pdev)

{

	struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
@@ -22,8 +22,7 @@ static void pci_fixup_radeon(struct pci_dev *pdev) 
	res->flags = IORESOURCE_MEM | IORESOURCE_ROM_SHADOW |

		     IORESOURCE_PCI_FIXED;



	dev_info(&pdev->dev, "BAR %d: assigned %pR for Radeon ROM\n",

		 PCI_ROM_RESOURCE, res);

	dev_info(&pdev->dev, "Video device with shadowed ROM at %pR\n", res);

}

DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_VENDOR_ID_ATI, 0x9615,

				PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_radeon);
 
DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_VENDOR_ID_ATI, 0x9615,

			       PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);

arch/x86/pci/fixup.c

+2 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static void pci_fixup_video(struct pci_dev *pdev) 
		}

	}

}

DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,

DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID,

			       PCI_CLASS_DISPLAY_VGA, 8, pci_fixup_video);

drivers/pci/controller/pcie-mt7621.c

+1 −10
Original line number Diff line number Diff line
@@ -109,15 +109,6 @@ static inline void pcie_write(struct mt7621_pcie *pcie, u32 val, u32 reg) 
	writel_relaxed(val, pcie->base + reg);

}



static inline void pcie_rmw(struct mt7621_pcie *pcie, u32 reg, u32 clr, u32 set)

{

	u32 val = readl_relaxed(pcie->base + reg);



	val &= ~clr;

	val |= set;

	writel_relaxed(val, pcie->base + reg);

}



static inline u32 pcie_port_read(struct mt7621_pcie_port *port, u32 reg)

{

	return readl_relaxed(port->base + reg);
@@ -557,7 +548,7 @@ static struct platform_driver mt7621_pcie_driver = { 
	.remove = mt7621_pcie_remove,

	.driver = {

		.name = "mt7621-pci",

		.of_match_table = of_match_ptr(mt7621_pcie_ids),

		.of_match_table = mt7621_pcie_ids,

	},

};

builtin_platform_driver(mt7621_pcie_driver);