From patchwork Tue Feb 14 14:07:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 57001 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2994394wrn; Tue, 14 Feb 2023 06:10:26 -0800 (PST) X-Google-Smtp-Source: AK7set8v50JWUiYv07XDnosKAZ2/42mlNkVPw15jnl5k+mHnWwfeRr7ZoXLpImTLIepYq6StXA/U X-Received: by 2002:a17:90b:4a08:b0:233:d870:f4c7 with SMTP id kk8-20020a17090b4a0800b00233d870f4c7mr2630158pjb.21.1676383825725; Tue, 14 Feb 2023 06:10:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676383825; cv=none; d=google.com; s=arc-20160816; b=nSgx5LWbc7kIK1EFlPip335mGATB4yz0X6jSVaAYLjtGLwcoak6bxC8zgi7+TMVPTq vHyAJ35PT0qSW5HOguBo9ApspzZrcNz7a9hPRtGD3rK727dnk7DTQQj2jj2vzjlpDVUY EOmMitmim+HemqfIN77AMWRS1q+ZaqWd964ikEEX/HsFfYfRU3xiMc7w8bKDLyu3q4nC 6OtPkN6LVAVkeg91bgza31o00tojyHK5SmHpbkEE0cM02I0R6rSDIRVx+THJKKc6VB+w 9CuNqyvk7yg1Pvje6fFDFCn6+B7NA/XoSMGHkcRRSWWSD2iRNJL9KZoREMKYcewDAzEl I8VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=N+YGyiDsISLN6PO65tNte/BA+GajC5UfB0BzrFaaCYo=; b=mCm8XkqmgKeH9/LnELCNr/HRMSd2ugwpH85gGZbLXKCzclcdu6rbxY9iA9/+ahL2kO dAqj+iT/5BDWIefnkc8VKMbvbmR8z/AfuECScP/qUt2ApDXzfEdq2VQlgz4XeeDez6Js zFes+WSU1p1qNbxqqr9HK2unT6Jr/LSXw3A6CuaW+QHnqWk1kbne3CrDQ3sWe1q85sUH YADksUCVK3e0L52rNvQuJH3mN/0se+3QalLtucKTClSOkBQouq2yrmNcLz5gbU6iWKWu OpYRyZzJbinaemZ8LE+8ZUsh2xSBl8hDR9fCe6jwOhkhlfMJEnC2NI2t6+oAitAYdL47 27Fw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id na14-20020a17090b4c0e00b002308d9212d2si266624pjb.35.2023.02.14.06.10.12; Tue, 14 Feb 2023 06:10:25 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229878AbjBNOJp (ORCPT + 99 others); Tue, 14 Feb 2023 09:09:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233213AbjBNOJl (ORCPT ); Tue, 14 Feb 2023 09:09:41 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6951122780; Tue, 14 Feb 2023 06:09:00 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id 94F2B26F790; Tue, 14 Feb 2023 15:07:35 +0100 (CET) From: Janne Grunau Date: Tue, 14 Feb 2023 15:07:22 +0100 Subject: [PATCH 1/2] arm64: dts: apple: t8103: Disable unused PCIe ports MIME-Version: 1.0 Message-Id: <20230214-apple_dts_pcie_disable_unused-v1-1-5ea0d3ddcde3@jannau.net> References: <20230214-apple_dts_pcie_disable_unused-v1-0-5ea0d3ddcde3@jannau.net> In-Reply-To: <20230214-apple_dts_pcie_disable_unused-v1-0-5ea0d3ddcde3@jannau.net> To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Krzysztof Kozlowski , Mark Kettenis Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=4864; i=j@jannau.net; h=from:subject:message-id; bh=I0e5oauNrijyIdi2VXTzOBmrHV4GlyY8HRt7c4tuU8A=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuTXU5dlCh7hn1JZtH1yEM+9y5yLXsTbfCx6Y/qdfYbIi spDQjP3dJSyMIhxMMiKKbIkab/sYFhdoxhT+yAMZg4rE8gQBi5OAZiIhCLDP0tRJsGm7cmapr8i FWYyTgtLPxp4yY97U7nVFcP58h94vBj+J/JMUTZ8x83Cezmh6vDXK3LXipx9M+4Jt9yaopfjktf GCgA= X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE 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?1757815846319731415?= X-GMAIL-MSGID: =?utf-8?q?1757815846319731415?= The PCIe ports are unused (without devices) so disable them instead of removing them. Fixes: 7c77ab91b33d ("arm64: dts: apple: Add missing M1 (t8103) devices") Signed-off-by: Janne Grunau --- arch/arm64/boot/dts/apple/t8103-j274.dts | 10 ++++++++++ arch/arm64/boot/dts/apple/t8103-j293.dts | 15 --------------- arch/arm64/boot/dts/apple/t8103-j313.dts | 15 --------------- arch/arm64/boot/dts/apple/t8103-j456.dts | 10 ++++++++++ arch/arm64/boot/dts/apple/t8103-j457.dts | 11 +++-------- arch/arm64/boot/dts/apple/t8103.dtsi | 4 ++++ 6 files changed, 27 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts index b52ddc409893..1c3e37f86d46 100644 --- a/arch/arm64/boot/dts/apple/t8103-j274.dts +++ b/arch/arm64/boot/dts/apple/t8103-j274.dts @@ -37,10 +37,12 @@ &wifi0 { &port01 { bus-range = <2 2>; + status = "okay"; }; &port02 { bus-range = <3 3>; + status = "okay"; ethernet0: ethernet@0,0 { reg = <0x30000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ @@ -48,6 +50,14 @@ ethernet0: ethernet@0,0 { }; }; +&pcie0_dart_1 { + status = "okay"; +}; + +&pcie0_dart_2 { + status = "okay"; +}; + &i2c2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/apple/t8103-j293.dts b/arch/arm64/boot/dts/apple/t8103-j293.dts index 151074109a11..c363dfef8070 100644 --- a/arch/arm64/boot/dts/apple/t8103-j293.dts +++ b/arch/arm64/boot/dts/apple/t8103-j293.dts @@ -25,21 +25,6 @@ &wifi0 { brcm,board-type = "apple,honshu"; }; -/* - * Remove unused PCIe ports and disable the associated DARTs. - */ - -&pcie0_dart_1 { - status = "disabled"; -}; - -&pcie0_dart_2 { - status = "disabled"; -}; - -/delete-node/ &port01; -/delete-node/ &port02; - &i2c2 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/apple/t8103-j313.dts b/arch/arm64/boot/dts/apple/t8103-j313.dts index bc1f865aa790..08409be1cf35 100644 --- a/arch/arm64/boot/dts/apple/t8103-j313.dts +++ b/arch/arm64/boot/dts/apple/t8103-j313.dts @@ -24,18 +24,3 @@ &bluetooth0 { &wifi0 { brcm,board-type = "apple,shikoku"; }; - -/* - * Remove unused PCIe ports and disable the associated DARTs. - */ - -&pcie0_dart_1 { - status = "disabled"; -}; - -&pcie0_dart_2 { - status = "disabled"; -}; - -/delete-node/ &port01; -/delete-node/ &port02; diff --git a/arch/arm64/boot/dts/apple/t8103-j456.dts b/arch/arm64/boot/dts/apple/t8103-j456.dts index 2db425ceb30f..58c8e43789b4 100644 --- a/arch/arm64/boot/dts/apple/t8103-j456.dts +++ b/arch/arm64/boot/dts/apple/t8103-j456.dts @@ -55,13 +55,23 @@ hpm3: usb-pd@3c { &port01 { bus-range = <2 2>; + status = "okay"; }; &port02 { bus-range = <3 3>; + status = "okay"; ethernet0: ethernet@0,0 { reg = <0x30000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ local-mac-address = [00 10 18 00 00 00]; }; }; + +&pcie0_dart_1 { + status = "okay"; +}; + +&pcie0_dart_2 { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/apple/t8103-j457.dts b/arch/arm64/boot/dts/apple/t8103-j457.dts index 3821ff146c56..152f95fd49a2 100644 --- a/arch/arm64/boot/dts/apple/t8103-j457.dts +++ b/arch/arm64/boot/dts/apple/t8103-j457.dts @@ -37,6 +37,7 @@ &wifi0 { &port02 { bus-range = <3 3>; + status = "okay"; ethernet0: ethernet@0,0 { reg = <0x30000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ @@ -44,12 +45,6 @@ ethernet0: ethernet@0,0 { }; }; -/* - * Remove unused PCIe port and disable the associated DART. - */ - -&pcie0_dart_1 { - status = "disabled"; +&pcie0_dart_2 { + status = "okay"; }; - -/delete-node/ &port01; diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi index 9859219699f4..87a9c1ba6d0f 100644 --- a/arch/arm64/boot/dts/apple/t8103.dtsi +++ b/arch/arm64/boot/dts/apple/t8103.dtsi @@ -724,6 +724,7 @@ pcie0_dart_1: iommu@682008000 { interrupt-parent = <&aic>; interrupts = ; power-domains = <&ps_apcie_gp>; + status = "disabled"; }; pcie0_dart_2: iommu@683008000 { @@ -733,6 +734,7 @@ pcie0_dart_2: iommu@683008000 { interrupt-parent = <&aic>; interrupts = ; power-domains = <&ps_apcie_gp>; + status = "disabled"; }; pcie0: pcie@690000000 { @@ -807,6 +809,7 @@ port01: pci@1,0 { <0 0 0 2 &port01 0 0 0 1>, <0 0 0 3 &port01 0 0 0 2>, <0 0 0 4 &port01 0 0 0 3>; + status = "disabled"; }; port02: pci@2,0 { @@ -826,6 +829,7 @@ port02: pci@2,0 { <0 0 0 2 &port02 0 0 0 1>, <0 0 0 3 &port02 0 0 0 2>, <0 0 0 4 &port02 0 0 0 3>; + status = "disabled"; }; }; }; From patchwork Tue Feb 14 14:07:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 57025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3004700wrn; Tue, 14 Feb 2023 06:27:42 -0800 (PST) X-Google-Smtp-Source: AK7set/pB8LHmXSToi1f81MT5DiAH2688ALP8PGPNIrKrxrwaHuBuyFWNz0bjJibKDGzRYgzedRM X-Received: by 2002:a05:6a21:6d82:b0:c0:cee4:f77b with SMTP id wl2-20020a056a216d8200b000c0cee4f77bmr3199196pzb.18.1676384862193; Tue, 14 Feb 2023 06:27:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676384862; cv=none; d=google.com; s=arc-20160816; b=DEpU3kzNSyUnfH1NfcSchIU5pyWuBp7afStd1JIUpzPU0/LWn4eJlp5pgr4NALPthh x76lD6XshD7RfV9T/H1i8E6Os1FQgwWL+7aBxGoKVbSp/t/QjH1zNBN6D03BClQYdB/l dR7xVN6u5ndGEBhV0Q6tKmhM7PpNnm6Elqu0lbJWlhD8pt9fZXDWmP+07DvciXnZgWAT x4ibxuy4w1MwveBd4tFy6xHq32VltOSXm4qcWV2HwMoMCNhz4jQXxlN24A0YP0YbgW1q 6bnC6J7a1sLEVEkERR1OlpFhHMb2M307t3CDjfvUcezZsMRPJFPJ1DR/dUsPK/zXHOwr YROQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from; bh=IUaoVZmUFRqvOMytVbFLBCm5Kwo+7hoxrI07Sok78O0=; b=w0HFaQBiDpJfjTOPANn19FDnAwHRXo/x+Rff6dyZhigzTY5wbg8OcuhyeTc7nOh7Ml 3MSYocOWNyOtJ0IBDYL2+JFn29oOEv0W1ttgFs+DXftG6zmg/1p1oK7Ke6rNSPumrMZo GwcjWEmCZ7GuHCDz8Hwknxb/il2r3nD6V6JeUJR6obYfXVRT0miJbzvPTcLyw1uczQUq hxPomUY1rnN7U600qW981FXSWi12+afdS1WFtUxyxkZ0B0RFHfLnoOd0LZYxgOnCzTFc BjEyK7z+gBNaNWdsROjizpmpfTcsrgmEDOqlTxhr/5ki8WVNaiM4zfLnpOOWypC3kBsK EMKg== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i11-20020a633c4b000000b004fbaf699f3csi5257564pgn.605.2023.02.14.06.27.29; Tue, 14 Feb 2023 06:27:42 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232691AbjBNORw (ORCPT + 99 others); Tue, 14 Feb 2023 09:17:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232724AbjBNORl (ORCPT ); Tue, 14 Feb 2023 09:17:41 -0500 Received: from soltyk.jannau.net (soltyk.jannau.net [144.76.91.90]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ECA52A99F; Tue, 14 Feb 2023 06:17:15 -0800 (PST) Received: from robin.home.jannau.net (p579ad32f.dip0.t-ipconnect.de [87.154.211.47]) by soltyk.jannau.net (Postfix) with ESMTPSA id 0C37626F791; Tue, 14 Feb 2023 15:07:36 +0100 (CET) From: Janne Grunau Date: Tue, 14 Feb 2023 15:07:23 +0100 Subject: [PATCH 2/2] arm64: dts: apple: t600x: Disable unused PCIe ports MIME-Version: 1.0 Message-Id: <20230214-apple_dts_pcie_disable_unused-v1-2-5ea0d3ddcde3@jannau.net> References: <20230214-apple_dts_pcie_disable_unused-v1-0-5ea0d3ddcde3@jannau.net> In-Reply-To: <20230214-apple_dts_pcie_disable_unused-v1-0-5ea0d3ddcde3@jannau.net> To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Krzysztof Kozlowski , Mark Kettenis Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2667; i=j@jannau.net; h=from:subject:message-id; bh=74L4fYQpSoiEaY1wpdyutKStOgs9Y2VuNjtikaZdZnc=; b=owGbwMvMwCG2UNrmdq9+ahrjabUkhuTXU5f9OvxLTOaU8uPdmfdO3+rM9m/R4xRfOWVG9yOJ2 uWhC1RedpSyMIhxMMiKKbIkab/sYFhdoxhT+yAMZg4rE8gQBi5OAZhI8R+G/7nrLv9U6+jacuHs 3Ozkvwo77cz7F6Zqpn++zq+Z5f1uyQdGhrVbfLOtmKV/PvSbuTzq1h+2/+fVdAzD13csq1Wb3nH VjgUA X-Developer-Key: i=j@jannau.net; a=openpgp; fpr=8B336A6BE4E5695E89B8532B81E806F586338419 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_NONE 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?1757816932859230885?= X-GMAIL-MSGID: =?utf-8?q?1757816932859230885?= The PCIe ports are unused (without devices) so disable them instead of removing them. Signed-off-by: Janne Grunau --- arch/arm64/boot/dts/apple/t600x-die0.dtsi | 4 ++++ arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 11 ----------- arch/arm64/boot/dts/apple/t600x-j375.dtsi | 11 +++++++++++ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t600x-die0.dtsi b/arch/arm64/boot/dts/apple/t600x-die0.dtsi index 1c41954e3899..273d7060d031 100644 --- a/arch/arm64/boot/dts/apple/t600x-die0.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-die0.dtsi @@ -233,6 +233,7 @@ pcie0_dart_2: iommu@583008000 { interrupt-parent = <&aic>; interrupts = ; power-domains = <&ps_apcie_gp_sys>; + status = "disabled"; }; pcie0_dart_3: iommu@584008000 { @@ -242,6 +243,7 @@ pcie0_dart_3: iommu@584008000 { interrupt-parent = <&aic>; interrupts = ; power-domains = <&ps_apcie_gp_sys>; + status = "disabled"; }; pcie0: pcie@590000000 { @@ -338,6 +340,7 @@ port02: pci@2,0 { <0 0 0 2 &port02 0 0 0 1>, <0 0 0 3 &port02 0 0 0 2>, <0 0 0 4 &port02 0 0 0 3>; + status = "disabled"; }; port03: pci@3,0 { @@ -357,5 +360,6 @@ port03: pci@3,0 { <0 0 0 2 &port03 0 0 0 1>, <0 0 0 3 &port03 0 0 0 2>, <0 0 0 4 &port03 0 0 0 3>; + status = "disabled"; }; }; diff --git a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi index 34906d522f0a..356a73d1ce4c 100644 --- a/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi @@ -101,14 +101,3 @@ sdhci0: mmc@0,0 { wp-inverted; }; }; - -&pcie0_dart_2 { - status = "disabled"; -}; - -&pcie0_dart_3 { - status = "disabled"; -}; - -/delete-node/ &port02; -/delete-node/ &port03; diff --git a/arch/arm64/boot/dts/apple/t600x-j375.dtsi b/arch/arm64/boot/dts/apple/t600x-j375.dtsi index 00d3a9447c89..1e5a19e49b08 100644 --- a/arch/arm64/boot/dts/apple/t600x-j375.dtsi +++ b/arch/arm64/boot/dts/apple/t600x-j375.dtsi @@ -104,6 +104,7 @@ sdhci0: mmc@0,0 { &port02 { /* 10 Gbit Ethernet */ bus-range = <3 3>; + status = "okay"; ethernet0: ethernet@0,0 { reg = <0x30000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ @@ -114,4 +115,14 @@ ethernet0: ethernet@0,0 { &port03 { /* USB xHCI */ bus-range = <4 4>; + status = "okay"; +}; + + +&pcie0_dart_2 { + status = "okay"; +}; + +&pcie0_dart_3 { + status = "okay"; };