Skip to content

Commit 0c314a9

Browse files
committed
Merge tag 'pci-v4.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas: - mark Extended Tags as broken on Broadcom HT1100 and HT2000 Root Ports to fix drm/Xorg hangs and unresponsive keyboards (Sinan Kaya) - remove useless messages during resource reassignment (Desnes A. Nunes do Rosario) * tag 'pci-v4.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: Remove messages about reassigning resources PCI: Mark Broadcom HT1100 and HT2000 Root Port Extended Tags as broken
2 parents 681857e + adf5845 commit 0c314a9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

drivers/pci/pci.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5628,7 +5628,6 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
56285628
return;
56295629
}
56305630

5631-
pci_info(dev, "Disabling memory decoding and releasing memory resources\n");
56325631
pci_read_config_word(dev, PCI_COMMAND, &command);
56335632
command &= ~PCI_COMMAND_MEMORY;
56345633
pci_write_config_word(dev, PCI_COMMAND, command);

drivers/pci/quirks.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4673,9 +4673,13 @@ static void quirk_no_ext_tags(struct pci_dev *pdev)
46734673

46744674
pci_walk_bus(bridge->bus, pci_configure_extended_tags, NULL);
46754675
}
4676+
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0132, quirk_no_ext_tags);
46764677
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0140, quirk_no_ext_tags);
4678+
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0141, quirk_no_ext_tags);
46774679
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0142, quirk_no_ext_tags);
46784680
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0144, quirk_no_ext_tags);
4681+
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0420, quirk_no_ext_tags);
4682+
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags);
46794683

46804684
#ifdef CONFIG_PCI_ATS
46814685
/*

drivers/pci/setup-res.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ EXPORT_SYMBOL(pci_claim_resource);
168168

169169
void pci_disable_bridge_window(struct pci_dev *dev)
170170
{
171-
pci_info(dev, "disabling bridge mem windows\n");
172-
173171
/* MMIO Base/Limit */
174172
pci_write_config_dword(dev, PCI_MEMORY_BASE, 0x0000fff0);
175173

0 commit comments

Comments
 (0)