forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

PCI: rockchip: fix crash due to CONFIG_ROCKCHIP_PCIE_DMA_OBJ disabled

Browse source 
Change-Id: I0d3cd35150276e353fd06e4fa481b71a125f533c
Signed-off-by: Simon Xue <xxm@rock-chips.com>
This commit is contained in:
Simon Xue 2020-11-20 18:03:33 +08:00 • committed by Tao Huang
commit be2e272c83
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/pci/controller/dwc/pcie-dw-rockchip.c
View file

@ -1180,12 +1180,14 @@ static int rk_pcie_probe(struct platform_device *pdev)
break;
}
rk_pcie->dma_obj->start_dma_func = rk_pcie_start_dma_dwc;
rk_pcie->dma_obj->config_dma_func = rk_pcie_config_dma_dwc;
if (ret)
goto deinit_clk;
if (rk_pcie->dma_obj) {
rk_pcie->dma_obj->start_dma_func = rk_pcie_start_dma_dwc;
rk_pcie->dma_obj->config_dma_func = rk_pcie_config_dma_dwc;
}
if (rk_pcie->is_rk1808) {
/* hold link reset grant after link-up */
ret = rk_pcie_reset_grant_ctrl(rk_pcie, false);

6
drivers/pci/controller/pcie-rockchip-host.c
View file

@ -1276,8 +1276,10 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
goto err_probe_dma;
}
rockchip->dma_obj->start_dma_func = rk_pcie_start_dma_rk3399;
rockchip->dma_obj->config_dma_func = rk_pcie_config_dma_rk3399;
if (rockchip->dma_obj) {
rockchip->dma_obj->start_dma_func = rk_pcie_start_dma_rk3399;
rockchip->dma_obj->config_dma_func = rk_pcie_config_dma_rk3399;
}
return 0;