UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI: hv: Set ->domain_nr of pci_host_bridge at probing time 

No functional change, just store and maintain the PCI domain number in
the ->domain_nr of pci_host_bridge. Note that we still need to keep
the copy of domain number in x86-specific pci_sysdata, because x86 is
not a PCI_DOMAINS_GENERIC=y architecture, so the ->domain_nr of
pci_host_bridge doesn't work for it yet.

Link: https://lore.kernel.org/r/20210726180657.142727-7-boqun.feng@gmail.com
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
This commit is contained in:
Boqun Feng 2021-07-27 02:06:55 +08:00 committed by Lorenzo Pieralisi
parent 418cb6c8e0
commit 38c0d266dc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/controller/pci-hyperv.c
View File

@ -2299,7 +2299,7 @@ static void hv_eject_device_work(struct work_struct *work)
* because hbus->bridge->bus may not exist yet. * because hbus->bridge->bus may not exist yet.
*/ */
wslot = wslot_to_devfn(hpdev->desc.win_slot.slot); wslot = wslot_to_devfn(hpdev->desc.win_slot.slot);
pdev = pci_get_domain_bus_and_slot(hbus->sysdata.domain, 0, wslot); pdev = pci_get_domain_bus_and_slot(hbus->bridge->domain_nr, 0, wslot);
if (pdev) { if (pdev) {
pci_lock_rescan_remove(); pci_lock_rescan_remove();
pci_stop_and_remove_bus_device(pdev); pci_stop_and_remove_bus_device(pdev);
@ -3071,6 +3071,7 @@ static int hv_pci_probe(struct hv_device *hdev,
"PCI dom# 0x%hx has collision, using 0x%hx", "PCI dom# 0x%hx has collision, using 0x%hx",
dom_req, dom); dom_req, dom);
hbus->bridge->domain_nr = dom;
hbus->sysdata.domain = dom; hbus->sysdata.domain = dom;
hbus->hdev = hdev; hbus->hdev = hdev;
@ -3080,7 +3081,7 @@ static int hv_pci_probe(struct hv_device *hdev,
spin_lock_init(&hbus->device_list_lock); spin_lock_init(&hbus->device_list_lock);
spin_lock_init(&hbus->retarget_msi_interrupt_lock); spin_lock_init(&hbus->retarget_msi_interrupt_lock);
hbus->wq = alloc_ordered_workqueue("hv_pci_%x", 0, hbus->wq = alloc_ordered_workqueue("hv_pci_%x", 0,
hbus->sysdata.domain); hbus->bridge->domain_nr);
if (!hbus->wq) { if (!hbus->wq) {
ret = -ENOMEM; ret = -ENOMEM;
goto free_dom; goto free_dom;
@ -3207,7 +3208,7 @@ close:
destroy_wq: destroy_wq:
destroy_workqueue(hbus->wq); destroy_workqueue(hbus->wq);
free_dom: free_dom:
hv_put_dom_num(hbus->sysdata.domain); hv_put_dom_num(hbus->bridge->domain_nr);
free_bus: free_bus:
kfree(hbus); kfree(hbus);
return ret; return ret;
@ -3315,7 +3316,7 @@ static int hv_pci_remove(struct hv_device *hdev)
irq_domain_remove(hbus->irq_domain); irq_domain_remove(hbus->irq_domain);
irq_domain_free_fwnode(hbus->sysdata.fwnode); irq_domain_free_fwnode(hbus->sysdata.fwnode);
hv_put_dom_num(hbus->sysdata.domain); hv_put_dom_num(hbus->bridge->domain_nr);
kfree(hbus); kfree(hbus);
return ret; return ret;