Commit 0c314a95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 681857ef adf58458

drivers/pci/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -5628,7 +5628,6 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev) 
		return;

	}



	pci_info(dev, "Disabling memory decoding and releasing memory resources\n");

	pci_read_config_word(dev, PCI_COMMAND, &command);

	command &= ~PCI_COMMAND_MEMORY;

	pci_write_config_word(dev, PCI_COMMAND, command);

drivers/pci/quirks.c

+4 −0
Original line number Diff line number Diff line
@@ -4673,9 +4673,13 @@ static void quirk_no_ext_tags(struct pci_dev *pdev) 


	pci_walk_bus(bridge->bus, pci_configure_extended_tags, NULL);

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0132, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0140, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0141, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0142, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0144, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0420, quirk_no_ext_tags);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, 0x0422, quirk_no_ext_tags);



#ifdef CONFIG_PCI_ATS

/*

drivers/pci/setup-res.c

+0 −2
Original line number Diff line number Diff line
@@ -168,8 +168,6 @@ EXPORT_SYMBOL(pci_claim_resource); 


void pci_disable_bridge_window(struct pci_dev *dev)

{

	pci_info(dev, "disabling bridge mem windows\n");



	/* MMIO Base/Limit */

	pci_write_config_dword(dev, PCI_MEMORY_BASE, 0x0000fff0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE