Unverified Commit 3d72d212 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2344 PCI: acpiphp: linux-4.19.y bugfixes backport 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jialin Zhang <zhangjialin11@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RB4QVMYMOE4J4ALKX34VMETRGNYMRV2K/ 
Igor Mammedov (2):
  PCI: acpiphp: Reassign resources on bridge if necessary
  PCI: acpiphp: Use pci_assign_unassigned_bridge_resources() only for
    non-root bus


-- 
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I85XNK 
 
Link:https://gitee.com/openeuler/kernel/pulls/2344

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents f5d47dcb 890bcd29

drivers/pci/hotplug/acpiphp_glue.c

+6 −3
Original line number Diff line number Diff line
@@ -502,12 +502,15 @@ static void enable_slot(struct acpiphp_slot *slot, bool bridge) 
				if (pass && dev->subordinate) {

					check_hotplug_bridge(slot, dev);

					pcibios_resource_survey_bus(dev->subordinate);

					__pci_bus_size_bridges(dev->subordinate,

							       &add_list);

					if (pci_is_root_bus(bus))

						__pci_bus_size_bridges(dev->subordinate, &add_list);

				}

			}

		}

		if (pci_is_root_bus(bus))

			__pci_bus_assign_resources(bus, &add_list, NULL);

		else

			pci_assign_unassigned_bridge_resources(bus->self);

	}



	acpiphp_sanitize_bus(bus);