From patchwork Tue Nov 15 15:25:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 20427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2793473wru; Tue, 15 Nov 2022 07:32:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf7WChUR+DFK5OtJqRJ6NNxdDFlDbdhybPhN/TgpJFBt+tDOkHuNryVG3fHGphpktzhQmvi/ X-Received: by 2002:a17:906:a046:b0:741:5c0e:1058 with SMTP id bg6-20020a170906a04600b007415c0e1058mr14200361ejb.472.1668526350866; Tue, 15 Nov 2022 07:32:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668526350; cv=none; d=google.com; s=arc-20160816; b=olEcLmep4LlGLp5pgfArCCrEqgg8lr0FgMsa47gq3+sZCU9FfID7zkcmCLSmfWRk78 mM46MrqokhZTez8+Ld/OJSw7c3fKntw0VKjQoUBvCmZz3ZHj9zmJj6SGofzPWjvuujCR /b6CKxILwHW/49RBgMSynxTn9jOGE/rNaFrVE7hrbF8MD2YkL8IrhuS6Nv1LmKkaXMye BEo29Rxua662ZlkIFzqeHv8rStmIhCNvGZ30mlYKieSx3tLdck0yrLro/jMCncpDEDxG /6Q917aN2sfWJA6ziridU0E9hOomNjekTok1rMOljRqXVDpF3pOQmcl2BFjg3CuWQGec c5yw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=+ReOjxoI2N4cLXZh/+9pzHtgV7qU4OiyCEjyzoAdFYo=; b=kStBfbRBQBKOpAeJP5p/cAUjTmsB6nhGfUdMBFRQ99B+KNK7n6bUkgpv1vZIkMTrLM r1Qpniw4WgvnH4xfC5nom2Ryx+z+CwYh5tuY730dVqRiJonJye0aoosoGNJyCiV7AkWr amzpDzAgL+53TpzbztW8UqwPPLHiCeBRxwRpyPVl6nkgktrLWZmPhyCY01oGghzD1cUj qb8vOKTspsgS2ppGEJP9VUMyyR+cX98GPgq4eZUXCfqVAJL1iRkNm84ZcDDOxDvIkAul 1WcSS4TKdhTRdhU2UQjQ1yoGTREJAdNdvJ5UN5NzBegL6l4kx8hn8HoAZPAFpwIpooO7 YlxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=x+IhVH94; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hz5-20020a1709072ce500b007adc5c4626bsi11346228ejc.50.2022.11.15.07.31.43; Tue, 15 Nov 2022 07:32:30 -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=@microchip.com header.s=mchp header.b=x+IhVH94; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236873AbiKOP0Y (ORCPT + 99 others); Tue, 15 Nov 2022 10:26:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232883AbiKOP0W (ORCPT ); Tue, 15 Nov 2022 10:26:22 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0BE4E1E3D5; Tue, 15 Nov 2022 07:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1668525979; x=1700061979; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=97PFrgnk+DB1D9eGelLXCgNw+jakJpsENZbaBuQwyoc=; b=x+IhVH94ygnSx2c8NebmbbdI4AqTAK2Qaz1t0SILuDEWWAOaHO+mmZGJ d3pIWLIUmFnZ7HFp4VftEDBZt8k+lFQlwUKYE0T1VI1/elSdjTcVUPxH8 XaVbW1bxln29yIyTbpE+AWVk78YfpxFuDugLYS0Dc7feJs46ps8z4QV5d Qox8X92aBY0Rhnlx1lAhPpwsFCsJcoIVRxF+zE5dFLKndIQZaY3Eb+KPm eLUNkkDqZlLs2LQ567xnasOHeuuOXaiNa4ABHccYMCDl3ZrwjokspIuXY KP8fux/S5ys2vzX94blcTd/eWLQsbUOKcZe0ISN+WXtrJz1eSPbddDBW1 g==; X-IronPort-AV: E=Sophos;i="5.96,166,1665471600"; d="scan'208";a="187073176" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 15 Nov 2022 08:26:16 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Tue, 15 Nov 2022 08:26:10 -0700 Received: from wendy.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Tue, 15 Nov 2022 08:26:09 -0700 From: Conor Dooley To: Conor Dooley , Daire McNamara CC: Rob Herring , Krzysztof Kozlowski , Palmer Dabbelt , Vattipalli Praveen , , , Subject: [PATCH 1/2] riscv: dts: microchip: remove pcie node from the sev kit Date: Tue, 15 Nov 2022 15:25:46 +0000 Message-ID: <20221115152546.1425309-1-conor.dooley@microchip.com> X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,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?1749576687267823764?= X-GMAIL-MSGID: =?utf-8?q?1749576687267823764?= The SEV kit reference design does not hook up the PCIe root port to the core complex including it is misleading. The entry is a re-use mistake - I was not aware of this when I moved the PCIe node out of mpfs.dtsi so that individual bistreams could connect it to different fics etc. Fixes: 978a17d1a688 ("riscv: dts: microchip: add sevkit device tree") Signed-off-by: Conor Dooley --- .../dts/microchip/mpfs-sev-kit-fabric.dtsi | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/arch/riscv/boot/dts/microchip/mpfs-sev-kit-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-sev-kit-fabric.dtsi index 8545baf4d129..39a77df489ab 100644 --- a/arch/riscv/boot/dts/microchip/mpfs-sev-kit-fabric.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs-sev-kit-fabric.dtsi @@ -13,33 +13,4 @@ fabric_clk1: fabric-clk1 { #clock-cells = <0>; clock-frequency = <125000000>; }; - - pcie: pcie@2000000000 { - compatible = "microchip,pcie-host-1.0"; - #address-cells = <0x3>; - #interrupt-cells = <0x1>; - #size-cells = <0x2>; - device_type = "pci"; - reg = <0x20 0x0 0x0 0x8000000>, <0x0 0x43000000 0x0 0x10000>; - reg-names = "cfg", "apb"; - bus-range = <0x0 0x7f>; - interrupt-parent = <&plic>; - interrupts = <119>; - interrupt-map = <0 0 0 1 &pcie_intc 0>, - <0 0 0 2 &pcie_intc 1>, - <0 0 0 3 &pcie_intc 2>, - <0 0 0 4 &pcie_intc 3>; - interrupt-map-mask = <0 0 0 7>; - clocks = <&fabric_clk1>, <&fabric_clk1>, <&fabric_clk3>; - clock-names = "fic0", "fic1", "fic3"; - ranges = <0x3000000 0x0 0x8000000 0x20 0x8000000 0x0 0x80000000>; - msi-parent = <&pcie>; - msi-controller; - status = "disabled"; - pcie_intc: interrupt-controller { - #address-cells = <0>; - #interrupt-cells = <1>; - interrupt-controller; - }; - }; }; From patchwork Tue Nov 15 15:25:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 20432 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2793628wru; Tue, 15 Nov 2022 07:32:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf7cTfLhO9IHbtqFlu1E9umn5oxwoM/P3lZQVrm/gslriyMe+tlfa0IJF6xE1Pkp3OAQ99fm X-Received: by 2002:a17:906:66da:b0:7a5:f8a5:6f84 with SMTP id k26-20020a17090666da00b007a5f8a56f84mr13796666ejp.569.1668526365240; Tue, 15 Nov 2022 07:32:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668526365; cv=none; d=google.com; s=arc-20160816; b=pRz3UYdOSOrjtF2tvzf60fUaYt9despsleqRqdkjSBGfVjDbpvpniDdxU7193QWhEL jm9Q8Ra1avuU7di8j9bbAdkU1YAaT0rDzZ0gAiuwVhyK25BWUVRMUsrrgOmpuO+FXznY zOl8T0gyR2MxJBkOM7qEQr3rshXfuMS2au+KM6a6p2htsKPzE6TBlvieY7yF2vqwGYAr 8vDC6g3ERm8U4Ce7qv0WfWqP1Dod5D8nDwUprmhGIg5cQKqrZ/gFdDnLcDVBuKDborqK gaTzQweTXrLEoFqW+uugr0G06dNG+4eLLtYxVirnOtqBOKNFxvPzYbQ6pXA4acI3alPT Lp8A== 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=CT/HJ+rD5hu3p81vXQ688+NoHcIF56EkpGilKBKrgCE=; b=orgm5ESl5U+DDrMmVsoFeEyc24iYkmtLy3bBItwAFziUPVoh6SiGI7LVYZ9twZITXO +IUvg1zRMKn7JPn/4JaDexSUI+A2hqGJ7Ogf2tKKDZm8R4DOXaTcwlumPgbFfBGSgRPh STVJXuUNBr5YkWVp+QUEX1fqQvlpSvp/rPC8DWBsb+JdvIJV34Dq/EBbcX+JjanzWoTR GLMckDCbyFw1nw8Drzz3zhMR10iFymS01RYOXJY8lyU46NetmXK4fwZHPr+/M3lzJncV ZQeGeVjrqr641VHmm7GIdgjiApQJSejbEmkKAceeYp6zqdHllMlyTm4TvHulBowP+FdC eoig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microchip.com header.s=mchp header.b=JrfOzFjL; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e3-20020a056402104300b004513abe8f74si2463700edu.249.2022.11.15.07.32.16; Tue, 15 Nov 2022 07:32:45 -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=@microchip.com header.s=mchp header.b=JrfOzFjL; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237647AbiKOP01 (ORCPT + 99 others); Tue, 15 Nov 2022 10:26:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236796AbiKOP0Y (ORCPT ); Tue, 15 Nov 2022 10:26:24 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.153.233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E87E1E3D5; Tue, 15 Nov 2022 07:26:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1668525983; x=1700061983; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=IGihFppS2au5FTiJUnJrlcOJRBfXk4goCN+sJ4nWs/0=; b=JrfOzFjLLUGa6+xfwru0Zon+wv6VFYvg74w3ukyzTZGVUhQSGwIyah1p d2umYKfTjtkPYqnagUvB4bAMv4+Y7/d0Wa+qzSMjK3srWakw/c7X36OAe zZ1pZjsNFfYaMIZLHSxuQJ3TiNgmmCFX1UZB7GUZrUwLPNOVO052aqS3S uR2YKhDXBIDhL9CbvuryjVpusJb3e1jbIh0prJcG9GbXEQwic+3fVOXu0 6n04gNR3wwe9pRh6SooRFKho1NyGWaNpbh1wuI+OkqejfFEHfh2wgro81 DIXOVsMAIRmuG0xM5rVR44fJd5fKhKmenAOE94S889trs2xnkms6cycAn w==; X-IronPort-AV: E=Sophos;i="5.96,166,1665471600"; d="scan'208";a="189118719" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa3.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 15 Nov 2022 08:26:13 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Tue, 15 Nov 2022 08:26:12 -0700 Received: from wendy.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Tue, 15 Nov 2022 08:26:11 -0700 From: Conor Dooley To: Conor Dooley , Daire McNamara CC: Rob Herring , Krzysztof Kozlowski , Palmer Dabbelt , Vattipalli Praveen , , , Subject: [PATCH 2/2] riscv: dts: microchip: remove unused pcie clocks Date: Tue, 15 Nov 2022 15:25:47 +0000 Message-ID: <20221115152546.1425309-2-conor.dooley@microchip.com> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221115152546.1425309-1-conor.dooley@microchip.com> References: <20221115152546.1425309-1-conor.dooley@microchip.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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?1749576702228514105?= X-GMAIL-MSGID: =?utf-8?q?1749576702228514105?= The PCIe root port in the designs that ship with these boards are connected via one, not two Fabric Interface Controllers (FIC). The 0x20_0000_0000 is fic0, so remove the fic1 clocks from the dt node. The same clock provides both, so this is harmless but inaccurate. Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi | 4 ++-- arch/riscv/boot/dts/microchip/mpfs-polarberry-fabric.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi index 7b9ee13b6a3a..8230f06ddf48 100644 --- a/arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs-m100pfs-fabric.dtsi @@ -30,8 +30,8 @@ pcie: pcie@2000000000 { <0 0 0 3 &pcie_intc 2>, <0 0 0 4 &pcie_intc 3>; interrupt-map-mask = <0 0 0 7>; - clocks = <&fabric_clk1>, <&fabric_clk1>, <&fabric_clk3>; - clock-names = "fic0", "fic1", "fic3"; + clocks = <&fabric_clk1>, <&fabric_clk3>; + clock-names = "fic0", "fic3"; ranges = <0x3000000 0x0 0x8000000 0x20 0x8000000 0x0 0x80000000>; msi-parent = <&pcie>; msi-controller; diff --git a/arch/riscv/boot/dts/microchip/mpfs-polarberry-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-polarberry-fabric.dtsi index 67303bc0e451..9a56de7b91d6 100644 --- a/arch/riscv/boot/dts/microchip/mpfs-polarberry-fabric.dtsi +++ b/arch/riscv/boot/dts/microchip/mpfs-polarberry-fabric.dtsi @@ -30,8 +30,8 @@ pcie: pcie@2000000000 { <0 0 0 3 &pcie_intc 2>, <0 0 0 4 &pcie_intc 3>; interrupt-map-mask = <0 0 0 7>; - clocks = <&fabric_clk1>, <&fabric_clk1>, <&fabric_clk3>; - clock-names = "fic0", "fic1", "fic3"; + clocks = <&fabric_clk1>, <&fabric_clk3>; + clock-names = "fic0", "fic3"; ranges = <0x3000000 0x0 0x8000000 0x20 0x8000000 0x0 0x80000000>; msi-parent = <&pcie>; msi-controller;