Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30e22b23 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Clean up quirk_io_region
  PCI: Use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
  PCI: Use PCI_EXP_SLTCAP_PSN mask when extracting slot number
  PCI: Remove unnecessary dependencies between PME and ACPI
  [SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
  [SCSI] mvsas: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
  ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
  PCI: Define macro for Marvell vendor ID
  PCI: Add MSI INTX_DISABLE quirks for AR8161/AR8162/AR8171/AR8172/E210X
  PCI: aer_inject: Fix return values when device not found
parents 26c0995e 65195c76

drivers/ata/ahci.c

+5 −5
Original line number Diff line number Diff line
@@ -413,17 +413,17 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	/* Marvell */

	{ PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },	/* 6145 */

	{ PCI_VDEVICE(MARVELL, 0x6121), board_ahci_mv },	/* 6121 */

	{ PCI_DEVICE(0x1b4b, 0x9123),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9123),

	  .class = PCI_CLASS_STORAGE_SATA_AHCI,

	  .class_mask = 0xffffff,

	  .driver_data = board_ahci_yes_fbs },			/* 88se9128 */

	{ PCI_DEVICE(0x1b4b, 0x9125),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9125),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9125 */

	{ PCI_DEVICE(0x1b4b, 0x917a),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x917a),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(0x1b4b, 0x9192),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 on some Gigabyte */

	{ PCI_DEVICE(0x1b4b, 0x91a3),

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),

	  .driver_data = board_ahci_yes_fbs },



	/* Promise */

drivers/pci/hotplug/pciehp_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int __init dummy_probe(struct pcie_device *dev) 
	slot = kzalloc(sizeof(*slot), GFP_KERNEL);

	if (!slot)

		return -ENOMEM;

	slot->number = slot_cap >> 19;

	slot->number = (slot_cap & PCI_EXP_SLTCAP_PSN) >> 19;

	list_for_each_entry(tmp, &dummy_slots, list) {

		if (tmp->number == slot->number)

			dup_slot_id++;

drivers/pci/pci-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -897,7 +897,7 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vma, 


	if (pci_resource_len(pdev, resno) == 0)

		return 0;

	nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;

	nr = vma_pages(vma);

	start = vma->vm_pgoff;

	size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1;

	pci_start = (mmap_api == PCI_MMAP_PROCFS) ?

drivers/pci/pcie/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -82,4 +82,4 @@ endchoice 


config PCIE_PME

	def_bool y

	depends on PCIEPORTBUS && PM_RUNTIME && ACPI
 
	depends on PCIEPORTBUS && PM_RUNTIME

drivers/pci/pcie/aer/aer_inject.c

+3 −3
Original line number Diff line number Diff line
@@ -334,13 +334,13 @@ static int aer_inject(struct aer_error_inj *einj) 
		return -ENODEV;

	rpdev = pcie_find_root_port(dev);

	if (!rpdev) {

		ret = -ENOTTY;

		ret = -ENODEV;

		goto out_put;

	}



	pos_cap_err = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);

	if (!pos_cap_err) {

		ret = -ENOTTY;

		ret = -EPERM;

		goto out_put;

	}

	pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_SEVER, &sever);
@@ -350,7 +350,7 @@ static int aer_inject(struct aer_error_inj *einj) 


	rp_pos_cap_err = pci_find_ext_capability(rpdev, PCI_EXT_CAP_ID_ERR);

	if (!rp_pos_cap_err) {

		ret = -ENOTTY;

		ret = -EPERM;

		goto out_put;

	}