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

Commit 456fdb26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "Resource management
   - Fix IOV sorting by alignment (Wei Yang)
   - Preserve resource size during alignment reordering (Yinghai Lu)

  Miscellaneous
    - MAINTAINERS: Add Pratyush for SPEAr13xx and DesignWare PCIe (Pratyush Anand)"

* tag 'pci-v4.1-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Preserve resource size during alignment reordering
  PCI: Fix IOV resource sorting by alignment requirement
  MAINTAINERS: Add Pratyush Anand as SPEAr13xx and DesignWare PCIe maintainer
parents 6e6f9e0b 552bc94e

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -7575,6 +7575,7 @@ F: drivers/pci/host/pci-exynos.c 


PCI DRIVER FOR SYNOPSIS DESIGNWARE

M:	Jingoo Han <jingoohan1@gmail.com>

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	drivers/pci/host/*designware*
@@ -7588,8 +7589,9 @@ F: Documentation/devicetree/bindings/pci/host-generic-pci.txt 
F:	drivers/pci/host/pci-host-generic.c



PCIE DRIVER FOR ST SPEAR13XX

M:	Pratyush Anand <pratyush.anand@gmail.com>

L:	linux-pci@vger.kernel.org

S:	Orphan

S:	Maintained

F:	drivers/pci/host/*spear*



PCMCIA SUBSYSTEM

drivers/pci/setup-bus.c

+6 −3
Original line number Diff line number Diff line
@@ -428,16 +428,19 @@ static void __assign_resources_sorted(struct list_head *head, 
		 * consistent.

		 */

		if (add_align > dev_res->res->start) {

			resource_size_t r_size = resource_size(dev_res->res);



			dev_res->res->start = add_align;

			dev_res->res->end = add_align +

				            resource_size(dev_res->res);

			dev_res->res->end = add_align + r_size - 1;



			list_for_each_entry(dev_res2, head, list) {

				align = pci_resource_alignment(dev_res2->dev,

							       dev_res2->res);

				if (add_align > align)

				if (add_align > align) {

					list_move_tail(&dev_res->list,

						       &dev_res2->list);

					break;

				}

			}

               }