From 652b60a98e91b62541374d127327a5cd05cb8209 Mon Sep 17 00:00:00 2001 From: Jon Lin Date: Sat, 26 Oct 2024 11:33:29 +0800 Subject: [PATCH] PCI: dw: rockchip: Move PCIE_CLIENT_INTR_MASK to configuration process. Change-Id: Id90ddc7c1280e8f01974380d5d2ebebbe12bec67 Signed-off-by: Jon Lin --- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c index 1ceac7222ce1..e2d1559c1037 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -1372,14 +1372,6 @@ static int rk_pcie_init_irq_and_wq(struct rk_pcie *rk_pcie, struct platform_devi struct device *dev = rk_pcie->pci->dev; int ret; - /* - * Misc interrupts was masked by default. However, they will be - * unmasked by FW before jumpping into kernel. Mask all misc interrupts, - * as we don't need to ack them before registering irq. And they will be - * unmasked later. - */ - rk_pcie_writel_apb(rk_pcie, PCIE_CLIENT_INTR_MASK, 0xffffffff); - ret = rk_pcie_request_sys_irq(rk_pcie, pdev); if (ret) { dev_err(dev, "pcie irq init failed\n"); @@ -1494,6 +1486,14 @@ static int rk_pcie_host_config(struct rk_pcie *rk_pcie) rk_pcie_set_rc_mode(rk_pcie); + /* + * Misc interrupts was masked by default. However, they will be + * unmasked by FW before jumpping into kernel. Mask all misc interrupts, + * as we don't need to ack them before registering irq. And they will be + * unmasked later. + */ + rk_pcie_writel_apb(rk_pcie, PCIE_CLIENT_INTR_MASK, 0xffffffff); + return 0; }