From patchwork Tue Nov 21 21:29:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Edwards X-Patchwork-Id: 167959 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp926147vqb; Tue, 21 Nov 2023 13:30:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmNUYwiGIGH6RquMfIwyH3mXt5XckD6OpPV3NCUWJRF9RgNTCOVSw7z+j86F5VhDC9VCGK X-Received: by 2002:a17:90b:3903:b0:280:3911:adfe with SMTP id ob3-20020a17090b390300b002803911adfemr495876pjb.39.1700602219197; Tue, 21 Nov 2023 13:30:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700602219; cv=none; d=google.com; s=arc-20160816; b=u0pI1IcKUbKGyJAoFeVmsebjecG+6qKmAMA8AfyhW+LCzE4YIanozqSBj6r2S6WJOD +s7mQEkVOxhJyUp1AovfGCxjtec3DCRKW/FjylHjG6gabtJDFm+0URktpcx7WO4T/y36 9z54GsurScDB0pQEgQQ4UxVxAkp7DbPZnmdo0CjiQVwF0eLiGly6X3HuxnKaKBfaGgxy XAj10/tvSoCadv83Vihps2mfZT5xUAVQeOewyCakrRipZgFiUstQKoPo+TLw2pXNF1hJ B/7JBxwD0YhtDOQfaF/h5Db2mS1J0ytcyEYzn0KXLD2Ru5nKqYIaBI2DGMI05q8AFety gM0g== 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=7MBM4ZA5oNd9/yj6ChXURBgLtdL7sP8s8g23+U8L60Y=; fh=DNsAYyGcE9jZCzFeNEvvslBfJZOxK2Drta5JX6+W1VA=; b=HvkabT9Z+VZgkGoDNWowpOMQdR0U6nS9sA/+xkge7OCTkBQzgAK1h5o4gY4HKwwDk8 fxxXt2SWB2M+K60hnN2Kz8PwOuQtt+CKifXYiX2ZtqdgxgmdYDN6/TR2wQTqt7CDpaQb UTwSgnUHHYLQi+nHS+sFX+trn2XclZvD4RsojVvePA6IvlblyOMPvRHiO/w9A4l/K8FW 1NF7szty20gcbTLgqg/gycoSgNURyTOibNCUO0IQk0H/LuOjgBVU2wZx040bBFmxcufx Eizc/SsWqAK1eVYh1q2qxdTL8AlrOnCA02H1L/IvbfcvVgDvezOLUwk4EUn+WF/okuc4 p09A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TPe6obDv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id cl13-20020a17090af68d00b002851017a187si7847939pjb.162.2023.11.21.13.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 13:30:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TPe6obDv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 042A6803D565; Tue, 21 Nov 2023 13:30:09 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229667AbjKUVaL (ORCPT + 99 others); Tue, 21 Nov 2023 16:30:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229488AbjKUVaK (ORCPT ); Tue, 21 Nov 2023 16:30:10 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB11ACB; Tue, 21 Nov 2023 13:30:06 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1cc4f777ab9so48321805ad.0; Tue, 21 Nov 2023 13:30:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700602206; x=1701207006; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7MBM4ZA5oNd9/yj6ChXURBgLtdL7sP8s8g23+U8L60Y=; b=TPe6obDvbP5LmXICJR5rxbEo9SCsHShmvKTJU8iyZloRWLthuNHW+GIqLoIQ/BjW56 2RcsjfIx5abg4aFJIakiT1zXWEu/D/GLqnRh0zNCHndWSZ1ffM2qKlL+qxFkH5MU5mbG QoScVIzMEPtCJGGZVTnXnFKkAWwz7r0PchepTTLdBZHXWlb/xEjB6SJ/OhmagSFPIbZS OmuvFSgz7IVdcSm72/284tgHOziX3GED2bSwgdAtaLkAVJixL8TvyIa1z5d3V6AomurT k0f11eXRvr2vGHgR8Wzt1cnGrd+mTx4pxoo33fm+3KIvZHxkJOtno0I5ZDo6/QW8IFy2 zUVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700602206; x=1701207006; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7MBM4ZA5oNd9/yj6ChXURBgLtdL7sP8s8g23+U8L60Y=; b=hRjhLkmAygo/QfGgowYQzSdLYD4Uxpe4wwDoGgp4nBIHxFbySH+1WUSLOBYUue7sp7 7T78RXVWaPLc1UM5cGQ9+OAh4X9DSJ/QvPGikNzHw/8OMwR4EFmUM3NwG3d+HQ5cWVhV gYO6S6WZOab72LnldtSy12n4sn3aM1o7ulVWMk7dDHUYKhbL8S9EuGo7NZZYs1kf031U VsffZb46X//XW4Azlw7eTtr4+dmc4DrgIF9ZpxB6+ovoSfYanncVxPQP4eSmTD5iHqY5 uJvirovlOdt522g4sXkU2EmfA/kZ7LQDZ/dQlWXvfSISn7SqtNeYApsl30A+mz1MGW28 mj4A== X-Gm-Message-State: AOJu0YzA2/e2qVJ042qVIXSM2DZug9OEGVAtNWt6B1P2UonzibMhAvup Xsq0hXAYvO7fIaC++IXsoTM= X-Received: by 2002:a17:902:dac8:b0:1ce:89a7:443d with SMTP id q8-20020a170902dac800b001ce89a7443dmr599891plx.5.1700602206023; Tue, 21 Nov 2023 13:30:06 -0800 (PST) Received: from localhost.localdomain (static-198-54-134-172.cust.tzulo.com. [198.54.134.172]) by smtp.gmail.com with ESMTPSA id w20-20020a170902d71400b001c726147a45sm8355317ply.190.2023.11.21.13.30.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 13:30:05 -0800 (PST) From: Sam Edwards X-Google-Original-From: Sam Edwards To: Heiko Stuebner , Rob Herring Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, =?utf-8?q?Daniel_?= =?utf-8?q?Kukie=C5=82a?= , Sven Rademakers , Lokesh Poovaragan , Sam Edwards Subject: [PATCH] arm64: dts: rockchip: Add PCIe pinctrls to Turing RK1 Date: Tue, 21 Nov 2023 13:29:40 -0800 Message-ID: <20231121212941.53873-1-CFSworks@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 21 Nov 2023 13:30:10 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783210672834803357 X-GMAIL-MSGID: 1783210672834803357 The RK3588 PCIe 3.0 controller seems to have unpredictable behavior when no CLKREQ/PERST/WAKE pins are configured in the pinmux. In particular, it will sometimes (varying between specific RK3588 chips, not over time) shut off the DBI block, and reads to this range will instead stall indefinitely. When this happens, it will prevent Linux from booting altogether. The PCIe driver will stall the CPU core once it attempts to read the version information from the DBI range. Fix this boot hang by adding the correct pinctrl configuration to the PCIe 3.0 device node, which is the proper thing to do anyway. While we're at it, also add the necessary configuration to the PCIe 2.0 node, which may or may not fix the equivalent problem over there -- but is the proper thing to do anyway. :) Fixes: 2806a69f3fef6 ("arm64: dts: rockchip: Add Turing RK1 SoM support") Signed-off-by: Sam Edwards --- .../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi index 9570b34aca2e..129f14dbd42f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi @@ -214,7 +214,7 @@ rgmii_phy: ethernet-phy@1 { &pcie2x1l1 { linux,pci-domain = <1>; pinctrl-names = "default"; - pinctrl-0 = <&pcie2_reset>; + pinctrl-0 = <&pcie30x1m1_pins>; reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>; status = "okay"; }; @@ -226,7 +226,7 @@ &pcie30phy { &pcie3x4 { linux,pci-domain = <0>; pinctrl-names = "default"; - pinctrl-0 = <&pcie3_reset>; + pinctrl-0 = <&pcie30x4m1_pins>; reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie30>; status = "okay"; @@ -245,17 +245,7 @@ hym8563_int: hym8563-int { }; }; - pcie2 { - pcie2_reset: pcie2-reset { - rockchip,pins = <4 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pcie3 { - pcie3_reset: pcie3-reset { - rockchip,pins = <4 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - vcc3v3_pcie30_en: pcie3-reg { rockchip,pins = <2 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; };