From patchwork Wed Dec 7 01:43:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asahi Lina X-Patchwork-Id: 30577 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3156458wrr; Tue, 6 Dec 2022 17:50:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf7eXmfGUNX7Vfvp9dIJoe4OH9z/D4I4Rujwc0Qq0r3UapqpbYpeqP0Gfw8QLaV11zGgFRBq X-Received: by 2002:a17:906:7c45:b0:7c0:c45c:90e4 with SMTP id g5-20020a1709067c4500b007c0c45c90e4mr17453040ejp.473.1670377844014; Tue, 06 Dec 2022 17:50:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670377844; cv=none; d=google.com; s=arc-20160816; b=BCrKH8Jg7NpEdcCGwYK1S4/cpxzvvU3vX9L848xNFQDcNjoQ8PJVJOZlFa4T0O1cTz p57K1jAbs5iBYH/sH6epc1BDh9dP64d+21itanaRQHY7oN/d+NUERXe7tWR/rLdg523J +Ur90cKv4MAWk4ZTWapdbVrb2FmUaWq0mw9KB0pePfusfUmt7ZCqNdMroAoW+LyTvp7H PfnvILqnBzaPZ76I/TP4HEsg/YQvCs1mddyFUD24g9qXxRwqDTSy4TDbmw12IXCVhr1V BLiStkMyqfSJZ0M+dUhSVMksVJFjCPw/TwFZuZe5ZDHn77NAC6RO2kZO4bMV/WZQPvuC zrIA== 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=9tcAL6ZrA/50XUYkBvTC26OWd0XutSEXecQBng8CMcc=; b=ADeAmJ3ti9NRbYMK349vsWZecsxTWpLGIOKNX34QNleJZkyMzOeTlgVS0SHtK9QnZu cABn+Px1AToDr1W9/2j62dx96ME+y588+3cCcZOCMfqg2ji5qrJI8Y4o7lA4FVvT/cJL UaM7yOfDrxnTBUJbDsXLRoBbYtgEA8F5xx9QJFm0izeMklIwuj0Gmdsl6NAZZFsjOnli T314vEZWuIrwAmExuk8fRfhyyFhWJbhHspY/l6JCAya6uA8PZ2ilvShNccAuJLjKbI5s OJOejfRgsTd+5ZNkA+nre6bD+lM/eDgM7AKJkeNhaABnf31+DuyqIF8L2iu2BMFIbF3h IPXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@asahilina.net header.s=default header.b=HCE3UUQo; 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=asahilina.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m11-20020a056402510b00b0046abbd721e4si3749366edd.300.2022.12.06.17.50.20; Tue, 06 Dec 2022 17:50:44 -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=@asahilina.net header.s=default header.b=HCE3UUQo; 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=asahilina.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229612AbiLGBnQ (ORCPT + 99 others); Tue, 6 Dec 2022 20:43:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229487AbiLGBnO (ORCPT ); Tue, 6 Dec 2022 20:43:14 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F5CB2EF7F; Tue, 6 Dec 2022 17:43:13 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: linasend@asahilina.net) by mail.marcansoft.com (Postfix) with ESMTPSA id 26E8341F98; Wed, 7 Dec 2022 01:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=asahilina.net; s=default; t=1670377391; bh=oQYgSBif56vxQdHFPOTELw3/FtXZ0hY2uV7LPeyLQYs=; h=From:To:Cc:Subject:Date; b=HCE3UUQovp4m++sguRpMIpV5m8Chben63rZo237wf3Dc1927wq3OLdQWw1t266w9S NZ1VVhw5roYnij+8QGPc/Zg4cGDTbG6LEkKL7EnfrGzbPXpbmhatlVLxGyZMOGbPSL alW5AJBl+84fd9M5I/rwPnew4tfZ0q7zFiZjZLgx/gYIl5AX8WVQTvj1b2CAoIQNyQ lUSkZnDaMK1ttxuYjm+/XAofHFL/oUmyXDuv7txjWlcyJU8I+UxWpmEFkY2DPe3AW5 TfIq9xaA7U3uU53NIz6BWwFN34rPGFK2F3a1hY35rWDal0jzXgzv59F4txcujdbjld 7h5egZNVWrrtw== From: Asahi Lina To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Janne Grunau Cc: Marc Zyngier , asahi@lists.linux.dev, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Asahi Lina Subject: [PATCH] arm64: dts: apple: t6002: Fix GPU power domains Date: Wed, 7 Dec 2022 10:43:04 +0900 Message-Id: <20221207014305.21018-1-lina@asahilina.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,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?1751518118304428677?= X-GMAIL-MSGID: =?utf-8?q?1751518118304428677?= On t6002 (M1 Ultra), each die contains a self-contained GPU block. However, only the coprocessor and global management circuitry of the first die are used. This is what is represented by the "gpu" PS (the one in die1 is disabled). Nonetheless, this shared component drives the processing blocks in both dies, and therefore depends on the AFR fabric being powered up on both dies. Add an explicit dependency from the GPU block on die0 to AFR on die1, next to the existing die0 AFR dependency. Fixes: fa86294eb355 ("arm64: dts: apple: Add initial t6000/t6001/t6002 DTs") Signed-off-by: Asahi Lina --- arch/arm64/boot/dts/apple/t6002.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t6002.dtsi b/arch/arm64/boot/dts/apple/t6002.dtsi index 1376103b49c6..8fa2d8dd72ff 100644 --- a/arch/arm64/boot/dts/apple/t6002.dtsi +++ b/arch/arm64/boot/dts/apple/t6002.dtsi @@ -296,3 +296,8 @@ &cpu_p20 &cpu_p21 &cpu_p22 &cpu_p23 }; }; }; + +&ps_gfx { + // On t6002, the die0 GPU power domain needs both AFR power domains + power-domains = <&ps_afr>, <&ps_afr_die1>; +};