Commit 0caa17f5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Convert PCIe capability PCIBIOS errors to errno (Bolarinwa Olayemi
  Saheed)

- Align PCIe capability and PCI accessor return values (Bolarinwa Olayemi
  Saheed)

- Replace http:// links with https:// (Alexander A. Klimov)

- Replace lkml.org, spinics, gmane with lore.kernel.org (Bjorn Helgaas)

- Update panic message to mention kzalloc(), not kmalloc() (Liao Pingfang)

- Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h (Huacai Chen)

- Remove unused pci_lost_interrupt() (Heiner Kallweit)

* pci/misc:
  PCI: Remove unused pci_lost_interrupt()
  PCI: Move PCI_VENDOR_ID_REDHAT definition to pci_ids.h
  PCI: Fix error in panic message
  PCI: Replace lkml.org, spinics, gmane with lore.kernel.org
  PCI: Replace http:// links with https://
  PCI: Align PCIe capability and PCI accessor return values
  PCI: Convert PCIe capability PCIBIOS errors to errno
parents e8c4a765 2167c406

Documentation/PCI/pci.rst

+4 −5
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ PCI device drivers. 
A more complete resource is the third edition of "Linux Device Drivers"

by Jonathan Corbet, Alessandro Rubini, and Greg Kroah-Hartman.

LDD3 is available for free (under Creative Commons License) from:

http://lwn.net/Kernel/LDD3/.

https://lwn.net/Kernel/LDD3/.



However, keep in mind that all documents are subject to "bit rot".

Refer to the source code if things are not working as described here.
@@ -214,7 +214,7 @@ the PCI device by calling pci_enable_device(). This will: 
   problem and unlikely to get fixed soon.



   This has been discussed before but not changed as of 2.6.19:

   http://lkml.org/lkml/2006/3/2/194

   https://lore.kernel.org/r/20060302180025.GC28895@flint.arm.linux.org.uk/





pci_set_master() will enable DMA by setting the bus master bit
@@ -514,9 +514,8 @@ your driver if they're helpful, or just use plain hex constants. 
The device IDs are arbitrary hex numbers (vendor controlled) and normally used

only in a single location, the pci_device_id table.



Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.

There are mirrors of the pci.ids file at http://pciids.sourceforge.net/

and https://github.com/pciutils/pciids.

Please DO submit new vendor/device IDs to https://pci-ids.ucw.cz/.

There's a mirror of the pci.ids file at https://github.com/pciutils/pciids.





Obsolete functions

Documentation/devicetree/bindings/pci/pci.txt

+2 −2
Original line number Diff line number Diff line 
PCI bus bridges have standardized Device Tree bindings:



PCI Bus Binding to: IEEE Std 1275-1994

http://www.devicetree.org/open-firmware/bindings/pci/pci2_1.pdf

https://www.devicetree.org/open-firmware/bindings/pci/pci2_1.pdf



And for the interrupt mapping part:



Open Firmware Recommended Practice: Interrupt Mapping

http://www.devicetree.org/open-firmware/practice/imap/imap0_9d.pdf

https://www.devicetree.org/open-firmware/practice/imap/imap0_9d.pdf



Additionally to the properties specified in the above standards a host bridge

driver implementation may support the following properties:

arch/x86/pci/fixup.c

+2 −2
Original line number Diff line number Diff line
@@ -557,12 +557,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x27B9, twinhead_reserve_killing_z 
 * Device [8086:2fc0]

 * Erratum HSE43

 * CONFIG_TDP_NOMINAL CSR Implemented at Incorrect Offset

 * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v3-spec-update.html

 * https://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v3-spec-update.html

 *

 * Devices [8086:6f60,6fa0,6fc0]

 * Erratum BDF2

 * PCI BARs in the Home Agent Will Return Non-Zero Values During Enumeration

 * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html

 * https://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html

 */

static void pci_invalid_bar(struct pci_dev *dev)

{

drivers/dma/ioat/init.c

+2 −2
Original line number Diff line number Diff line
@@ -1195,13 +1195,13 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca) 
	/* disable relaxed ordering */

	err = pcie_capability_read_word(pdev, IOAT_DEVCTRL_OFFSET, &val16);

	if (err)

		return err;

		return pcibios_err_to_errno(err);



	/* clear relaxed ordering enable */

	val16 &= ~IOAT_DEVCTRL_ROE;

	err = pcie_capability_write_word(pdev, IOAT_DEVCTRL_OFFSET, val16);

	if (err)

		return err;

		return pcibios_err_to_errno(err);



	if (ioat_dma->cap & IOAT_CAP_DPS)

		writeb(ioat_pending_level + 1,

drivers/gpu/drm/qxl/qxl_dev.h

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ enum SpiceCursorType { 


#pragma pack(push, 1)



#define REDHAT_PCI_VENDOR_ID 0x1b36



/* 0x100-0x11f reserved for spice, 0x1ff used for unstable work */

#define QXL_DEVICE_ID_STABLE 0x0100