From patchwork Thu Dec 2 23:32:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12653833 X-Patchwork-Delegate: robh@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82DA0C4332F for ; Thu, 2 Dec 2021 23:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376284AbhLBXgU (ORCPT ); Thu, 2 Dec 2021 18:36:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358237AbhLBXgT (ORCPT ); Thu, 2 Dec 2021 18:36:19 -0500 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8018C06174A; Thu, 2 Dec 2021 15:32:56 -0800 (PST) Received: by mail-pf1-x435.google.com with SMTP id u80so1076311pfc.9; Thu, 02 Dec 2021 15:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qfMnWEkKpTQ6QyzDA+87Y6nTeMiakHXXBU0v7/zR+po=; b=O+mn66YAcB+7LtgFahZ1b/UFgirqR/bcBCt0C/OYEFaoAemZMa5R3v0qQjaOTr+Rq5 vt646or1NexZ8Ll/G6bYRM7dHBdcdK6IQ09JNcHFmAHRpOloDNHcU2kDfhscWTAaxjYf R6PZatnWYpSF4nyivMjeMqOaVANZ371P0QkV1LDpp+UKOhYQimDzTqAKxIwSkSq32FVp 4q53hmf/C1u65pnzuvyBn5AsTfpe4nCKboN0PuuUnc0++04kqQRZ4RHSlasZyeAbKdyH AwsQAP+jtgYKSH20DNgT0dGlxbzNLLclJJl55FfSatpEZ8PfobiZVzIMk3R2C9aJDTbv pdmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qfMnWEkKpTQ6QyzDA+87Y6nTeMiakHXXBU0v7/zR+po=; b=KTR8wMaXO4vpcP3Q81DiYH+y3EFdhgGSgunw1aQzSLrySzOrsoV7kMTf2/Chs8uzNi 7mE8GDs7Y1cEA5jQ6nF/TMswtCoXdRYYKu3hl3qhRDghNFNgk4tZA73Y35ijR26l1mj3 TThGzvtDhudcWriICoPDS/cYpnJy9xNq7COeq5tkNG8O6B/DFNO4AMyJIC2cBKYqTCGq Ibkzr/Xf+E1mmO1tJONfMQilE+rdc+C99GsnX+Fz6tBgK5la07EoTsIe2ZZpUj7zYVIE hx3jArAGN4biCYRzOeLN9ngAzM6pVNGqbqE8pyI5OuwKL5zLF4Q5dgrr/HzWbgwyTle0 mRPg== X-Gm-Message-State: AOAM530LqhEK2zAKUDjRB8t+aPX+oJ43oatxM9HCsKoThWMhJSlDxC7M s02kSwEDKbAU7m7HQDX9NvNGp+D27zQ= X-Google-Smtp-Source: ABdhPJy/fi08qdbd1TJnHiUqctywOUkce6UxS6av0xNi0AD4P8x6zFFtnAEZ1c5Ay+eVKsnzxoWdNA== X-Received: by 2002:a63:4c50:: with SMTP id m16mr1838288pgl.508.1638487975870; Thu, 02 Dec 2021 15:32:55 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j1sm809118pfe.158.2021.12.02.15.32.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 15:32:55 -0800 (PST) From: Florian Fainelli To: devicetree@vger.kernel.org Cc: Florian Fainelli , Bjorn Helgaas , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM IPROC ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/5] ARM: dts: Cygnus: Fixed iProc PCIe controller properties Date: Thu, 2 Dec 2021 15:32:44 -0800 Message-Id: <20211202233248.1190797-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202233248.1190797-1-f.fainelli@gmail.com> References: <20211202233248.1190797-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rename the msi controller unit name to 'msi' to avoid collisions with the 'msi-controller' boolean property and add the missing 'interrupt-controller' property which is necessary. We also need to re-arrange the 'ranges' property to show the two cells as being separate instead of combined since the DT checker is not able to differentiate otherwise. Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-cygnus.dtsi | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi index 8ecb7861ce10..ea19d1b56400 100644 --- a/arch/arm/boot/dts/bcm-cygnus.dtsi +++ b/arch/arm/boot/dts/bcm-cygnus.dtsi @@ -263,6 +263,7 @@ pcie0: pcie@18012000 { compatible = "brcm,iproc-pcie"; reg = <0x18012000 0x1000>; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; @@ -274,8 +275,8 @@ pcie0: pcie@18012000 { #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - ranges = <0x81000000 0 0 0x28000000 0 0x00010000 - 0x82000000 0 0x20000000 0x20000000 0 0x04000000>; + ranges = <0x81000000 0 0 0x28000000 0 0x00010000>, + <0x82000000 0 0x20000000 0x20000000 0 0x04000000>; phys = <&pcie0_phy>; phy-names = "pcie-phy"; @@ -283,7 +284,7 @@ pcie0: pcie@18012000 { status = "disabled"; msi-parent = <&msi0>; - msi0: msi-controller { + msi0: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; @@ -298,6 +299,7 @@ pcie1: pcie@18013000 { compatible = "brcm,iproc-pcie"; reg = <0x18013000 0x1000>; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; @@ -309,8 +311,8 @@ pcie1: pcie@18013000 { #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - ranges = <0x81000000 0 0 0x48000000 0 0x00010000 - 0x82000000 0 0x40000000 0x40000000 0 0x04000000>; + ranges = <0x81000000 0 0 0x48000000 0 0x00010000>, + <0x82000000 0 0x40000000 0x40000000 0 0x04000000>; phys = <&pcie1_phy>; phy-names = "pcie-phy"; @@ -318,7 +320,7 @@ pcie1: pcie@18013000 { status = "disabled"; msi-parent = <&msi1>; - msi1: msi-controller { + msi1: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; From patchwork Thu Dec 2 23:32:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12653835 X-Patchwork-Delegate: robh@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B2C8C433EF for ; Thu, 2 Dec 2021 23:33:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376637AbhLBXgX (ORCPT ); Thu, 2 Dec 2021 18:36:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376374AbhLBXgV (ORCPT ); Thu, 2 Dec 2021 18:36:21 -0500 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40739C06174A; Thu, 2 Dec 2021 15:32:58 -0800 (PST) Received: by mail-pg1-x530.google.com with SMTP id 137so1287597pgg.3; Thu, 02 Dec 2021 15:32:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LnAQBRW/XPFSuQTMYCsaVUHc/hz2Ejomkgj8kU/9KMw=; b=Xff9rcHAM6k7LbBrQNy7ISlNyMoT4myTbREHD1qm8QfxGkxBSAxoC5y62fWOdmfyeO GYZ5IdKeosStMR6shBMskOmdLl/tbs5j7c6DKWB4qg/Qe+BpHezgSO6KMYiP2Bif8rTa JOHLe+42sf5MDk3lWl7+h8TTDNUv3pKikpMwaRFfBExXdBK0V1lWKIqVU2aldO66M8qG bSn/GdKK/TpLl5vzE5YeLZfothZutJGbav6785iYflc+1T784/qMkjZQmX/OPG06TcKH UjyvcQG9iTwcdFIPeEpEciinn6onG0GkH1dgAguB6J1siWIlTxuDoXhD7oD3l3LjQ8Ut aXEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LnAQBRW/XPFSuQTMYCsaVUHc/hz2Ejomkgj8kU/9KMw=; b=ynMtLI6XGfwTMNr7xuD4Qok/al4o03vtb2fXwM7o189/SIkiIjgrpWi69zM2m4zCiw vKjtlvteSh6nVjFzibdrclmMmGoiEwvoyh0oqS3eRokCagmT0sdMW7lchjJz0MjSu78E iA/rYgkCp2vFjmixRGCRYfXiTJENQCRZhBvnxrgaWvIfmRiLy7UPBE9whl1mIN1aP3PP ilW4qQnISQStQKqq+OB7qoFJaOq2c+06PnLsojAhXDP101LdNnzQ31KIM6LmoKlBtZ3/ cpIs7pVYwJ9Jmf5h7i2VmBOYcp16x0iynSjdUCO21Vl9bItJRkPjEkRJNCkZXwvLFRDm ZIRQ== X-Gm-Message-State: AOAM533kaykMZwnfjBVbOIwgzmngiSXiE2l6zjy/5vv3zMrZrsb9ZCND jmAUE88lkqcvYijUGQGPOX0ggiuFxCI= X-Google-Smtp-Source: ABdhPJxYc9iQmOwv7JyGntgBnnysJJNKUMj7RhhYtauBNVUFqrD6brr+Cb+whUR6Yq8CQ7qXZfonjg== X-Received: by 2002:a63:1ca:: with SMTP id 193mr1849594pgb.88.1638487977336; Thu, 02 Dec 2021 15:32:57 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j1sm809118pfe.158.2021.12.02.15.32.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 15:32:56 -0800 (PST) From: Florian Fainelli To: devicetree@vger.kernel.org Cc: Florian Fainelli , Bjorn Helgaas , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM IPROC ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/5] ARM: dts: HR2: Fixed iProc PCIe controller properties Date: Thu, 2 Dec 2021 15:32:45 -0800 Message-Id: <20211202233248.1190797-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202233248.1190797-1-f.fainelli@gmail.com> References: <20211202233248.1190797-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rename the msi controller unit name to 'msi' to avoid collisions with the 'msi-controller' boolean property and add the missing 'interrupt-controller' property which is necessary. Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-hr2.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm-hr2.dtsi b/arch/arm/boot/dts/bcm-hr2.dtsi index 84cda16f68a2..bd2f1d04161f 100644 --- a/arch/arm/boot/dts/bcm-hr2.dtsi +++ b/arch/arm/boot/dts/bcm-hr2.dtsi @@ -298,6 +298,7 @@ pcie0: pcie@18012000 { compatible = "brcm,iproc-pcie"; reg = <0x18012000 0x1000>; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>; @@ -318,7 +319,7 @@ pcie0: pcie@18012000 { status = "disabled"; msi-parent = <&msi0>; - msi0: msi-controller { + msi0: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; @@ -334,6 +335,7 @@ pcie1: pcie@18013000 { compatible = "brcm,iproc-pcie"; reg = <0x18013000 0x1000>; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; @@ -354,7 +356,7 @@ pcie1: pcie@18013000 { status = "disabled"; msi-parent = <&msi1>; - msi1: msi-controller { + msi1: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; From patchwork Thu Dec 2 23:32:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12653837 X-Patchwork-Delegate: robh@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAD8BC43217 for ; Thu, 2 Dec 2021 23:33:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376571AbhLBXgY (ORCPT ); Thu, 2 Dec 2021 18:36:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358237AbhLBXgW (ORCPT ); Thu, 2 Dec 2021 18:36:22 -0500 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62A4BC06174A; Thu, 2 Dec 2021 15:32:59 -0800 (PST) Received: by mail-pl1-x62b.google.com with SMTP id q17so817469plr.11; Thu, 02 Dec 2021 15:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fh6iQu7Naqo1ecQG71P7/0hN4M900Ip7WZ2Cnzd+y5A=; b=OlXm9+JtvxqHHwrgZmb3Y4z6XA08r2GhmCsFOrBYisKjsD3vfV1HSXMw+31BV+I0p7 eof4+Kv4s7C82t3gIpTxT/cb76RnPHgCiVqpNZbQ0B2QmtmieFhYoXKsp3OepOgyjMgM tJAS6QXgoGAteRSlxCjuSEQs701S1ht10eBEA1+usPfUv6+7dJKHKSqsJv2hb71u3wcd v9TW4qsFQfV4Zgs8w57/9p2ZMIjWuOK115myiAAd4cNwRqgZKQQkCmAi+dB/W9CZ/y0A fUqAmxFWW3Qdd4qAE4N1t+fxdD9feSClk67sekcXrExiI5Vm3aD4HhXoPzBxH5kqAUfw I3DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fh6iQu7Naqo1ecQG71P7/0hN4M900Ip7WZ2Cnzd+y5A=; b=z0rpfhgaTvEr9S79m9tb4g9kThheUvWinP2F/chzqI67SU8ahafUSDhjX8IqjREIk5 BL/+PES5c9gha8/2j+GS8cJozHhLNLaIVl5P+703cC5cRjYlnrnL5E5uuBjrJMXmFJ42 3CizjmWiUjhc6/VdbRHbfpsJPw9yEy3Q6oS3vsm9uFBJSdcABNg9WaNtLufirGcOqszx WgF4fJqTzjc/pu9YEISZIfaiVBNtNcgLtYnD5Twy3Z9012xpV5FDzJUgAfuIhQ16z/eQ VOrPnnvvOV1Jw732U2GR7Qdncp25gd9RxTZ6oqAq9HKnD2ZRpeLxjTTuHWrjUjMU5hYF m2HA== X-Gm-Message-State: AOAM530d+6UUjlBOquQE+pzcaQUC1i0Kfl7WgY1s+qyNyotgt8ewvI6r AqvgXQake35rcbC803OK/5nIkg9T3ck= X-Google-Smtp-Source: ABdhPJycgCYQWBHeQ91eEWlg8wPzQZeKvxbXgTJIRZHQHNEuFHX4zzTrQFgrkvueY1mlQcj94CqLdQ== X-Received: by 2002:a17:90b:390a:: with SMTP id ob10mr9593749pjb.216.1638487978567; Thu, 02 Dec 2021 15:32:58 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j1sm809118pfe.158.2021.12.02.15.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 15:32:58 -0800 (PST) From: Florian Fainelli To: devicetree@vger.kernel.org Cc: Florian Fainelli , Bjorn Helgaas , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM IPROC ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/5] ARM: dts: NSP: Fixed iProc PCIe controller properties Date: Thu, 2 Dec 2021 15:32:46 -0800 Message-Id: <20211202233248.1190797-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202233248.1190797-1-f.fainelli@gmail.com> References: <20211202233248.1190797-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Rename the msi controller unit name to 'msi' to avoid collisions with the 'msi-controller' boolean property and add the missing 'interrupt-controller' property which is necessary. Signed-off-by: Florian Fainelli --- arch/arm/boot/dts/bcm-nsp.dtsi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi index 1c08daa18858..8c57e904be7b 100644 --- a/arch/arm/boot/dts/bcm-nsp.dtsi +++ b/arch/arm/boot/dts/bcm-nsp.dtsi @@ -566,6 +566,7 @@ pcie0: pcie@18012000 { compatible = "brcm,iproc-pcie"; reg = <0x18012000 0x1000>; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; @@ -587,7 +588,7 @@ pcie0: pcie@18012000 { status = "disabled"; msi-parent = <&msi0>; - msi0: msi-controller { + msi0: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; @@ -603,6 +604,7 @@ pcie1: pcie@18013000 { compatible = "brcm,iproc-pcie"; reg = <0x18013000 0x1000>; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; @@ -624,7 +626,7 @@ pcie1: pcie@18013000 { status = "disabled"; msi-parent = <&msi1>; - msi1: msi-controller { + msi1: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; @@ -640,6 +642,7 @@ pcie2: pcie@18014000 { compatible = "brcm,iproc-pcie"; reg = <0x18014000 0x1000>; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; @@ -661,7 +664,7 @@ pcie2: pcie@18014000 { status = "disabled"; msi-parent = <&msi2>; - msi2: msi-controller { + msi2: msi { compatible = "brcm,iproc-msi"; msi-controller; interrupt-parent = <&gic>; From patchwork Thu Dec 2 23:32:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12653839 X-Patchwork-Delegate: robh@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08F60C4321E for ; Thu, 2 Dec 2021 23:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377247AbhLBXgZ (ORCPT ); Thu, 2 Dec 2021 18:36:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377151AbhLBXgX (ORCPT ); Thu, 2 Dec 2021 18:36:23 -0500 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ACFCC06174A; Thu, 2 Dec 2021 15:33:00 -0800 (PST) Received: by mail-pl1-x634.google.com with SMTP id u11so844854plf.3; Thu, 02 Dec 2021 15:33:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1kNfzxGCClPnpkpcKrueQLAKijX+MF7pULsui0hZ2MI=; b=R1PsNU1iJRJKM4V2GpdeJIki2v+Lxh8raRTN+BrJ5H6o2XMW98nOqyVYmB/u4rJplz nio25qTk3FgtlZT13kyfCI41v+V/eQ9W02fZ5fROseRHgtaqRMIBK7o9AmE/kauskQeR 1+XJ+SQI//ozxmA6DM0rldEJfe0ouT13LIRtUkesHVkibL/HBpuiL8t1S3y/FcPDRxzX ilK17J/LDKFqxMD9EQnxvUum2C/q2sz0mQUUpqNlu0WxlOv4hPFfwwoenglbNdiDN9uB kB+thxRg392qfLiqCdulzHjLCHkoGV387xX0Xf7/MrgxWsxTnvmJ8KZ63t8/k5v/H0ce tWwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1kNfzxGCClPnpkpcKrueQLAKijX+MF7pULsui0hZ2MI=; b=4kU3XJ3I4e6069cWl9iNt2zajq93iwtvFlZJU7EyOQwApGGjfEiosLVjSWXjMBrGBD YnTGB9n4S6kNqIg06CvsOcyblWNgDN44GQapgN8aMWje01td08BdSWZ+kNAvT2G+Hhbr rqlL+WdbJtbGTxoIE4wPoc55Wk3ryDqyXJ13Z9cRJj1fRAN0WU4tv3TijFlW2PMxzNu9 ZPGtyQQKcV3W5LjzaMBkwpWI3U8ILsxolO4Yyk/rxmQU//HOgPdwnvZvWFWXFEPnvE9Q F3iEy/XcKifqKeFJes53Rz0cH2mdwMGNQ6zSi3mORgG9mNAEoQG4QxsCS8IgEtqqHkwn ng6w== X-Gm-Message-State: AOAM532nFQDxwmO+L2eRVkyCQx+/UAgNeo5Rn9KANe/xPIdtbIZIMPTn thab2JBfDhyW5qevmeDvmLOgcgWjwkE= X-Google-Smtp-Source: ABdhPJyCuLxU3VWPAkY85ll/BbOr/ms28vbHeUzuRDEO67RmCna/AuIlUhFHTvBKx7P34FDx714pXA== X-Received: by 2002:a17:902:e9c6:b0:141:c588:99b2 with SMTP id 6-20020a170902e9c600b00141c58899b2mr18615480plk.63.1638487979729; Thu, 02 Dec 2021 15:32:59 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j1sm809118pfe.158.2021.12.02.15.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 15:32:59 -0800 (PST) From: Florian Fainelli To: devicetree@vger.kernel.org Cc: Florian Fainelli , Bjorn Helgaas , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM IPROC ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 4/5] arm64: dts: ns2: Add missing interrupt-controller property Date: Thu, 2 Dec 2021 15:32:47 -0800 Message-Id: <20211202233248.1190797-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202233248.1190797-1-f.fainelli@gmail.com> References: <20211202233248.1190797-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Add the missing interrupt-controller property to the Northstar 2 iProc PCIe controller node(s) in preparation for validating the PCIe controller DT. Signed-off-by: Florian Fainelli --- arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi index 2cfeaf3b0a87..0e10d2dd38cf 100644 --- a/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi @@ -116,6 +116,7 @@ pcie0: pcie@20020000 { reg = <0 0x20020000 0 0x1000>; dma-coherent; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 281 IRQ_TYPE_LEVEL_HIGH>; @@ -147,6 +148,7 @@ pcie4: pcie@50020000 { reg = <0 0x50020000 0 0x1000>; dma-coherent; + interrupt-controller; #interrupt-cells = <1>; interrupt-map-mask = <0 0 0 0>; interrupt-map = <0 0 0 0 &gic 0 GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>; From patchwork Thu Dec 2 23:32:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12653841 X-Patchwork-Delegate: robh@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DBD0C433EF for ; Thu, 2 Dec 2021 23:33:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377453AbhLBXg1 (ORCPT ); Thu, 2 Dec 2021 18:36:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377263AbhLBXgY (ORCPT ); Thu, 2 Dec 2021 18:36:24 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAED6C06174A; Thu, 2 Dec 2021 15:33:01 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id y14-20020a17090a2b4e00b001a5824f4918so3734572pjc.4; Thu, 02 Dec 2021 15:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2OU3iYkJ/HCGwexnBn5t7Lsyg1pwLEQ17dxbbgVM1s0=; b=MTN9jg/xqsVDuPgwiuht2giOJDqBN5RSV8JbFoRoVYzJCHCB+rTYLoM+OIP7a5GKgB HTup+kKf1bZQgoippu00ap515H/u5H12scAx1DoXDec8dxsGC5bso4/sy467/R4JxAUT 6F2+NoofA8WbyXyBnPoYS9qpk3YQl7zDFVy0b/PRq90tOKWdMAI5Pmk82riorSw6JEtM PKUEB7n+jF3Z4DHdm36Hvd662Y2MzfNDxGbtllgnMOlXluF3EshjqD8McjdtStIoncC0 19lcRViVpRi+o7H/mmtd+3UwbnIHh03bUImKWeGk5GfDAggYlOw4SgquGy4M74ejSd9l bZrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2OU3iYkJ/HCGwexnBn5t7Lsyg1pwLEQ17dxbbgVM1s0=; b=E1ZPpFGJErJbyaqZrk0kPvtMEmp+UcuS2oFEzuVPH5y9inUzo3gjifs1EJTH7oYXUM DYbHRZMS7Tr2D/oluIV9LpYkS8LtSorEEuS5+TbTNP44tXEKQ2XhG75hTh2XaWwzkrFZ pK/2mfPIlS7epdKnGPKL5DqO7h7K2Wn0tdCtUta7tmqxniIfRYfWM7+Skb6Az987sMon H9OQkn34GjhKNEaOz+SX1DhltWVl9LsxiZ5HFeGWwNG7IsE70qACQm0nF7jPNboQNl7v UM6jKx9HDCpRxIQj7RVZqPpEt7P9pCJOYdfzSmHnSMmz6gkyx22nOdOU0muPehQapvki BeCA== X-Gm-Message-State: AOAM532jwvTDNKsSYr7BPFcwzTQ5S9Wu5cgiEz3Aw2YmHiU+2dHmeWSb 72Z65w98rJE/HOr0qX6OLcuwbf6ifaU= X-Google-Smtp-Source: ABdhPJz5fu4gTE0PhEkOwlb7v48GqKtArlNF5hOXtckTvygzMu+RQwFfxLz8ANpbcIAefKYSBbL9VA== X-Received: by 2002:a17:90a:e389:: with SMTP id b9mr9378171pjz.235.1638487980894; Thu, 02 Dec 2021 15:33:00 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j1sm809118pfe.158.2021.12.02.15.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 15:33:00 -0800 (PST) From: Florian Fainelli To: devicetree@vger.kernel.org Cc: Florian Fainelli , Bjorn Helgaas , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM IPROC ARM ARCHITECTURE), linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM IPROC ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 5/5] dt-bindings: pci: Convert iProc PCIe to YAML Date: Thu, 2 Dec 2021 15:32:48 -0800 Message-Id: <20211202233248.1190797-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211202233248.1190797-1-f.fainelli@gmail.com> References: <20211202233248.1190797-1-f.fainelli@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Conver the iProc PCIe controller Device Tree binding to YAML now that all DTS in arch/arm and arch/arm64 have been fixed to be compliant. Signed-off-by: Florian Fainelli --- .../bindings/pci/brcm,iproc-pcie.txt | 133 -------------- .../bindings/pci/brcm,iproc-pcie.yaml | 172 ++++++++++++++++++ 2 files changed, 172 insertions(+), 133 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt create mode 100644 Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml diff --git a/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt b/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt deleted file mode 100644 index df065aa53a83..000000000000 --- a/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.txt +++ /dev/null @@ -1,133 +0,0 @@ -* Broadcom iProc PCIe controller with the platform bus interface - -Required properties: -- compatible: - "brcm,iproc-pcie" for the first generation of PAXB based controller, -used in SoCs including NSP, Cygnus, NS2, and Pegasus - "brcm,iproc-pcie-paxb-v2" for the second generation of PAXB-based -controllers, used in Stingray - "brcm,iproc-pcie-paxc" for the first generation of PAXC based -controller, used in NS2 - "brcm,iproc-pcie-paxc-v2" for the second generation of PAXC based -controller, used in Stingray - PAXB-based root complex is used for external endpoint devices. PAXC-based -root complex is connected to emulated endpoint devices internal to the ASIC -- reg: base address and length of the PCIe controller I/O register space -- #interrupt-cells: set to <1> -- interrupt-map-mask and interrupt-map, standard PCI properties to define the - mapping of the PCIe interface to interrupt numbers -- linux,pci-domain: PCI domain ID. Should be unique for each host controller -- bus-range: PCI bus numbers covered -- #address-cells: set to <3> -- #size-cells: set to <2> -- device_type: set to "pci" -- ranges: ranges for the PCI memory and I/O regions - -Optional properties: -- phys: phandle of the PCIe PHY device -- phy-names: must be "pcie-phy" -- dma-coherent: present if DMA operations are coherent -- dma-ranges: Some PAXB-based root complexes do not have inbound mapping done - by the ASIC after power on reset. In this case, SW is required to configure -the mapping, based on inbound memory regions specified by this property. - -- brcm,pcie-ob: Some iProc SoCs do not have the outbound address mapping done -by the ASIC after power on reset. In this case, SW needs to configure it - -If the brcm,pcie-ob property is present, the following properties become -effective: - -Required: -- brcm,pcie-ob-axi-offset: The offset from the AXI address to the internal -address used by the iProc PCIe core (not the PCIe address) - -MSI support (optional): - -For older platforms without MSI integrated in the GIC, iProc PCIe core provides -an event queue based MSI support. The iProc MSI uses host memories to store -MSI posted writes in the event queues - -On newer iProc platforms, gicv2m or gicv3-its based MSI support should be used - -- msi-map: Maps a Requester ID to an MSI controller and associated MSI -sideband data - -- msi-parent: Link to the device node of the MSI controller, used when no MSI -sideband data is passed between the iProc PCIe controller and the MSI -controller - -Refer to the following binding documents for more detailed description on -the use of 'msi-map' and 'msi-parent': - Documentation/devicetree/bindings/pci/pci-msi.txt - Documentation/devicetree/bindings/interrupt-controller/msi.txt - -When the iProc event queue based MSI is used, one needs to define the -following properties in the MSI device node: -- compatible: Must be "brcm,iproc-msi" -- msi-controller: claims itself as an MSI controller -- interrupts: List of interrupt IDs from its parent interrupt device - -Optional properties: -- brcm,pcie-msi-inten: Needs to be present for some older iProc platforms that -require the interrupt enable registers to be set explicitly to enable MSI - -Example: - pcie0: pcie@18012000 { - compatible = "brcm,iproc-pcie"; - reg = <0x18012000 0x1000>; - - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; - - linux,pci-domain = <0>; - - bus-range = <0x00 0xff>; - - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x81000000 0 0 0x28000000 0 0x00010000 - 0x82000000 0 0x20000000 0x20000000 0 0x04000000>; - - phys = <&phy 0 5>; - phy-names = "pcie-phy"; - - brcm,pcie-ob; - brcm,pcie-ob-axi-offset = <0x00000000>; - - msi-parent = <&msi0>; - - /* iProc event queue based MSI */ - msi0: msi@18012000 { - compatible = "brcm,iproc-msi"; - msi-controller; - interrupt-parent = <&gic>; - interrupts = , - , - , - , - }; - }; - - pcie1: pcie@18013000 { - compatible = "brcm,iproc-pcie"; - reg = <0x18013000 0x1000>; - - #interrupt-cells = <1>; - interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>; - - linux,pci-domain = <1>; - - bus-range = <0x00 0xff>; - - #address-cells = <3>; - #size-cells = <2>; - device_type = "pci"; - ranges = <0x81000000 0 0 0x48000000 0 0x00010000 - 0x82000000 0 0x40000000 0x40000000 0 0x04000000>; - - phys = <&phy 1 6>; - phy-names = "pcie-phy"; - }; diff --git a/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml b/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml new file mode 100644 index 000000000000..f6abad9cb00b --- /dev/null +++ b/Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml @@ -0,0 +1,172 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/pci/brcm,iproc-pcie.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom iProc PCIe controller with the platform bus interface + +maintainers: + - Ray Jui + - Scott Branden + +allOf: + - $ref: /schemas/pci/pci-bus.yaml# + - $ref: /schemas/interrupt-controller/msi-controller.yaml# + +properties: + compatible: + items: + - enum: + # for the first generation of PAXB based controller, used in SoCs + # including NSP, Cygnus, NS2, and Pegasus + - brcm,iproc-pcie + # for the second generation of PAXB-based controllers, used in + # Stingray + - brcm,iproc-pcie-paxb-v2 + # For the first generation of PAXC based controller, used in NS2 + - brcm,iproc-pcie-paxc + # For the second generation of PAXC based controller, used in Stingray + - brcm,iproc-pcie-paxc-v2 + + reg: + maxItems: 1 + description: > + Base address and length of the PCIe controller I/O register space + + interrupt-map: true + + interrupt-map-mask: true + + "#interrupt-cells": + const: 1 + + ranges: + minItems: 1 + maxItems: 2 + description: > + Ranges for the PCI memory and I/O regions + + phys: + maxItems: 1 + + phy-names: + items: + - const: pcie-phy + + dma-coherent: true + + "brcm,pcie-ob": + type: boolean + description: > + Some iProc SoCs do not have the outbound address mapping done by the + ASIC after power on reset. In this case, SW needs to configure it + + "brcm,pcie-ob-axi-offset": + $ref: /schemas/types.yaml#/definitions/uint32 + description: > + The offset from the AXI address to the internal address used by the + iProc PCIe core (not the PCIe address) + + msi-parent: true + + msi-controller: true + + "brcm,pcie-msi-inten": + type: boolean + description: > + Needs to be present for some older iProc platforms that require the + interrupt enable registers to be set explicitly to enable MSI + +dependencies: + "brcm,pcie-ob-axi-offset": ["brcm,pcie-ob"] + "brcm,pcie-msi-inten": [msi-controller] + +required: + - compatible + - reg + - ranges + +if: + properties: + compatible: + contains: + enum: + - brcm,iproc-pcie +then: + required: + - interrupt-controller + - interrupt-map + - interrupt-map-mask + +unevaluatedProperties: false + +examples: + - | + #include + + bus { + #address-cells = <1>; + #size-cells = <1>; + pcie0: pcie@18012000 { + compatible = "brcm,iproc-pcie"; + reg = <0x18012000 0x1000>; + + interrupt-controller; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>; + + linux,pci-domain = <0>; + + bus-range = <0x00 0xff>; + + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + ranges = <0x81000000 0 0 0x28000000 0 0x00010000>, + <0x82000000 0 0x20000000 0x20000000 0 0x04000000>; + + phys = <&phy 0 5>; + phy-names = "pcie-phy"; + + brcm,pcie-ob; + brcm,pcie-ob-axi-offset = <0x00000000>; + + msi-parent = <&msi0>; + + /* iProc event queue based MSI */ + msi0: msi { + compatible = "brcm,iproc-msi"; + msi-controller; + interrupt-parent = <&gic>; + interrupts = , + , + , + ; + }; + }; + + pcie1: pcie@18013000 { + compatible = "brcm,iproc-pcie"; + reg = <0x18013000 0x1000>; + + interrupt-controller; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 0>; + interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>; + + linux,pci-domain = <1>; + + bus-range = <0x00 0xff>; + + #address-cells = <3>; + #size-cells = <2>; + device_type = "pci"; + ranges = <0x81000000 0 0 0x48000000 0 0x00010000>, + <0x82000000 0 0x40000000 0x40000000 0 0x04000000>; + + phys = <&phy 1 6>; + phy-names = "pcie-phy"; + }; + };