Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp2544835imm; Mon, 10 Sep 2018 02:52:07 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbeW5BXNfFEMMBwCJKI8LaIoAIkM1k6eUvUiysDP6aM1iCmgVw2IGKvEu+sB9POzuUYV9g2 X-Received: by 2002:a63:6746:: with SMTP id b67-v6mr21680684pgc.330.1536573127716; Mon, 10 Sep 2018 02:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536573127; cv=none; d=google.com; s=arc-20160816; b=l73E5awjezdzYcva9yPqXRBCRN996u3foUxmz9lrhrvkd25mvfJiToloy4gFAYuUhR QmhUMtmJISaUAknxIsrhTTWyLlpip8EXVgV8/i0o1SVi+jiDX7OixKsi/4p9BEvKrGp/ FqCwOHbpYt+j1zNUMGWMNivD6ydaj537tg33AYA50KlkSJ91WK82339N48Mj+9UE5TbH XAkMMcyxTu/RaaWCBqpKYpFmSRX6uVMkjj1wBP7F8j54JUsTZxCdioxCH4Oz5K4hmCbd IOk7YM3n/VVKSuWq8A+DHdF1Eed9o1A2SeQ4TUfpNb/OLta6BlgS83Cx1D5/VqA9fOtg P2NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=2wDRU8hPStFpPD8lEkdlZRbmYBXXM1lKE+wUUTi30UU=; b=TLia7PR3SnSCOQG5ba8XbJY6VvZvGZRN9hptjEWbHHjKSix18EvL4n3SGCQf1bjx/d 0RFWeIP+YHVTWGkD74q2Zgqym+eII9vnMTcjJNFC54dRnELbDrsbqT41x/zPfs0jMcSH pbcoTFtqTkG9tXgCpeuynSesWN2eTkSTKlqAgwdHIHiZcOQ/YkJFksiarO+aVV7wXHDS fK585DuET6Yhw6oFm0eykpV1r/B/d9xIXh7NR4SBk3LIaUGHV33wuQ5gDOzBcGEiuBAm eEIHBj4aGx2hdIfP0PFfiTWIGdbOgnhhZzi2UwqvHacrJwl7mhi99eEmtSVCQXDfqX8f azZw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o34-v6si16310266pgm.502.2018.09.10.02.51.52; Mon, 10 Sep 2018 02:52:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728177AbeIJOnx (ORCPT + 99 others); Mon, 10 Sep 2018 10:43:53 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:24439 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727261AbeIJOnw (ORCPT ); Mon, 10 Sep 2018 10:43:52 -0400 X-UUID: 99f2d3b374f34a66b41577f983e96248-20180910 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1222931434; Mon, 10 Sep 2018 17:50:35 +0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Mon, 10 Sep 2018 17:50:31 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Mon, 10 Sep 2018 17:50:29 +0800 From: To: , , , , , , , , , , , CC: , , , , , , , Subject: [PATCH v4 4/4] PCI: mediatek: Add loadable kernel module support Date: Mon, 10 Sep 2018 17:50:23 +0800 Message-ID: <1536573023-6720-5-git-send-email-honghui.zhang@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1536573023-6720-1-git-send-email-honghui.zhang@mediatek.com> References: <1536573023-6720-1-git-send-email-honghui.zhang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Honghui Zhang Implement remove callback function for Mediatek PCIe driver to add loadable kernel module support. Signed-off-by: Honghui Zhang Reviewed-by: Ryder Lee --- drivers/pci/controller/Kconfig | 2 +- drivers/pci/controller/pcie-mediatek.c | 60 +++++++++++++++++++++++++++++++--- 2 files changed, 57 insertions(+), 5 deletions(-) diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index 028b287..465790f 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -231,7 +231,7 @@ config PCIE_ROCKCHIP_EP available to support GEN2 with 4 slots. config PCIE_MEDIATEK - bool "MediaTek PCIe controller" + tristate "MediaTek PCIe controller" depends on ARCH_MEDIATEK || COMPILE_TEST depends on OF depends on PCI_MSI_IRQ_DOMAIN diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c index bcc77bc..9d54fc9 100644 --- a/drivers/pci/controller/pcie-mediatek.c +++ b/drivers/pci/controller/pcie-mediatek.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -184,6 +185,7 @@ struct mtk_pcie_port { struct phy *phy; u32 lane; u32 slot; + int irq; struct irq_domain *irq_domain; struct irq_domain *inner_domain; struct irq_domain *msi_domain; @@ -538,6 +540,27 @@ static void mtk_pcie_enable_msi(struct mtk_pcie_port *port) writel(val, port->base + PCIE_INT_MASK); } +static void mtk_pcie_irq_teardown(struct mtk_pcie *pcie) +{ + struct mtk_pcie_port *port, *tmp; + + list_for_each_entry_safe(port, tmp, &pcie->ports, list) { + irq_set_chained_handler_and_data(port->irq, NULL, NULL); + + if (port->irq_domain) + irq_domain_remove(port->irq_domain); + + if (IS_ENABLED(CONFIG_PCI_MSI)) { + if (port->msi_domain) + irq_domain_remove(port->msi_domain); + if (port->inner_domain) + irq_domain_remove(port->inner_domain); + } + + irq_dispose_mapping(port->irq); + } +} + static int mtk_pcie_intx_map(struct irq_domain *domain, unsigned int irq, irq_hw_number_t hwirq) { @@ -628,7 +651,7 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, struct mtk_pcie *pcie = port->pcie; struct device *dev = pcie->dev; struct platform_device *pdev = to_platform_device(dev); - int err, irq; + int err; err = mtk_pcie_init_irq_domain(port, node); if (err) { @@ -636,8 +659,9 @@ static int mtk_pcie_setup_irq(struct mtk_pcie_port *port, return err; } - irq = platform_get_irq(pdev, port->slot); - irq_set_chained_handler_and_data(irq, mtk_pcie_intr_handler, port); + port->irq = platform_get_irq(pdev, port->slot); + irq_set_chained_handler_and_data(port->irq, + mtk_pcie_intr_handler, port); return 0; } @@ -1199,6 +1223,32 @@ static int mtk_pcie_probe(struct platform_device *pdev) return err; } + +static void mtk_pcie_free_resources(struct mtk_pcie *pcie) +{ + struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie); + struct list_head *windows = &host->windows; + + pci_unmap_iospace(&pcie->pio); + pci_free_resource_list(windows); +} + +static int mtk_pcie_remove(struct platform_device *pdev) +{ + struct mtk_pcie *pcie = platform_get_drvdata(pdev); + struct pci_host_bridge *host = pci_host_bridge_from_priv(pcie); + + pci_stop_root_bus(host->bus); + pci_remove_root_bus(host->bus); + mtk_pcie_free_resources(pcie); + + mtk_pcie_irq_teardown(pcie); + + mtk_pcie_put_resources(pcie); + + return 0; +} + static int __maybe_unused mtk_pcie_suspend_noirq(struct device *dev) { struct mtk_pcie *pcie = dev_get_drvdata(dev); @@ -1286,6 +1336,7 @@ static const struct of_device_id mtk_pcie_ids[] = { static struct platform_driver mtk_pcie_driver = { .probe = mtk_pcie_probe, + .remove = mtk_pcie_remove, .driver = { .name = "mtk-pcie", .of_match_table = mtk_pcie_ids, @@ -1293,4 +1344,5 @@ static struct platform_driver mtk_pcie_driver = { .pm = &mtk_pcie_pm_ops, }, }; -builtin_platform_driver(mtk_pcie_driver); +module_platform_driver(mtk_pcie_driver); +MODULE_LICENSE("GPL v2"); -- 2.6.4