Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-4
+3
-1
MAINTAINERS
+3
-1
MAINTAINERS
···
7575
7575
7576
7576
PCI DRIVER FOR SYNOPSIS DESIGNWARE
7577
7577
M: Jingoo Han <jingoohan1@gmail.com>
7578
+
M: Pratyush Anand <pratyush.anand@gmail.com>
7578
7579
L: linux-pci@vger.kernel.org
7579
7580
S: Maintained
7580
7581
F: drivers/pci/host/*designware*
···
7589
7588
F: drivers/pci/host/pci-host-generic.c
7590
7589
7591
7590
PCIE DRIVER FOR ST SPEAR13XX
7591
+
M: Pratyush Anand <pratyush.anand@gmail.com>
7592
7592
L: linux-pci@vger.kernel.org
7593
-
S: Orphan
7593
+
S: Maintained
7594
7594
F: drivers/pci/host/*spear*
7595
7595
7596
7596
PCMCIA SUBSYSTEM
+6
-3
drivers/pci/setup-bus.c
+6
-3
drivers/pci/setup-bus.c
···
428
428
* consistent.
429
429
*/
430
430
if (add_align > dev_res->res->start) {
431
+
resource_size_t r_size = resource_size(dev_res->res);
432
+
431
433
dev_res->res->start = add_align;
432
-
dev_res->res->end = add_align +
433
-
resource_size(dev_res->res);
434
+
dev_res->res->end = add_align + r_size - 1;
434
435
435
436
list_for_each_entry(dev_res2, head, list) {
436
437
align = pci_resource_alignment(dev_res2->dev,
437
438
dev_res2->res);
438
-
if (add_align > align)
439
+
if (add_align > align) {
439
440
list_move_tail(&dev_res->list,
440
441
&dev_res2->list);
442
+
break;
443
+
}
441
444
}
442
445
}
443
446