From patchwork Thu Apr 18 20:09:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13635418 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 294CFC04FF8 for ; Thu, 18 Apr 2024 20:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4Yf1WwMlSyuKTrApP9a+pygFbXWJTxe2eETX5tjwdLs=; b=Msyo2m5yzwRbjd QumQYHRy9KSHGrKQXMzedRb0VbBUv55Enf3tz21BVIEKM/1WiQq8PoeegDyzBL+6e68Svq8q6KtMI RjNbL24u+PE/vgOCrgnT3NZc2GpsqSRBCisLdpkHGpTQWhWKlL7YoBWE8BpGFt4kvVutfOt1pOOIl MhXe3VIlyZ55dN1Uq/+e3WzuZFTQSAQJqLqnL2+LRvCjISjT3FclDoTeHTVD22dBM1F7E1wwb3jC6 5CphidNqTX+wIQnKHO1upseyxh04SzBBrQwUO83LJxMsywULvYaquJrLSbG5FiX1xPXLqDoVN+e4I tk/OdICYlCzBDKP1mvOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxY5L-00000003b8Q-45eb; Thu, 18 Apr 2024 20:10:20 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxY5D-00000003b4m-2RRw for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 20:10:13 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id B1092CE18E7; Thu, 18 Apr 2024 20:10:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2035C113CC; Thu, 18 Apr 2024 20:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713471008; bh=h4USdSWrObqaShpccdjzCvfL0FvhrtPROlPptuSSiLI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rUWltMsZ6VPntRp6y4U+QHQ+4xtS8rjX4+FYb4cin/PwkgpuIEgaAApMw+10WVMZW yFzAUfWLwjc2Qos6kfN+zHy1sS6f3x0UixcWRjNnoWHzewCbM63yFa1Nad+qpSHnVS tlNch7Wy0LBufrSrjVDLNDnVwhlfMwkHjeErHgTVFOc5NKJU1M0/NxfsY8RecMFLyL sfqbbKWXtjw3Y6jrGxN/MP9cyC6FcHpMFEesVOotyLEcNyMBXwkbGXrgYcd8H3bt6R +KNo0WHZm5vMj5nXvUzd60jy4AYqocwtW/Bp9WQB777z39u9nIraRrWO4TWfgIMwDn nrg4ztiOLNBWQ== From: "Rob Herring (Arm)" Date: Thu, 18 Apr 2024 15:09:25 -0500 Subject: [PATCH 1/2] arm64: dts: freescale: ls1028a: Fix embedded PCI interrupt mapping MIME-Version: 1.0 Message-Id: <20240418-dt-ls1028a-pci-fixes-v1-1-95f17405e481@kernel.org> References: <20240418-dt-ls1028a-pci-fixes-v1-0-95f17405e481@kernel.org> In-Reply-To: <20240418-dt-ls1028a-pci-fixes-v1-0-95f17405e481@kernel.org> To: Shawn Guo , Li Yang , Krzysztof Kozlowski , Conor Dooley , Richard Cochran Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org X-Mailer: b4 0.14-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240418_131011_876540_37775192 X-CRM114-Status: GOOD ( 11.58 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org PCI devices should use PCI interrupt binding for their interrupts assuming they function as standard PCI interrupts. The embedded PCI devices in the LS1028a are mapping the interrupts directly to the host interrupt controller. While that works here, it is unusual. Based on the reference manual, there is not any INTC or INTD to map, so only INTA and INTB are mapped. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index ae534c23b970..8f8179924851 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -1099,6 +1099,10 @@ pcie@1f0000000 { /* Integrated Endpoint Root Complex */ 0xc2000000 0x1 0xf8230000 0x1 0xf8230000 0x0 0x020000 /* BAR4 (PF5) - non-prefetchable memory */ 0x82000000 0x1 0xfc000000 0x1 0xfc000000 0x0 0x400000>; + #interrupt-cells = <1>; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0000 0 0 1 &gic 0 0 GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>, + <0000 0 0 2 &gic 0 0 GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; enetc_port0: ethernet@0,0 { compatible = "fsl,enetc"; @@ -1143,7 +1147,7 @@ ethernet@0,4 { mscc_felix: ethernet-switch@0,5 { reg = <0x000500 0 0 0 0>; /* IEP INT_B */ - interrupts = ; + interrupts = <2>; status = "disabled"; mscc_felix_ports: ports { @@ -1216,7 +1220,7 @@ fixed-link { rcec@1f,0 { reg = <0x00f800 0 0 0 0>; /* IEP INT_A */ - interrupts = ; + interrupts = <1>; }; }; From patchwork Thu Apr 18 20:09:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 13635419 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C58BCC4345F for ; Thu, 18 Apr 2024 20:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VU5y4cTk7+rye0FDEGPGRdre0d+/55bFMjgg/EkGtdo=; b=vAx7EQwIRrIJoa PugHwPjTic8qa1L96cIg2SuyDqzWdDodVG4m2UXNfNL1JduZeSqlO88Z4k0G3M177jgGa34rs8sgt mxGjIwrXSGkqY5rGH4jX/s0mHn86kSMoMxxBZ/lKsHjCd9dF14V1/p3duRMWo39ie0d7MLeTd7Len Myd2nT9xPBWjdSLMD3ndZ/XY8EN3C2d1SsvFaoHkyU7H0Kt4aQPP1eM9mQw/0YkL2MQnPBq+skLq9 5OfZPVN90/aN6XuRO5Sfd3Nw7w9GkUI8BDAcggb0kRlKSHPttz01C7gsAVrJ2MzBs8rAIF3yTaxI3 hh6ThaSMQS+AWdQfkcZQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxY5N-00000003b8s-02ef; Thu, 18 Apr 2024 20:10:21 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxY5E-00000003b4v-0IKe for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2024 20:10:13 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8F2B8618FA; Thu, 18 Apr 2024 20:10:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 328C4C113CC; Thu, 18 Apr 2024 20:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713471011; bh=1jbCnAE/ii2sK8qE3QI3BU+zcM+GW4I6gtOic2jfh/E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=maHvPTheexlW8Hckm36c6THqkXj57VC9Zg+iPO0oegPO6TEP0a1soaMRmcPLmKWWj UyFCY74mwJmUQtjH1WYEBvEtOahlhTSp7VrzaqrMlRYRzNW/p/J6eAMLiVEVZ1dMDn zZzutXtm3NY7JZ1JuRRVO/Ux2qXq2leHoOGwtqr0K4g82CFWe+Ua0paI2LK1CUdJWN gHciySLXMJ+PjNNgZWE4gythG/pdNz+gKMEjzlaXWP5IQB1sqa8U/QemeyunOUQr7C MFvShtooBgsgX7FUbrpXRmPMX9n/578Qxq11X3vSd1GlikpEx6bWtt3a1+OpydIRLe 8FyV/FAINIJ1Q== From: "Rob Herring (Arm)" Date: Thu, 18 Apr 2024 15:09:26 -0500 Subject: [PATCH 2/2] arm64: dts: freescale: ls1028a: Add standard PCI device compatible strings to ENETC MIME-Version: 1.0 Message-Id: <20240418-dt-ls1028a-pci-fixes-v1-2-95f17405e481@kernel.org> References: <20240418-dt-ls1028a-pci-fixes-v1-0-95f17405e481@kernel.org> In-Reply-To: <20240418-dt-ls1028a-pci-fixes-v1-0-95f17405e481@kernel.org> To: Shawn Guo , Li Yang , Krzysztof Kozlowski , Conor Dooley , Richard Cochran Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org X-Mailer: b4 0.14-dev X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240418_131012_266363_5496C039 X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org PCI devices should have a compatible string based on the vendor and device IDs. Add these to the Freescale ENETC devices. Putting the PCI compatible string first as vendor and device ID is more specific than a compatible without any device specific information. Signed-off-by: Rob Herring (Arm) --- arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 8f8179924851..70b8731029c4 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -1105,19 +1105,19 @@ pcie@1f0000000 { /* Integrated Endpoint Root Complex */ <0000 0 0 2 &gic 0 0 GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; enetc_port0: ethernet@0,0 { - compatible = "fsl,enetc"; + compatible = "pci1957,e100", "fsl,enetc"; reg = <0x000000 0 0 0 0>; status = "disabled"; }; enetc_port1: ethernet@0,1 { - compatible = "fsl,enetc"; + compatible = "pci1957,e100", "fsl,enetc"; reg = <0x000100 0 0 0 0>; status = "disabled"; }; enetc_port2: ethernet@0,2 { - compatible = "fsl,enetc"; + compatible = "pci1957,e100", "fsl,enetc"; reg = <0x000200 0 0 0 0>; phy-mode = "internal"; status = "disabled"; @@ -1130,14 +1130,14 @@ fixed-link { }; enetc_mdio_pf3: mdio@0,3 { - compatible = "fsl,enetc-mdio"; + compatible = "pci1957,ee01", "fsl,enetc-mdio"; reg = <0x000300 0 0 0 0>; #address-cells = <1>; #size-cells = <0>; }; ethernet@0,4 { - compatible = "fsl,enetc-ptp"; + compatible = "pci1957,ee02", "fsl,enetc-ptp"; reg = <0x000400 0 0 0 0>; clocks = <&clockgen QORIQ_CLK_HWACCEL 3>; little-endian; @@ -1205,7 +1205,7 @@ fixed-link { }; enetc_port3: ethernet@0,6 { - compatible = "fsl,enetc"; + compatible = "pci1957,e100", "fsl,enetc"; reg = <0x000600 0 0 0 0>; phy-mode = "internal"; status = "disabled";