Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp3524562imm; Sun, 14 Oct 2018 22:46:23 -0700 (PDT) X-Google-Smtp-Source: ACcGV60i5sAIA63ZkZSkufy9tzfMOCxfjQVzHXduUqm3ysRTsgJJVeBkkWXm+aUM/zHghbE4yRzz X-Received: by 2002:a62:8a91:: with SMTP id o17-v6mr16326825pfk.184.1539582383829; Sun, 14 Oct 2018 22:46:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539582383; cv=none; d=google.com; s=arc-20160816; b=MsBL3MLq52IhlSmhv0KKy/bik3nFVYTivpizkLXjww+NR5h7SU+SN7Yp67xLlt1Nz0 SP9dJh2yhsCEHMR45S5FsKojqhIS3a391RWxr8Tv1K39aexUTenNSAdQgJP2g1jzcR8g A+ytvJAkbzXz32ACUyR4pO4XzOFl2OlBAtc4p6FCFjYw+XeW9W145p6iUpIWeNhp2Foc +u8H4b/u7rcVlHZOq/dAs7vOAtYxs750QMy7+7lz5y5kLLCOXo9ux8T10kRTyFmrYO76 EvDtLgzyvrqLECxmXm81/IIINkWfiBDLpMtAyYBhGpeDH5alppD0kDeWq6pXike8ufG5 4wRA== 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=s8G4ST7kyi6zf18BoNuAYqbozszRBCLstgM2i1udN/E=; b=PQaHlgUSbDk1x+oGcCaeVBq46KIC0Jyl8iX2J/Zz/eiECm7hwlDI0Eq9pKFVM+t7Gc NYyvw5aSWREGw06hl+w2J+fj/rNKhgFj1JAoc7BuZWCHtdJiW9fJA8jOaVr0c54Kz8Ec U41tGhuBecvHdOoL0cK+XekAhOd2WZ9iOEyhzpyfFukdmRSbG01UCnx7qiCn4/T+SGqM zXSDKvvCocoLV4mJni2QaDLMWuxpU+tLj4XuqaqCKJl44rTYxXdmZ1a7HcyyEjDmPvTK dOjRKHEn2FeHIsIfFaHbs9SPUCOgjE6Gn9NMaiNN6EqGU/smeb9lLCLdYhMBuKbThjiT /9Dg== 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 w22-v6si10070514plk.377.2018.10.14.22.46.09; Sun, 14 Oct 2018 22:46:23 -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 S1727044AbeJON3N (ORCPT + 99 others); Mon, 15 Oct 2018 09:29:13 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:39908 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726669AbeJON2u (ORCPT ); Mon, 15 Oct 2018 09:28:50 -0400 X-UUID: 9cef1cd8740f44a7ae6a3b80dc54a969-20181015 X-UUID: 9cef1cd8740f44a7ae6a3b80dc54a969-20181015 Received: from mtkcas06.mediatek.inc [(172.21.101.30)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1874113309; Mon, 15 Oct 2018 13:45:00 +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.1395.4; Mon, 15 Oct 2018 13:44:58 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Mon, 15 Oct 2018 13:44:57 +0800 From: To: , , , , , , CC: , , , , , , , , , Subject: [PATCH v7 9/9] PCI: mediatek: Add loadable kernel module support Date: Mon, 15 Oct 2018 13:44:47 +0800 Message-ID: <1539582287-9171-10-git-send-email-honghui.zhang@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1539582287-9171-1-git-send-email-honghui.zhang@mediatek.com> References: <1539582287-9171-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 | 51 +++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 2 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 daba78f..5048adb 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 @@ -532,6 +533,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) { @@ -1171,6 +1193,31 @@ 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_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); @@ -1248,6 +1295,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, @@ -1255,4 +1303,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