From patchwork Wed Nov 16 20:50:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 21256 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp56198wrr; Wed, 16 Nov 2022 12:53:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf6qDKHuD71OEz4mT/davjVv/X83QWzdYRd6FgMr0Aw5Lk/V3NFNF/BULThIdSnvZhHYLWFq X-Received: by 2002:a17:906:3e43:b0:78d:a154:ae with SMTP id t3-20020a1709063e4300b0078da15400aemr18097817eji.259.1668631998439; Wed, 16 Nov 2022 12:53:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668631998; cv=none; d=google.com; s=arc-20160816; b=Hxv78D2YDREwAuMikNIVuKqPZNTIziW6iZ8KQJN9e9JOCljd7ANB3GOBx3A6+TvrEc x9owSY0t4FGFaGXl/Dt/FLFxWtA7BTzu2nkUGEtlvxRFjCr2CeExBJ0nU2RbH3ujNWmR NYCFA9Gcuql1r1rKlCKbE296g70dIYAMX+waVeFbEzHMIssopZLb14S1lATzP+OG4Edm sJslvfnDW6nRsQkEKPYJqZd4YzteNQeYO7ULsToYwACyuXJ+hKkmUIxI5krsVm78A7C0 kXz/7stoEXZFE0VVFQdLQlRqDxi/DifUuN4IuCydLWV6jjTTpu9WIGtlG81Tluqbmjp5 mWpg== 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=Lvxnapk8ZWzRdKEjUJyzPmER+bZynfKnBd7qkzknszg=; b=sbGpoJGZ3bkiG7DasJraSdFAjeCxmITPvpVQ8k/YzDEQ0pTD4fQ0POv7O+WbxCYTjx bvfUE7G5+cuHt7alR5r3O1her3fOyKOCV214wGU1WXR4QzsyoTjSJ/S2bvDY1KS4iQkb sqtQoGjcSZ3tnr3cydmZNElHLRutHfASYOaqouPAbRu1dQA3vMBun8R4CSbO233U4Lkg FpxyI6VLoJKqvAln3LgRrtIpyujFOnXKo9H8nAzOgZWTemqojhGhzYRetrfYGO9tRFq2 gBFDUioO6KAMOhRVpQjdltLoPRMCqJONbHoq8NZTXWVOBVCvsYtgxobTZfz3xlUr94U4 PuGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fzKeuOjO; 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 i3-20020a17090685c300b007894b9de062si13100175ejy.631.2022.11.16.12.52.55; Wed, 16 Nov 2022 12:53:18 -0800 (PST) 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=fzKeuOjO; 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 S234346AbiKPUv2 (ORCPT + 99 others); Wed, 16 Nov 2022 15:51:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234040AbiKPUvM (ORCPT ); Wed, 16 Nov 2022 15:51:12 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 791C963B87; Wed, 16 Nov 2022 12:51:11 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id 2A92AB81EC1; Wed, 16 Nov 2022 20:51:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95817C433D6; Wed, 16 Nov 2022 20:51:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668631868; bh=m6/u2vgmMBuIIdm3mXwZ8M7e/kuC3+TOJ2k7xEqGPF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fzKeuOjOZxzuqYLQfd4CmqiACVuym10CfQHY3frTCsUUDGehntk6guziLR4zMHr3j +LDx7TVtM+lmr3YKsHOHTycfkFFnBi7QL6dUJV9hopZvLOzG7tY6Aes7geVnsMrT4A 4vS90YYFQsnTpgQe/50+yTHGrWdHY+M5Zoa6LUAK3IoGaIkc6u5zpiWktMH/a1yhUV n2lQlz1L2zlMgyhAAQn8wTL+mvySXUZ6Yw/HHj2b6SUub8uaSq8DHdQ+AHODumUSaf xyeOpWLRDA+6t7IU2dD+c7YnF14HUPIxeSdWMPuZ0W80sbfoY1+J12curKlUxVdG5L LiNvyu4/wWfiw== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Lorenzo Pieralisi , Geert Uytterhoeven , =?utf-8?q?Pali_Roh=C3=A1r?= , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v2 1/2] PCI: Drop of_match_ptr() to avoid unused variables Date: Wed, 16 Nov 2022 14:50:59 -0600 Message-Id: <20221116205100.1136224-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221116205100.1136224-1-helgaas@kernel.org> References: <20221116205100.1136224-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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?1749687466400993640?= X-GMAIL-MSGID: =?utf-8?q?1749687466400993640?= From: Bjorn Helgaas We have stubs for most OF interfaces even when CONFIG_OF is not set, so we allow building of most controller drivers in that case for compile testing. When CONFIG_OF is not set, "of_match_ptr()" compiles to NULL, which leaves unused, resulting in errors like this: $ make W=1 drivers/pci/controller/pci-xgene.c:636:34: error: ‘xgene_pcie_match_table’ defined but not used [-Werror=unused-const-variable=] Drop of_match_ptr() to avoid the unused variable warning. See also 1dff012f636d ("PCI: Drop of_match_ptr() to avoid unused variables"). Link: https://lore.kernel.org/r/20221025191339.667614-2-helgaas@kernel.org Signed-off-by: Bjorn Helgaas --- drivers/pci/controller/pci-ftpci100.c | 2 +- drivers/pci/controller/pci-v3-semi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c index 0cfd9d5a497c..ecd3009df586 100644 --- a/drivers/pci/controller/pci-ftpci100.c +++ b/drivers/pci/controller/pci-ftpci100.c @@ -553,7 +553,7 @@ static const struct of_device_id faraday_pci_of_match[] = { static struct platform_driver faraday_pci_driver = { .driver = { .name = "ftpci100", - .of_match_table = of_match_ptr(faraday_pci_of_match), + .of_match_table = faraday_pci_of_match, .suppress_bind_attrs = true, }, .probe = faraday_pci_probe, diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c index 784fcf35599c..ca44b0c83d1b 100644 --- a/drivers/pci/controller/pci-v3-semi.c +++ b/drivers/pci/controller/pci-v3-semi.c @@ -901,7 +901,7 @@ static const struct of_device_id v3_pci_of_match[] = { static struct platform_driver v3_pci_driver = { .driver = { .name = "pci-v3-semi", - .of_match_table = of_match_ptr(v3_pci_of_match), + .of_match_table = v3_pci_of_match, .suppress_bind_attrs = true, }, .probe = v3_pci_probe, From patchwork Wed Nov 16 20:51:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 21257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp56260wrr; Wed, 16 Nov 2022 12:53:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf6zcHa6MPRDRPs7bGcXpJpNZ939QtK9JGGS+BfTdI6EA+mNg2P5xTtS8Pfm6QfP0uKTi9H9 X-Received: by 2002:aa7:d356:0:b0:461:ac48:a5ec with SMTP id m22-20020aa7d356000000b00461ac48a5ecmr20667991edr.193.1668632007850; Wed, 16 Nov 2022 12:53:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668632007; cv=none; d=google.com; s=arc-20160816; b=h53paLjXtgf9XZNu0a9VeQ9Y4QscXFn07xvN1TRvVXv0sauzi2qYT+DvCVYL66kRVy j1tcncc/zJ765V5kUIf67Qubddl6woJRu3KkMtjdkxykw0TpVbYK169KegX93SAjoWK+ RDSU5OG+wEpAc+TkVrvZsSf9wH89dy8n1IYYgPJHGlGWLXM73CXIQ7+4lHC58xeKlmbl yCxhwl7BKGE3/xn5Eh1f/lhKm/LkFBrzv/zIPFN7JDwP7214w68TH+rlOTvYv62/ugF0 PKExh5GEdlT7BktDxBDVzrqd+bwmjlJ4ypwBLSawCnzLlhbgKBWifLqSS/CA8I/QPNo+ wa5A== 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=0OctvNY2uj8ynxVlf4F5GrZT4m6yptcDQy/Ck0bNT2k=; b=yha1ia5L78M39lE7uQkwUqK+nJnylQMneOnKvOg+1tL38QKCBVbzv3mTVxVldHe/1e hJFETTc8C6y972ow2ZIdPz/1sUH4s+XJMbtgx6c+ZVzn9U4UqPMwRvEl3Rw3FXAnc1lZ VX5qGDLJaFyEdp/VN2w7CF/PfJrmbEi3gbvFPwZNcvetPd8S3fNrXtOvu4QuVtKpAC1c D+tqPy6lO7lR8PkyKxn9so8W3jIpE3I+5gkllF3wMN4qPUO6zZd4zltF0zS6dkr2iQNp GrCvIarMcJ0E7rrEeAGmSUy7pjLJvo7nU22J6X8Jf35tYmVHqVLVRK2B9rDjWnTTkEVb A0Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VEdMInGd; 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 y16-20020a056402271000b0045be16903d0si12887888edd.310.2022.11.16.12.53.04; Wed, 16 Nov 2022 12:53:27 -0800 (PST) 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=VEdMInGd; 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 S234274AbiKPUva (ORCPT + 99 others); Wed, 16 Nov 2022 15:51:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234223AbiKPUvT (ORCPT ); Wed, 16 Nov 2022 15:51:19 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C3C64A0E; Wed, 16 Nov 2022 12:51:14 -0800 (PST) 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 sin.source.kernel.org (Postfix) with ESMTPS id C7AE6CE1C92; Wed, 16 Nov 2022 20:51:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DFEFC433C1; Wed, 16 Nov 2022 20:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668631870; bh=qXGP3+HUll9sYGVoqW9SbxWwprBgMJaK9akTX5TqlWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VEdMInGdltCHg3+XMzCTtLxc+3Pqsvayf/+HV+JoCSxtRlfvsdeHbbMEg44QcNmfK thhCbsC1c0Gn7tJTBxNH5vVAAh1DbJoVsNqk/QoxG7ZN7f7PrCBxrUl7IZyUh9slWp Z3WQicqGjJIBZpnsLhLNvlE9V0wl43lUrShkd+E4plPpRzws4E8r6KTZ/3CCG2uTHU ERpxeT+ruuPw+JHl1fkZhqBFYdGunERaVZklIlMVynaEEEA+rHyUNOoHrAph7HUFW3 TJ1G3W5RsthcY50UsbQ92jg0P0/Z5487o0znTwke/VjrxBsxhDbxiRHcqXf/johoLl /z8l/exoObz+A== From: Bjorn Helgaas To: linux-pci@vger.kernel.org Cc: Lorenzo Pieralisi , Geert Uytterhoeven , =?utf-8?q?Pali_Roh=C3=A1r?= , Rob Herring , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH v2 2/2] PCI: Allow building CONFIG_OF drivers with COMPILE_TEST Date: Wed, 16 Nov 2022 14:51:00 -0600 Message-Id: <20221116205100.1136224-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221116205100.1136224-1-helgaas@kernel.org> References: <20221116205100.1136224-1-helgaas@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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?1749687448664008385?= X-GMAIL-MSGID: =?utf-8?q?1749687476609866530?= From: Bjorn Helgaas Many drivers depend on OF interfaces, so they won't be functional if CONFIG_OF is not set. But OF provides stub functions in that case, so make them buildable if CONFIG_COMPILE_TEST is set. Signed-off-by: Bjorn Helgaas Reviewed-by: Geert Uytterhoeven --- drivers/pci/controller/Kconfig | 34 +++++++++++---------- drivers/pci/controller/cadence/Kconfig | 12 ++++---- drivers/pci/controller/dwc/Kconfig | 40 ++++++++++++++++--------- drivers/pci/controller/mobiveil/Kconfig | 2 +- 4 files changed, 51 insertions(+), 37 deletions(-) diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index bfd9bac37e24..a62e9fbb69ca 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -8,7 +8,7 @@ config PCI_MVEBU depends on ARCH_MVEBU || ARCH_DOVE || COMPILE_TEST depends on MVEBU_MBUS depends on ARM - depends on OF + depends on OF || COMPILE_TEST select PCI_BRIDGE_EMUL help Add support for Marvell EBU PCIe controller. This PCIe controller @@ -18,7 +18,7 @@ config PCI_MVEBU config PCI_AARDVARK tristate "Aardvark PCIe controller" depends on (ARCH_MVEBU && ARM64) || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCI_BRIDGE_EMUL help @@ -38,13 +38,14 @@ config PCIE_XILINX_NWL config PCI_FTPCI100 bool "Faraday Technology FTPCI100 PCI controller" - depends on OF + depends on OF || COMPILE_TEST default ARCH_GEMINI config PCI_IXP4XX bool "Intel IXP4xx PCI controller" - depends on ARM && OF + depends on ARM depends on ARCH_IXP4XX || COMPILE_TEST + depends on OF || COMPILE_TEST default ARCH_IXP4XX help Say Y here if you want support for the PCI host controller found @@ -89,7 +90,7 @@ config PCI_HOST_COMMON config PCI_HOST_GENERIC tristate "Generic PCI host controller" - depends on OF + depends on OF || COMPILE_TEST select PCI_HOST_COMMON select IRQ_DOMAIN help @@ -115,7 +116,7 @@ config PCIE_XILINX_CPM config PCI_XGENE bool "X-Gene PCIe controller" depends on ARM64 || COMPILE_TEST - depends on OF || (ACPI && PCI_QUIRKS) + depends on (OF || COMPILE_TEST) || (ACPI && PCI_QUIRKS) help Say Y here if you want internal PCI support on APM X-Gene SoC. There are 5 internal PCIe ports available. Each port is GEN3 capable @@ -132,7 +133,7 @@ config PCI_XGENE_MSI config PCI_V3_SEMI bool "V3 Semiconductor PCI controller" - depends on OF + depends on OF || COMPILE_TEST depends on ARM || COMPILE_TEST default ARCH_INTEGRATOR_AP @@ -150,7 +151,7 @@ config PCIE_IPROC config PCIE_IPROC_PLATFORM tristate "Broadcom iProc PCIe platform bus driver" depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST) - depends on OF + depends on OF || COMPILE_TEST select PCIE_IPROC default ARCH_BCM_IPROC help @@ -194,7 +195,7 @@ config PCIE_ALTERA_MSI config PCI_HOST_THUNDER_PEM bool "Cavium Thunder PCIe controller to off-chip devices" depends on ARM64 || COMPILE_TEST - depends on OF || (ACPI && PCI_QUIRKS) + depends on (OF || COMPILE_TEST) || (ACPI && PCI_QUIRKS) select PCI_HOST_COMMON help Say Y here if you want PCIe support for CN88XX Cavium Thunder SoCs. @@ -202,7 +203,7 @@ config PCI_HOST_THUNDER_PEM config PCI_HOST_THUNDER_ECAM bool "Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon" depends on ARM64 || COMPILE_TEST - depends on OF || (ACPI && PCI_QUIRKS) + depends on (OF || COMPILE_TEST) || (ACPI && PCI_QUIRKS) select PCI_HOST_COMMON help Say Y here if you want ECAM support for CN88XX-Pass-1.x Cavium Thunder SoCs. @@ -214,7 +215,7 @@ config PCIE_ROCKCHIP config PCIE_ROCKCHIP_HOST tristate "Rockchip PCIe host controller" depends on ARCH_ROCKCHIP || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select MFD_SYSCON select PCIE_ROCKCHIP @@ -226,7 +227,7 @@ config PCIE_ROCKCHIP_HOST config PCIE_ROCKCHIP_EP bool "Rockchip PCIe endpoint controller" depends on ARCH_ROCKCHIP || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST depends on PCI_ENDPOINT select MFD_SYSCON select PCIE_ROCKCHIP @@ -238,7 +239,7 @@ config PCIE_ROCKCHIP_EP config PCIE_MEDIATEK tristate "MediaTek PCIe controller" depends on ARCH_AIROHA || ARCH_MEDIATEK || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN help Say Y here if you want to enable PCIe controller support on @@ -276,7 +277,7 @@ config PCIE_BRCMSTB tristate "Broadcom Brcmstb PCIe host controller" depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCMBCA || \ BMIPS_GENERIC || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN default ARCH_BRCMSTB || BMIPS_GENERIC help @@ -302,7 +303,8 @@ config PCI_LOONGSON config PCIE_MICROCHIP_HOST bool "Microchip AXI PCIe host bridge support" - depends on PCI_MSI && OF + depends on OF || COMPILE_TEST + depends on PCI_MSI select PCI_MSI_IRQ_DOMAIN select GENERIC_MSI_IRQ_DOMAIN select PCI_HOST_COMMON @@ -325,7 +327,7 @@ config PCIE_APPLE_MSI_DOORBELL_ADDR config PCIE_APPLE tristate "Apple PCIe controller" depends on ARCH_APPLE || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCI_HOST_COMMON help diff --git a/drivers/pci/controller/cadence/Kconfig b/drivers/pci/controller/cadence/Kconfig index 5d30564190e1..44f18b88817f 100644 --- a/drivers/pci/controller/cadence/Kconfig +++ b/drivers/pci/controller/cadence/Kconfig @@ -8,13 +8,13 @@ config PCIE_CADENCE config PCIE_CADENCE_HOST bool - depends on OF + depends on OF || COMPILE_TEST select IRQ_DOMAIN select PCIE_CADENCE config PCIE_CADENCE_EP bool - depends on OF + depends on OF || COMPILE_TEST depends on PCI_ENDPOINT select PCIE_CADENCE @@ -23,7 +23,7 @@ config PCIE_CADENCE_PLAT config PCIE_CADENCE_PLAT_HOST bool "Cadence PCIe platform host controller" - depends on OF + depends on OF || COMPILE_TEST select PCIE_CADENCE_HOST select PCIE_CADENCE_PLAT help @@ -33,7 +33,7 @@ config PCIE_CADENCE_PLAT_HOST config PCIE_CADENCE_PLAT_EP bool "Cadence PCIe platform endpoint controller" - depends on OF + depends on OF || COMPILE_TEST depends on PCI_ENDPOINT select PCIE_CADENCE_EP select PCIE_CADENCE_PLAT @@ -47,7 +47,7 @@ config PCI_J721E config PCI_J721E_HOST bool "TI J721E PCIe platform host controller" - depends on OF + depends on OF || COMPILE_TEST select PCIE_CADENCE_HOST select PCI_J721E help @@ -57,7 +57,7 @@ config PCI_J721E_HOST config PCI_J721E_EP bool "TI J721E PCIe platform endpoint controller" - depends on OF + depends on OF || COMPILE_TEST depends on PCI_ENDPOINT select PCIE_CADENCE_EP select PCI_J721E diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig index 62ce3abf0f19..aa0a2fcd41f1 100644 --- a/drivers/pci/controller/dwc/Kconfig +++ b/drivers/pci/controller/dwc/Kconfig @@ -20,7 +20,8 @@ config PCI_DRA7XX config PCI_DRA7XX_HOST tristate "TI DRA7xx PCIe controller Host Mode" depends on SOC_DRA7XX || COMPILE_TEST - depends on OF && HAS_IOMEM && TI_PIPE3 + depends on OF || COMPILE_TEST + depends on HAS_IOMEM && TI_PIPE3 depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST select PCI_DRA7XX @@ -36,7 +37,8 @@ config PCI_DRA7XX_HOST config PCI_DRA7XX_EP tristate "TI DRA7xx PCIe controller Endpoint Mode" depends on SOC_DRA7XX || COMPILE_TEST - depends on OF && HAS_IOMEM && TI_PIPE3 + depends on OF || COMPILE_TEST + depends on HAS_IOMEM && TI_PIPE3 depends on PCI_ENDPOINT select PCIE_DW_EP select PCI_DRA7XX @@ -134,7 +136,8 @@ config PCI_KEYSTONE_EP config PCI_LAYERSCAPE bool "Freescale Layerscape PCIe controller - Host mode" - depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST) + depends on ARM || ARCH_LAYERSCAPE || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST select MFD_SYSCON @@ -147,7 +150,8 @@ config PCI_LAYERSCAPE config PCI_LAYERSCAPE_EP bool "Freescale Layerscape PCIe controller - Endpoint mode" - depends on OF && (ARM || ARCH_LAYERSCAPE || COMPILE_TEST) + depends on ARM || ARCH_LAYERSCAPE || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_ENDPOINT select PCIE_DW_EP help @@ -158,8 +162,9 @@ config PCI_LAYERSCAPE_EP controller works in RC mode. config PCI_HISI - depends on OF && (ARM64 || COMPILE_TEST) bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers" + depends on ARM64 || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST select PCI_HOST_COMMON @@ -169,7 +174,8 @@ config PCI_HISI config PCIE_QCOM bool "Qualcomm PCIe controller" - depends on OF && (ARCH_QCOM || COMPILE_TEST) + depends on ARCH_QCOM || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST select CRC8 @@ -180,7 +186,8 @@ config PCIE_QCOM config PCIE_QCOM_EP tristate "Qualcomm PCIe controller - Endpoint mode" - depends on OF && (ARCH_QCOM || COMPILE_TEST) + depends on ARCH_QCOM || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_ENDPOINT select PCIE_DW_EP help @@ -226,16 +233,17 @@ config PCIE_ROCKCHIP_DW_HOST bool "Rockchip DesignWare PCIe controller" select PCIE_DW select PCIE_DW_HOST - depends on PCI_MSI_IRQ_DOMAIN depends on ARCH_ROCKCHIP || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST + depends on PCI_MSI_IRQ_DOMAIN help Enables support for the DesignWare PCIe controller in the Rockchip SoC except RK3399. config PCIE_INTEL_GW bool "Intel Gateway PCIe host controller support" - depends on OF && (X86 || COMPILE_TEST) + depends on X86 || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST help @@ -273,8 +281,9 @@ config PCIE_KEEMBAY_EP DesignWare core functions. config PCIE_KIRIN - depends on OF && (ARM64 || COMPILE_TEST) tristate "HiSilicon Kirin series SoCs PCIe controllers" + depends on ARM64 || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST help @@ -345,7 +354,8 @@ config PCIE_VISCONTI_HOST config PCIE_UNIPHIER bool "Socionext UniPhier PCIe host controllers" depends on ARCH_UNIPHIER || COMPILE_TEST - depends on OF && HAS_IOMEM + depends on OF || COMPILE_TEST + depends on HAS_IOMEM depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST help @@ -355,7 +365,8 @@ config PCIE_UNIPHIER config PCIE_UNIPHIER_EP bool "Socionext UniPhier PCIe endpoint controllers" depends on ARCH_UNIPHIER || COMPILE_TEST - depends on OF && HAS_IOMEM + depends on OF || COMPILE_TEST + depends on HAS_IOMEM depends on PCI_ENDPOINT select PCIE_DW_EP help @@ -364,7 +375,8 @@ config PCIE_UNIPHIER_EP config PCIE_AL bool "Amazon Annapurna Labs PCIe controller" - depends on OF && (ARM64 || COMPILE_TEST) + depends on ARM64 || COMPILE_TEST + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_DW_HOST select PCI_ECAM diff --git a/drivers/pci/controller/mobiveil/Kconfig b/drivers/pci/controller/mobiveil/Kconfig index e4643fb94e78..24ea35927185 100644 --- a/drivers/pci/controller/mobiveil/Kconfig +++ b/drivers/pci/controller/mobiveil/Kconfig @@ -14,7 +14,7 @@ config PCIE_MOBIVEIL_HOST config PCIE_MOBIVEIL_PLAT bool "Mobiveil AXI PCIe controller" depends on ARCH_ZYNQMP || COMPILE_TEST - depends on OF + depends on OF || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_MOBIVEIL_HOST help