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

PCIe: dw: rockchip: Setting rk_pcie_hot_rst_wq before interrupt unmask

Browse Source 
Change-Id: I04d628dc2ac390bb5affe276e8c673daa8e14931
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
This commit is contained in:
Jon Lin
2023-07-14 19:49:29 +08:00
committed by Tao Huang
parent aa029efb52
commit 709dbbec5e
1 changed files with 13 additions and 11 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,6 +2093,14 @@ 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);
@@ -2106,12 +2114,12 @@ retry_regulator:
return 0;
if (ret)
goto remove_irq_domain;
goto remove_rst_wq;
ret = rk_pcie_init_dma_trx(rk_pcie);
if (ret) {
dev_err(dev, "failed to add dma extension\n");
goto remove_irq_domain;
goto remove_rst_wq;
}
if (rk_pcie->dma_obj) {
@@ -2123,19 +2131,11 @@ retry_regulator:
/* hold link reset grant after link-up */
ret = rk_pcie_reset_grant_ctrl(rk_pcie, false);
if (ret)
goto remove_irq_domain;
goto remove_rst_wq;
}
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,6 +2159,8 @@ 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);