shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "PCIe: dw: rockchip: Setting rk_pcie_hot_rst_wq before interrupt unmask"

Browse Source 
This reverts commit 709dbbec5e.

Change-Id: Id8c813c377fd404c244692bf169ecab4c3c98171
This commit is contained in:
Dongjin Kim
2023-11-06 14:10:52 +09:00
parent f7473a5371
commit fcdb66609c
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pci/controller/dwc/pcie-dw-rockchip.c
View File

@@ -2093,14 +2093,6 @@ retry_regulator:
if (device_property_read_bool(dev, "rockchip,skip-scan-in-resume"))
rk_pcie->skip_scan_in_resume = true;
rk_pcie->hot_rst_wq = create_singlethread_workqueue("rk_pcie_hot_rst_wq");
if (!rk_pcie->hot_rst_wq) {
dev_err(dev, "failed to create hot_rst workqueue\n");
ret = -ENOMEM;
goto remove_irq_domain;
}
INIT_WORK(&rk_pcie->hot_rst_work, rk_pcie_hot_rst_work);
switch (rk_pcie->mode) {
case RK_PCIE_RC_TYPE:
ret = rk_add_pcie_port(rk_pcie, pdev);
@@ -2114,12 +2106,12 @@ retry_regulator:
return 0;
if (ret)
goto remove_rst_wq;
goto remove_irq_domain;
ret = rk_pcie_init_dma_trx(rk_pcie);
if (ret) {
dev_err(dev, "failed to add dma extension\n");
goto remove_rst_wq;
goto remove_irq_domain;
}
if (rk_pcie->dma_obj) {
@@ -2131,11 +2123,19 @@ retry_regulator:
/* hold link reset grant after link-up */
ret = rk_pcie_reset_grant_ctrl(rk_pcie, false);
if (ret)
goto remove_rst_wq;
goto remove_irq_domain;
}
dw_pcie_dbi_ro_wr_dis(pci);
rk_pcie->hot_rst_wq = create_singlethread_workqueue("rk_pcie_hot_rst_wq");
if (!rk_pcie->hot_rst_wq) {
dev_err(dev, "failed to create hot_rst workqueue\n");
ret = -ENOMEM;
goto remove_irq_domain;
}
INIT_WORK(&rk_pcie->hot_rst_work, rk_pcie_hot_rst_work);
device_init_wakeup(dev, true);
/* Enable async system PM for multiports SoC */
@@ -2159,8 +2159,6 @@ retry_regulator:
return 0;
remove_rst_wq:
destroy_workqueue(rk_pcie->hot_rst_wq);
remove_irq_domain:
if (rk_pcie->irq_domain)
irq_domain_remove(rk_pcie->irq_domain);