mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

pci-v4.17-changes-2

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCgAyFiEEgMe7l+5h9hnxdsnuWYigwDrT+vwFAlrPrK4UHGJoZWxnYWFz
 QGdvb2dsZS5jb20ACgkQWYigwDrT+vyxAA//dvZKCB6q3F35BKfCBYnKz+OQQbc0
 QcS439tYRLxNzvD1pffLJtlRGQKAPUyBvkIgdq+J2jgqbFgY18UY5vgztQgELzrI
 75qMuwq57m4K5tdO2+sjO9i7d0F2TXG4Nr82ZcWYZseQoAjIOYjh9NGErVeirXME
 g/viDWlPvfQIi0MgMO6BEyCXMg3iNwr+10XoutI3j+Z8Mdd/uD33vy8lzPu+OIsc
 dS4N0trnpjpc4hZngtGfctuHmvjnZojkSdlGyN///xpTbOHhtgjWud9nCB4Ti246
 3RqClg3id3ll+58dHt5cnsyLjd2YTsT1wtuq5gXDWkA1iFbRWsGMXS483sMnBNAG
 wlbkDgEPNb0u6HRgjSaBv0zpXIvP6d6g8SIOtbeJdlHPPEJ184GHKeCGmg3/Shwl
 sYsvmrCcYI1sMEIEYDf6W08bI9RhfS2khBZHBYz9yZwe7oEGYHIx7MaSht5naYcx
 c4xv9DPC2a/hgGa09D05kY16B9Q/R2PU21HLUEQuP5dkpaB4BJgFZnRFHq3y0hgg
 zJDh1FKJ6sKnHkNcbRJPRXJiUN+PODsJPVCrZtufc5uFHymtGFzybynddPazwU+K
 aete0l/O/bS3ta5qnBw8VqoxqQ+syqb4i+kD3PNHoufuTLUnfCSEoehduktO2AoZ
 HqCYa3VuuKq40cY=
 =tmVM
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2018-04-12 20:50:38 -07:00
commit 0c314a9515
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/pci/pci.c
View file

@ -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);

4
drivers/pci/quirks.c
View file

@ -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
/*

2
drivers/pci/setup-res.c
View file

@ -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);