Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp3556092imm; Mon, 2 Jul 2018 00:59:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIJ5Qni3+C77WWagKaJW1sczNWpucAvZnxfgk28AcWG7nKyZcF8st/s2k7bY/zMwZfN/+TQ X-Received: by 2002:a65:4b87:: with SMTP id t7-v6mr20714770pgq.391.1530518365719; Mon, 02 Jul 2018 00:59:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530518365; cv=none; d=google.com; s=arc-20160816; b=OqE86YxsgskXyyL/q5WzOAlWQ3Jxe6TGtNNFfC5PWxP8nqZ8VnVo4y2asp9Vsz4oe2 ofSuzSYaQTM0h/ZZ4W+9PAo+PjW+l1kWb0ahImWkzWi9WkGJRwreGM2/ea68usR3BKWp N0IvEzOmSgH5rQJPiq/9LhtspjSbUJpR5iY74bi0gGx0gODZVXa0rICV0Uau/P4fzRgC sYIfGqMPu84Ca4NYn5nEmXRmqlJOZSSmXRoDkVZWVby8tdyT2BMV8CWs49ugs0Pl+RrD 1WmiOAEYzvODlPCjFRBht46iV8oqjvN/M7t8G13V8NjxEpiRM4y9UcReywBsC+rlfxuc lSdQ== 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:arc-authentication-results; bh=oojhFIT2HKHPhikz19AWJruKDiBG0jDB/lTFMzStQ5A=; b=NywtMHpk7YbuShxmQfB00Wz7WTrd8YU2vJIt+TCJpJDMgZJW0FcrB2I+ZeRPTc/Cj8 GJszV9P5P6hlEifRIvhTbypxlnCWLhJ6sZIYpr0Q6wfpGNe85dVRyurMw4XdsK4CMX4L FkUPRG6C6MPs1XHMRBL0fiRhyFuoSt47IK89JzUoQ2EkCxFAr1xv54tZYZVQXdeLiRjW DtS+Sw1Uw2GqYpfvjg2yDR6NGh1JcSa97VRbbKCs5nZDHitMJaBcfzFkFO5MzUYf3Z3H 2E8dyhP9nKv93HWujGQeH9y4XbJ07jyuzdPr3Z7yY+lPEuMKMSCiR4fSerEi+l5svBTL iong== 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 p18-v6si12569106pgu.671.2018.07.02.00.59.11; Mon, 02 Jul 2018 00:59:25 -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 S933572AbeGBH61 (ORCPT + 99 others); Mon, 2 Jul 2018 03:58:27 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:31155 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S933455AbeGBH6W (ORCPT ); Mon, 2 Jul 2018 03:58:22 -0400 X-UUID: 422ec593c92f4367bdeb51fc106bf675-20180702 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1708214575; Mon, 02 Jul 2018 15:58:18 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs08n1.mediatek.inc (172.21.101.55) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Mon, 2 Jul 2018 15:58:16 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Mon, 2 Jul 2018 15:58:15 +0800 From: To: , , , , , , , , , , , CC: , , , , , Subject: [PATCH v3 4/4] PCI: mediatek: Add loadable kernel module support Date: Mon, 2 Jul 2018 15:57:44 +0800 Message-ID: <1530518264-6125-5-git-send-email-honghui.zhang@mediatek.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1530518264-6125-1-git-send-email-honghui.zhang@mediatek.com> References: <1530518264-6125-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 18fa09b..6c61ac65 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -234,7 +234,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 175d7b6..28730b8 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); @@ -1291,6 +1341,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, @@ -1298,4 +1349,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