devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Hawa, Hanna" <hhhawa@amazon.com>
To: Rob Herring <robh@kernel.org>
Cc: <mark.rutland@arm.com>, <tsahee@annapurnalabs.com>,
	<antoine.tenart@bootlin.com>, <mchehab+samsung@kernel.org>,
	<davem@davemloft.net>, <gregkh@linuxfoundation.org>,
	<Jonathan.Cameron@huawei.com>, <tglx@linutronix.de>,
	<khilman@baylibre.com>, <chanho.min@lge.com>, <heiko@sntech.de>,
	<nm@ti.com>, <devicetree@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>, <dwmw@amazon.co.uk>,
	<benh@amazon.com>, <ronenk@amazon.com>, <talel@amazon.com>,
	<jonnyc@amazon.com>, <hanochu@amazon.com>, <barakw@amazon.com>
Subject: Re: [PATCH v2 6/6] arm64: dts: amazon: add Amazon's Annapurna Labs Alpine v3 support
Date: Sun, 22 Dec 2019 16:15:50 +0200	[thread overview]
Message-ID: <10a6ff94-98fc-e88f-64c0-5648586613db@amazon.com> (raw)
In-Reply-To: <20191219190304.GA4786@bogus>

Hi Rob,

On 12/19/2019 9:03 PM, Rob Herring wrote:
> On Mon, Dec 09, 2019 at 04:13:41PM +0000, Hanna Hawa wrote:
>> From: Ronen Krupnik <ronenk@amazon.com>
>>
>> This patch adds the initial support for the Amazon's Annapurna Labs
>> Alpine v3 Soc and Evaluation Platform (EVP).
>>
>> Signed-off-by: Ronen Krupnik <ronenk@amazon.com>
>> ---
>>   arch/arm64/boot/dts/amazon/Makefile          |   1 +
>>   arch/arm64/boot/dts/amazon/alpine-v3-evp.dts |  23 ++
>>   arch/arm64/boot/dts/amazon/alpine-v3.dtsi    | 371 +++++++++++++++++++
>>   3 files changed, 395 insertions(+)
>>   create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3-evp.dts
>>   create mode 100644 arch/arm64/boot/dts/amazon/alpine-v3.dtsi
>>
>> diff --git a/arch/arm64/boot/dts/amazon/Makefile b/arch/arm64/boot/dts/amazon/Makefile
>> index d79822dc30cd..ba9e11544905 100644
>> --- a/arch/arm64/boot/dts/amazon/Makefile
>> +++ b/arch/arm64/boot/dts/amazon/Makefile
>> @@ -1,2 +1,3 @@
>>   # SPDX-License-Identifier: GPL-2.0-only
>>   dtb-$(CONFIG_ARCH_ALPINE)	+= alpine-v2-evp.dtb
>> +dtb-$(CONFIG_ARCH_ALPINE)	+= alpine-v3-evp.dtb
>> diff --git a/arch/arm64/boot/dts/amazon/alpine-v3-evp.dts b/arch/arm64/boot/dts/amazon/alpine-v3-evp.dts
>> new file mode 100644
>> index 000000000000..8c1e11cf5855
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/amazon/alpine-v3-evp.dts
>> @@ -0,0 +1,23 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
>> + */
>> +
>> +#include "alpine-v3.dtsi"
>> +
>> +/ {
>> +	model = "Amazon's Annapurna Labs Alpine v3 Evaluation Platform (EVP)";
>> +	compatible = "amazon,al-alpine-v3-evp", "amazon,al-alpine-v3";
>> +
>> +	aliases {
>> +		serial0 = &uart0;
>> +	};
>> +
>> +	chosen {
>> +		stdout-path = "serial0:115200n8";
>> +	};
>> +};
>> +
>> +&uart0 {
>> +	status = "okay";
>> +};
>> diff --git a/arch/arm64/boot/dts/amazon/alpine-v3.dtsi b/arch/arm64/boot/dts/amazon/alpine-v3.dtsi
>> new file mode 100644
>> index 000000000000..4945087f59e6
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/amazon/alpine-v3.dtsi
>> @@ -0,0 +1,371 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +/*
>> + * Copyright 2019, Amazon.com, Inc. or its affiliates. All Rights Reserved
>> + */
>> +
>> +/dts-v1/;
>> +
>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>> +
>> +/ {
>> +	model = "Amazon's Annapurna Labs Alpine v3";
>> +	compatible = "amazon,al-alpine-v3";
>> +
>> +	#address-cells = <2>;
>> +	#size-cells = <2>;
>> +
>> +	cpus {
>> +		#address-cells = <1>;
>> +		#size-cells = <0>;
>> +
>> +		cpu@0 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x0>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
> 
> We only define cache attributes if not discoverable or the cache ID
> registers are wrong and you need to override what's discoverable.

The cache attributes are not discoverable, so we need to define the 
attributes in the device tree for L1/L2.

Commit a8d4636f96ad075dc6d6af182b3de0b5498dc301
("arm64: cacheinfo: Remove CCSIDR-based cache information probing") 
removed mechanism to extract cache information based on CCSIDR register.

> 
>> +			next-level-cache = <&cluster0_l2>;
>> +		};
>> +
>> +		cpu@1 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x1>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster0_l2>;
>> +		};
>> +
>> +		cpu@2 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x2>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster0_l2>;
>> +		};
>> +
>> +		cpu@3 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x3>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster0_l2>;
>> +		};
>> +
>> +		cpu@100 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x100>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster1_l2>;
>> +		};
>> +
>> +		cpu@101 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x101>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster1_l2>;
>> +		};
>> +
>> +		cpu@102 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x102>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster1_l2>;
>> +		};
>> +
>> +		cpu@103 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x103>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster1_l2>;
>> +		};
>> +
>> +		cpu@200 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x200>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster2_l2>;
>> +		};
>> +
>> +		cpu@201 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x201>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster2_l2>;
>> +		};
>> +
>> +		cpu@202 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x202>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster2_l2>;
>> +		};
>> +
>> +		cpu@203 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x203>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster2_l2>;
>> +		};
>> +
>> +		cpu@300 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x300>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster3_l2>;
>> +		};
>> +
>> +		cpu@301 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x301>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster3_l2>;
>> +		};
>> +
>> +		cpu@302 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x302>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster3_l2>;
>> +		};
>> +
>> +		cpu@303 {
>> +			device_type = "cpu";
>> +			compatible = "arm,cortex-a72";
>> +			reg = <0x303>;
>> +			enable-method = "psci";
>> +			d-cache-size = <0x8000>;
>> +			d-cache-line-size = <64>;
>> +			d-cache-sets = <256>;
>> +			i-cache-size = <0xc000>;
>> +			i-cache-line-size = <64>;
>> +			i-cache-sets = <256>;
>> +			next-level-cache = <&cluster3_l2>;
>> +		};
>> +
>> +		cluster0_l2: cache@0 {
>> +			compatible = "cache";
>> +			cache-size = <0x200000>;
>> +			cache-line-size = <64>;
>> +			cache-sets = <2048>;
>> +			cache-level = <2>;
>> +		};
>> +
>> +		cluster1_l2: cache@100 {
>> +			compatible = "cache";
>> +			cache-size = <0x200000>;
>> +			cache-line-size = <64>;
>> +			cache-sets = <2048>;
>> +			cache-level = <2>;
>> +		};
>> +
>> +		cluster2_l2: cache@200 {
>> +			compatible = "cache";
>> +			cache-size = <0x200000>;
>> +			cache-line-size = <64>;
>> +			cache-sets = <2048>;
>> +			cache-level = <2>;
>> +		};
>> +
>> +		cluster3_l2: cache@300 {
>> +			compatible = "cache";
>> +			cache-size = <0x200000>;
>> +			cache-line-size = <64>;
>> +			cache-sets = <2048>;
>> +			cache-level = <2>;
>> +		};
>> +
>> +	};
>> +
>> +	reserved-memory {
>> +		#address-cells = <2>;
>> +		#size-cells = <2>;
>> +		ranges;
>> +
>> +		secmon@0 {
>> +			reg = <0x0 0x0 0x0 0x100000>;
>> +			no-map;
>> +		};
>> +	};
>> +
>> +	psci {
>> +		compatible = "arm,psci-0.2";
>> +		method = "smc";
>> +	};
>> +
>> +	soc {
>> +		compatible = "simple-bus";
>> +		#address-cells = <2>;
>> +		#size-cells = <2>;
>> +
>> +		interrupt-parent = <&gic>;
>> +		ranges;
>> +
>> +		arch-timer {
> 
> Move up a level. There's no mmio regs.

Ack, will be fixed.
Will move pmu node also.

> 
>> +			compatible = "arm,armv8-timer";
>> +			interrupts = <GIC_PPI 0xd IRQ_TYPE_LEVEL_LOW>,
>> +				     <GIC_PPI 0xe IRQ_TYPE_LEVEL_LOW>,
>> +				     <GIC_PPI 0xb IRQ_TYPE_LEVEL_LOW>,
>> +				     <GIC_PPI 0xa IRQ_TYPE_LEVEL_LOW>;
>> +		};
>> +
>> +		gic: interrupt-controller@f0000000 {
>> +			compatible = "arm,gic-v3";
>> +			#interrupt-cells = <3>;
>> +			#address-cells = <0>;
>> +			interrupt-controller;
>> +			reg = <0x0 0xf0800000 0 0x10000>,
>> +			      <0x0 0xf0a00000 0 0x200000>,
>> +			      <0x0 0xf0000000 0 0x2000>,
>> +			      <0x0 0xf0010000 0 0x1000>,
>> +			      <0x0 0xf0020000 0 0x2000>;
>> +			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
>> +		};
>> +
>> +		msix: msix@fbe00000 {
>> +			compatible = "al,alpine-msix";
>> +			reg = <0x0 0xfbe00000 0x0 0x100000>;
>> +			interrupt-controller;
>> +			msi-controller;
>> +			al,msi-base-spi = <160>;
>> +			al,msi-num-spis = <800>;
>> +			interrupt-parent = <&gic>;
>> +		};
>> +
>> +		pmu {
>> +			compatible = "arm,cortex-a72-pmu";
>> +			interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
>> +		};
>> +
>> +		uart0: serial@fd883000 {
>> +			compatible = "ns16550a";
>> +			device_type = "serial";
> 
> Drop device_type.

Ack, will be fixed.

> 
>> +			reg = <0x0 0xfd883000 0x0 0x1000>;
>> +			clock-frequency = <0>;
>> +			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
>> +			reg-shift = <2>;
>> +			reg-io-width = <4>;
>> +		};
>> +
>> +		pci@fbd00000 {
> 
> pcie@...

Ack, will be fixed.

Thanks for reviewing.

Thanks,
Hanna

> 
>> +			compatible = "pci-host-ecam-generic";
>> +			device_type = "pci";
>> +			#size-cells = <2>;
>> +			#address-cells = <3>;
>> +			#interrupt-cells = <1>;
>> +			reg = <0x0 0xfbd00000 0x0 0x100000>;
>> +			interrupt-map-mask = <0xf800 0 0 7>;
>> +			/* 8 x legacy interrupts for SATA only */
>> +			interrupt-map = <0x4000 0 0 1 &gic 0 57 IRQ_TYPE_LEVEL_HIGH>,
>> +					<0x4800 0 0 1 &gic 0 58 IRQ_TYPE_LEVEL_HIGH>,
>> +					<0x5000 0 0 1 &gic 0 59 IRQ_TYPE_LEVEL_HIGH>,
>> +					<0x5800 0 0 1 &gic 0 60 IRQ_TYPE_LEVEL_HIGH>,
>> +					<0x6000 0 0 1 &gic 0 61 IRQ_TYPE_LEVEL_HIGH>,
>> +					<0x6800 0 0 1 &gic 0 62 IRQ_TYPE_LEVEL_HIGH>,
>> +					<0x7000 0 0 1 &gic 0 63 IRQ_TYPE_LEVEL_HIGH>,
>> +					<0x7800 0 0 1 &gic 0 64 IRQ_TYPE_LEVEL_HIGH>;
>> +			ranges = <0x02000000 0x0 0xfe000000 0x0 0xfe000000 0x0 0x1000000>;
>> +			bus-range = <0x00 0x00>;
>> +			msi-parent = <&msix>;
>> +		};
>> +	};
>> +};
>> -- 
>> 2.17.1
>>

      reply	other threads:[~2019-12-22 14:16 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-09 16:13 [PATCH v2 0/6] Amazon's Annapurna Labs Alpine v3 device-tree Hanna Hawa
2019-12-09 16:13 ` [PATCH v2 1/6] dt-bindings: arm: amazon: rename al,alpine DT binding to amazon,al Hanna Hawa
2019-12-19 18:52   ` Rob Herring
2019-12-09 16:13 ` [PATCH v2 2/6] arm64: dts: amazon: rename al folder to be amazon Hanna Hawa
2019-12-09 16:13 ` [PATCH v2 3/6] dt-bindings: arm: amazon: update maintainers of amazon,al DT bindings Hanna Hawa
2019-12-19 18:55   ` Rob Herring
2019-12-09 16:13 ` [PATCH v2 4/6] dt-bindings: arm: amazon: add missing alpine-v2 DT binding Hanna Hawa
2019-12-19 19:04   ` Rob Herring
2019-12-09 16:13 ` [PATCH v2 5/6] dt-bindings: arm: amazon: add Amazon Annapurna Labs Alpine V3 Hanna Hawa
2019-12-18 21:38   ` Rob Herring
2019-12-09 16:13 ` [PATCH v2 6/6] arm64: dts: amazon: add Amazon's Annapurna Labs Alpine v3 support Hanna Hawa
2019-12-19 19:03   ` Rob Herring
2019-12-22 14:15     ` Hawa, Hanna [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=10a6ff94-98fc-e88f-64c0-5648586613db@amazon.com \
    --to=hhhawa@amazon.com \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=antoine.tenart@bootlin.com \
    --cc=barakw@amazon.com \
    --cc=benh@amazon.com \
    --cc=chanho.min@lge.com \
    --cc=davem@davemloft.net \
    --cc=devicetree@vger.kernel.org \
    --cc=dwmw@amazon.co.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=hanochu@amazon.com \
    --cc=heiko@sntech.de \
    --cc=jonnyc@amazon.com \
    --cc=khilman@baylibre.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mchehab+samsung@kernel.org \
    --cc=nm@ti.com \
    --cc=robh@kernel.org \
    --cc=ronenk@amazon.com \
    --cc=talel@amazon.com \
    --cc=tglx@linutronix.de \
    --cc=tsahee@annapurnalabs.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).