From patchwork Mon Oct 17 11:47:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 3406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp1401230wrs; Mon, 17 Oct 2022 04:53:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6JCI55NWpWJ/Q67b7KlCelB5Lr6gIWYINm2BK+01BBZMRiHR79T96Kb9hGzluFaSPKq7ch X-Received: by 2002:a63:6cc6:0:b0:457:5f5f:9dff with SMTP id h189-20020a636cc6000000b004575f5f9dffmr10224696pgc.493.1666007583039; Mon, 17 Oct 2022 04:53:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666007583; cv=none; d=google.com; s=arc-20160816; b=mo/Smb+nsqqDQPaH3ms6Pg7QU1vpMDXi7IdyB7th+ILcqBuqsWijbGRjxk+pcYX0xn n1ZmeQvdalWzxE61wTmop6WVO+bLqe4TXNmMngVA7e9QQekKBsuG2aIWHi6ReE7UqRzp Vb0YJAaIkpQzVNWhQQq3viQw3uywi3g1JHDnt+16O5w1PzNZMHImmDqTouuTcbXAc1Gz pJdfN4HwFNJrhF8REk+yB3UIxyfn2jSjq0c0ozxRmVTUxr89PZCe8ZH5xCTG3mHm+J8M 02OqhX1Y2LCid1iUlGW93AkaXS/nkk0QeLeWi5zzrTzNvMQBlYFO5Mz1YCl0p1DvDPHI 0P8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LxdfTKMNJ/hNWWl8E37ORmRWMGqUceUY+zPErvlTu7U=; b=xMXH79nEIX7VS3wnQHyK0LK4ICkB8QnQOei0Ujz/vUlD7uNJRf1/8foJwQ7chIvsRf VAT6RT76CmILYUUuH1olsMmUr2qXvaNlujAUoT6yeCpdCE9EytRFYzc+QvDYRGE8uCHO EMy3C8v2YML4P21rKTy08tOmQqYiFRLH5ZjQohRG6kddKkr2DNzm5q7a1lk+ejPo9qCn aBJr7Fxf0c4FXrjenhDEzr569iYiL4GevC9oV7DV80jyo0qkkpXwgPS/vRVXtEbNlriK pCMadx633gQj6Rfc1shp8THkFelgPtPRqQGAQZYUb05bozzRDmmU8vRtYr8jq9eGZcfQ McmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pULQbl7y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o19-20020a170902779300b00172f6726d91si10935640pll.565.2022.10.17.04.52.49; Mon, 17 Oct 2022 04:53:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pULQbl7y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230228AbiJQLsG (ORCPT + 99 others); Mon, 17 Oct 2022 07:48:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229597AbiJQLsC (ORCPT ); Mon, 17 Oct 2022 07:48:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E406550709; Mon, 17 Oct 2022 04:48:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C90C36103E; Mon, 17 Oct 2022 11:47:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FC82C43470; Mon, 17 Oct 2022 11:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666007279; bh=E8/ccenRKIQU903OsMdJb6fnp8/h0tN8tiOOLCxh+7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pULQbl7yb4gPO7W1STGg2ilF21YSi1fuD9KxrcifsXTsweYK8p13GYFOPkR2OnTSX Hv7Nf4WtEn2GG0Ew5lwvFOfgn+JFjEqDFazmo02IGEusel1n2y34m6Wa8ygCmi7nA0 PlRyCrJ+puDKf0gnTmDzK99ZVMKXHwjMXqwkRVMRU5oNuRRswHY0eO24r/AcsjwYre In4NXB80v5gVcjQmAoAflIRcBW6bB/jhSZHDu2z18EbEZhSz/6j6Ybc/ugahjMzAMc BtZ+trUeU57s6sE05Il83XlCjpXsVCzpRjel1M+igNxcRTKBlwqYZYmblox7FlwiuJ tIu8zL1CeQHUQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1okOay-0002B3-RD; Mon, 17 Oct 2022 13:47:48 +0200 From: Johan Hovold To: Stanimir Varbanov , Lorenzo Pieralisi Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Bjorn Helgaas , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Rob Herring , Manivannan Sadhasivam Subject: [PATCH v3 2/2] PCI: qcom: Add support for modular builds Date: Mon, 17 Oct 2022 13:47:05 +0200 Message-Id: <20221017114705.8277-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221017114705.8277-1-johan+linaro@kernel.org> References: <20221017114705.8277-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746935560494866955?= X-GMAIL-MSGID: =?utf-8?q?1746935567501200761?= Allow the Qualcomm PCIe controller driver to be built as a module, which is useful for multi-platform kernels as well as during development. Reviewed-by: Rob Herring Reviewed-by: Manivannan Sadhasivam Acked-by: Stanimir Varbanov Signed-off-by: Johan Hovold --- drivers/pci/controller/dwc/Kconfig | 2 +- drivers/pci/controller/dwc/pcie-qcom.c | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index 62ce3abf0f19..230f56d1a268 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -168,7 +168,7 @@ config PCI_HISI Hip05 and Hip06 SoCs config PCIE_QCOM - bool "Qualcomm PCIe controller" + tristate "Qualcomm PCIe controller" depends on OF && (ARCH_QCOM || COMPILE_TEST) depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 417be4d225ed..699172c22ed4 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -1820,6 +1820,21 @@ static int qcom_pcie_probe(struct platform_device *pdev) return ret; } +static int qcom_pcie_remove(struct platform_device *pdev) +{ + struct qcom_pcie *pcie = platform_get_drvdata(pdev); + struct device *dev = &pdev->dev; + + dw_pcie_host_deinit(&pcie->pci->pp); + + phy_exit(pcie->phy); + + pm_runtime_put_sync(dev); + pm_runtime_disable(dev); + + return 0; +} + static const struct of_device_id qcom_pcie_match[] = { { .compatible = "qcom,pcie-apq8064", .data = &cfg_2_1_0 }, { .compatible = "qcom,pcie-apq8084", .data = &cfg_1_0_0 }, @@ -1841,6 +1856,7 @@ static const struct of_device_id qcom_pcie_match[] = { { .compatible = "qcom,pcie-sm8450-pcie1", .data = &cfg_1_9_0 }, { } }; +MODULE_DEVICE_TABLE(of, qcom_pcie_match); static void qcom_fixup_class(struct pci_dev *dev) { @@ -1856,10 +1872,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_QCOM, 0x1001, qcom_fixup_class); static struct platform_driver qcom_pcie_driver = { .probe = qcom_pcie_probe, + .remove = qcom_pcie_remove, .driver = { .name = "qcom-pcie", - .suppress_bind_attrs = true, .of_match_table = qcom_pcie_match, }, }; -builtin_platform_driver(qcom_pcie_driver); +module_platform_driver(qcom_pcie_driver); + +MODULE_AUTHOR("Stanimir Varbanov "); +MODULE_DESCRIPTION("Qualcomm PCIe root complex driver"); +MODULE_LICENSE("GPL");