From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A131C433E0 for ; Mon, 15 Feb 2021 19:29:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08ACD64E23 for ; Mon, 15 Feb 2021 19:29:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230105AbhBOT3y (ORCPT ); Mon, 15 Feb 2021 14:29:54 -0500 Received: from mail-wm1-f51.google.com ([209.85.128.51]:55819 "EHLO mail-wm1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229764AbhBOT3v (ORCPT ); Mon, 15 Feb 2021 14:29:51 -0500 Received: by mail-wm1-f51.google.com with SMTP id o15so7066846wmq.5; Mon, 15 Feb 2021 11:29:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2lp9Aq2D4MoBftdOs5M770eBIHydvgoiWpAn4VIL1kc=; b=BJPwROOC2497yd2VA/qnAr5XX9I30ocDoCihP/+kV/GIyigiFOMe4vSZxvnEhpbHPz 9PwAhWbZARNxykAoz2yow2X/UCutiQFutX2oUSLVgQVvoiczyq3w6oWpXG2cUlFDpm3T FWurC+e0szFx9DKmoM1+1tPCGalBvL33ujiASKX71jn5uaWEdQU/g43VjfoR19pvludw jpam94wFD5RdqhGosKK2BPcmpKR/r7B5LwZByZUyHCgLYODHZ1CFp8oHR1PtWtbT19Ul MXxwg+Y3SutkW4TnKw3iXc1rVIFUQ43XdVAoeiV/CADToe6BRf8SGrmeDsgFxZse+IQ/ D46Q== X-Gm-Message-State: AOAM5332t65sbfPkfR9pPQx4FcTpwPuCc+r1a2U0YJwS2EbCPBziTBD+ 677Sajbrdo0Itp9bIso2TF0= X-Google-Smtp-Source: ABdhPJyWhB/a8bczdLa3D9lA7fMvaTLZGHadDzpEngNC2B6nbD0EiuZvGHab9XCVOWL6VxNrEtVgGQ== X-Received: by 2002:a1c:4b05:: with SMTP id y5mr316326wma.37.1613417348734; Mon, 15 Feb 2021 11:29:08 -0800 (PST) Received: from kozik-lap (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.googlemail.com with ESMTPSA id r17sm3262947wrx.82.2021.02.15.11.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 11:29:07 -0800 (PST) Date: Mon, 15 Feb 2021 20:29:06 +0100 From: Krzysztof Kozlowski To: Hector Martin Cc: linux-arm-kernel@lists.infradead.org, Marc Zyngier , Rob Herring , Arnd Bergmann , Olof Johansson , Mark Kettenis , Tony Lindgren , Mohamed Mediouni , Stan Skowronek , Alexander Graf , Will Deacon , Linus Walleij , Mark Rutland , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 25/25] arm64: apple: Add initial Mac Mini 2020 (M1) devicetree Message-ID: <20210215192906.7k3unuhph5wnkj5g@kozik-lap> References: <20210215121713.57687-1-marcan@marcan.st> <20210215121713.57687-26-marcan@marcan.st> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210215121713.57687-26-marcan@marcan.st> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Feb 15, 2021 at 09:17:13PM +0900, Hector Martin wrote: > This currently supports: > > * SMP (via spin-tables) > * AIC IRQs > * Serial (with earlycon) > * Framebuffer > > A number of properties are dynamic, and based on system firmware > decisions that vary from version to version. These are expected > to be filled in by the loader. > > Signed-off-by: Hector Martin > --- > MAINTAINERS | 1 + > arch/arm64/boot/dts/Makefile | 1 + > arch/arm64/boot/dts/apple/Makefile | 2 + > arch/arm64/boot/dts/apple/apple-j274.dts | 41 ++++++++ > arch/arm64/boot/dts/apple/apple-m1.dtsi | 124 +++++++++++++++++++++++ > 5 files changed, 169 insertions(+) > create mode 100644 arch/arm64/boot/dts/apple/Makefile > create mode 100644 arch/arm64/boot/dts/apple/apple-j274.dts > create mode 100644 arch/arm64/boot/dts/apple/apple-m1.dtsi > > diff --git a/MAINTAINERS b/MAINTAINERS > index a8f258fbb5f1..87db1c947f45 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1635,6 +1635,7 @@ C: irc://chat.freenode.net/asahi-dev > T: git https://github.com/AsahiLinux/linux.git > F: Documentation/devicetree/bindings/arm/apple.yaml > F: Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml > +F: arch/arm64/boot/dts/apple/ > F: arch/arm64/include/asm/sysreg_apple.h > F: drivers/irqchip/irq-apple-aic.c > F: include/dt-bindings/interrupt-controller/apple-aic.h > diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile > index 9b1170658d60..64f055d94948 100644 > --- a/arch/arm64/boot/dts/Makefile > +++ b/arch/arm64/boot/dts/Makefile > @@ -6,6 +6,7 @@ subdir-y += amazon > subdir-y += amd > subdir-y += amlogic > subdir-y += apm > +subdir-y += apple > subdir-y += arm > subdir-y += bitmain > subdir-y += broadcom > diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile > new file mode 100644 > index 000000000000..ec03c474efd4 > --- /dev/null > +++ b/arch/arm64/boot/dts/apple/Makefile > @@ -0,0 +1,2 @@ > +# SPDX-License-Identifier: GPL-2.0 > +dtb-$(CONFIG_ARCH_APPLE) += apple-j274.dtb > diff --git a/arch/arm64/boot/dts/apple/apple-j274.dts b/arch/arm64/boot/dts/apple/apple-j274.dts > new file mode 100644 > index 000000000000..9a1be91a2cf0 > --- /dev/null > +++ b/arch/arm64/boot/dts/apple/apple-j274.dts > @@ -0,0 +1,41 @@ > +// SPDX-License-Identifier: GPL-2.0+ OR MIT () around licenses, so: (GPL-2.0+ OR MIT) > +/* > + * Copyright The Asahi Linux Contributors > + */ > + > +/dts-v1/; > + > +#include "apple-m1.dtsi" > + > +/ { > + compatible = "apple,j274", "apple,m1", "apple,arm-platform"; > + model = "Apple Mac Mini M1 2020"; > + > + aliases { > + serial0 = &serial0; > + }; > + > + chosen { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + stdout-path = "serial0:1500000"; > + > + framebuffer0: framebuffer@0 { > + compatible = "apple,simple-framebuffer", "simple-framebuffer"; > + reg = <0 0 0 0>; /* To be filled by loader */ > + /* Format properties will be added by loader */ > + status = "disabled"; > + }; > + }; > + > + memory@800000000 { > + device_type = "memory"; > + reg = <0 0 0 0>; /* To be filled by loader */ dtc and dtschema might complain, so could you set here fake memory address 0x800000000? Would that work for your bootloader? > + }; > +}; > + > +&serial0 { > + status = "okay"; > +}; > diff --git a/arch/arm64/boot/dts/apple/apple-m1.dtsi b/arch/arm64/boot/dts/apple/apple-m1.dtsi > new file mode 100644 > index 000000000000..45c87771b057 > --- /dev/null > +++ b/arch/arm64/boot/dts/apple/apple-m1.dtsi > @@ -0,0 +1,124 @@ > +// SPDX-License-Identifier: GPL-2.0+ OR MIT > +/* > + * Copyright The Asahi Linux Contributors > + */ > + > +#include > +#include > + > +/ { > + compatible = "apple,m1", "apple,arm-platform"; > + > + #address-cells = <2>; > + #size-cells = <2>; > + > + cpus { > + #address-cells = <2>; > + #size-cells = <0>; > + > + cpu0: cpu@0 { > + compatible = "apple,icestorm"; > + device_type = "cpu"; > + reg = <0x0 0x0>; > + enable-method = "spin-table"; > + cpu-release-addr = <0 0>; /* To be filled by loader */ > + }; New line after every device node, please. With this minor changes, fine for me: Reviewed-by: Krzysztof Kozlowski Best regards, Krzysztof From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEB36C433E0 for ; Mon, 15 Feb 2021 19:30:26 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2A15264E1E for ; Mon, 15 Feb 2021 19:30:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A15264E1E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FhpsNx4YeCgeGPsRsUxs2M1s8TNoFwOoHNbf36WiBgw=; b=szXrB4Coiv51uwuvYu/zATJ/b rCpWIaIVaUUviiwa85y5hsJNTrTLHZHIQ5izrlYXg/yVaFvG45mBa67HGBoZagU/a1Y7Nd2Tzoejq rrAcbZnSAOxiiigi9ZBmTf0fzitZUYco5FHtGzvtj3HvzT8PnD79245Kx0f7NPVhmf82kBAN3NHny 469lc2lAtzF6nCF1beIcbtxvzCyHYGdz0sf0hUjjf7Z87Eiepq7P9JY/fU4XErrcsqitPdwPfLC+v l6feYvmdky17ocbs1lCQomtXJg8MZNUFr+yVMjXS0BNDIHqbZmlH2MBRaeQ9e0H4kbBx2kLR5KDAc EMH3fU6Tw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBjYX-0001iL-B8; Mon, 15 Feb 2021 19:29:13 +0000 Received: from mail-wm1-f53.google.com ([209.85.128.53]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBjYU-0001hf-F9 for linux-arm-kernel@lists.infradead.org; Mon, 15 Feb 2021 19:29:11 +0000 Received: by mail-wm1-f53.google.com with SMTP id o15so7066845wmq.5 for ; Mon, 15 Feb 2021 11:29:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=2lp9Aq2D4MoBftdOs5M770eBIHydvgoiWpAn4VIL1kc=; b=g1pr8gJqWYZo/vASAFdgDQPDrtkmwA9en23AttvnNhiZnKD3NnUqJ1f4ElK6y9sniR aS1Y4fIWfOVP0ynjNNBC2Fp24zqBiw4f/21Ak4tmG/piSh+U+meExR7RoEiMAe/XgzX3 V5eFDlsi6I9xaMJEfpDMX4/zdc0doSnFixqQ4r+HPTcZRnPXfODn1A6FUtkyv7UtpLPP uZpCtmnoAKC/JWKAf97+MVbWJlEe6Ik2nNSZVeeYWrdR0mRp34jHwFdiaNG6Gg2OPQ0w 04ktXSwb/K3eSmJGBttuv1lLBB1ARFKHrHZDxaEmWH7MOrr+Xu1lXT0eazAUHZxYZeCv ZmWA== X-Gm-Message-State: AOAM531Fr6TLBpPQ7gJKmL9jArxtcVaUfrrsDCTdn9NLm9lMn0HLHuMA CmhaMxN0IRYfahytgKeVc9U= X-Google-Smtp-Source: ABdhPJyWhB/a8bczdLa3D9lA7fMvaTLZGHadDzpEngNC2B6nbD0EiuZvGHab9XCVOWL6VxNrEtVgGQ== X-Received: by 2002:a1c:4b05:: with SMTP id y5mr316326wma.37.1613417348734; Mon, 15 Feb 2021 11:29:08 -0800 (PST) Received: from kozik-lap (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.googlemail.com with ESMTPSA id r17sm3262947wrx.82.2021.02.15.11.29.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Feb 2021 11:29:07 -0800 (PST) Date: Mon, 15 Feb 2021 20:29:06 +0100 From: Krzysztof Kozlowski To: Hector Martin Subject: Re: [PATCH v2 25/25] arm64: apple: Add initial Mac Mini 2020 (M1) devicetree Message-ID: <20210215192906.7k3unuhph5wnkj5g@kozik-lap> References: <20210215121713.57687-1-marcan@marcan.st> <20210215121713.57687-26-marcan@marcan.st> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210215121713.57687-26-marcan@marcan.st> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210215_142910_613392_58E032F7 X-CRM114-Status: GOOD ( 22.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Arnd Bergmann , Rob Herring , Tony Lindgren , Marc Zyngier , Linus Walleij , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Alexander Graf , Olof Johansson , Mohamed Mediouni , Stan Skowronek , Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Kettenis Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Feb 15, 2021 at 09:17:13PM +0900, Hector Martin wrote: > This currently supports: > > * SMP (via spin-tables) > * AIC IRQs > * Serial (with earlycon) > * Framebuffer > > A number of properties are dynamic, and based on system firmware > decisions that vary from version to version. These are expected > to be filled in by the loader. > > Signed-off-by: Hector Martin > --- > MAINTAINERS | 1 + > arch/arm64/boot/dts/Makefile | 1 + > arch/arm64/boot/dts/apple/Makefile | 2 + > arch/arm64/boot/dts/apple/apple-j274.dts | 41 ++++++++ > arch/arm64/boot/dts/apple/apple-m1.dtsi | 124 +++++++++++++++++++++++ > 5 files changed, 169 insertions(+) > create mode 100644 arch/arm64/boot/dts/apple/Makefile > create mode 100644 arch/arm64/boot/dts/apple/apple-j274.dts > create mode 100644 arch/arm64/boot/dts/apple/apple-m1.dtsi > > diff --git a/MAINTAINERS b/MAINTAINERS > index a8f258fbb5f1..87db1c947f45 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1635,6 +1635,7 @@ C: irc://chat.freenode.net/asahi-dev > T: git https://github.com/AsahiLinux/linux.git > F: Documentation/devicetree/bindings/arm/apple.yaml > F: Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml > +F: arch/arm64/boot/dts/apple/ > F: arch/arm64/include/asm/sysreg_apple.h > F: drivers/irqchip/irq-apple-aic.c > F: include/dt-bindings/interrupt-controller/apple-aic.h > diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile > index 9b1170658d60..64f055d94948 100644 > --- a/arch/arm64/boot/dts/Makefile > +++ b/arch/arm64/boot/dts/Makefile > @@ -6,6 +6,7 @@ subdir-y += amazon > subdir-y += amd > subdir-y += amlogic > subdir-y += apm > +subdir-y += apple > subdir-y += arm > subdir-y += bitmain > subdir-y += broadcom > diff --git a/arch/arm64/boot/dts/apple/Makefile b/arch/arm64/boot/dts/apple/Makefile > new file mode 100644 > index 000000000000..ec03c474efd4 > --- /dev/null > +++ b/arch/arm64/boot/dts/apple/Makefile > @@ -0,0 +1,2 @@ > +# SPDX-License-Identifier: GPL-2.0 > +dtb-$(CONFIG_ARCH_APPLE) += apple-j274.dtb > diff --git a/arch/arm64/boot/dts/apple/apple-j274.dts b/arch/arm64/boot/dts/apple/apple-j274.dts > new file mode 100644 > index 000000000000..9a1be91a2cf0 > --- /dev/null > +++ b/arch/arm64/boot/dts/apple/apple-j274.dts > @@ -0,0 +1,41 @@ > +// SPDX-License-Identifier: GPL-2.0+ OR MIT () around licenses, so: (GPL-2.0+ OR MIT) > +/* > + * Copyright The Asahi Linux Contributors > + */ > + > +/dts-v1/; > + > +#include "apple-m1.dtsi" > + > +/ { > + compatible = "apple,j274", "apple,m1", "apple,arm-platform"; > + model = "Apple Mac Mini M1 2020"; > + > + aliases { > + serial0 = &serial0; > + }; > + > + chosen { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + stdout-path = "serial0:1500000"; > + > + framebuffer0: framebuffer@0 { > + compatible = "apple,simple-framebuffer", "simple-framebuffer"; > + reg = <0 0 0 0>; /* To be filled by loader */ > + /* Format properties will be added by loader */ > + status = "disabled"; > + }; > + }; > + > + memory@800000000 { > + device_type = "memory"; > + reg = <0 0 0 0>; /* To be filled by loader */ dtc and dtschema might complain, so could you set here fake memory address 0x800000000? Would that work for your bootloader? > + }; > +}; > + > +&serial0 { > + status = "okay"; > +}; > diff --git a/arch/arm64/boot/dts/apple/apple-m1.dtsi b/arch/arm64/boot/dts/apple/apple-m1.dtsi > new file mode 100644 > index 000000000000..45c87771b057 > --- /dev/null > +++ b/arch/arm64/boot/dts/apple/apple-m1.dtsi > @@ -0,0 +1,124 @@ > +// SPDX-License-Identifier: GPL-2.0+ OR MIT > +/* > + * Copyright The Asahi Linux Contributors > + */ > + > +#include > +#include > + > +/ { > + compatible = "apple,m1", "apple,arm-platform"; > + > + #address-cells = <2>; > + #size-cells = <2>; > + > + cpus { > + #address-cells = <2>; > + #size-cells = <0>; > + > + cpu0: cpu@0 { > + compatible = "apple,icestorm"; > + device_type = "cpu"; > + reg = <0x0 0x0>; > + enable-method = "spin-table"; > + cpu-release-addr = <0 0>; /* To be filled by loader */ > + }; New line after every device node, please. With this minor changes, fine for me: Reviewed-by: Krzysztof Kozlowski Best regards, Krzysztof _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel