Skip to contentSkip to conversation

arm64: dts: qcom: add cheza support

RFC In review Rob Clark 5 participants 11 messages May 9, 2019 – May 15, 2019

Subsystems (3)
lore
Share & tools
lore
author
#1 lore raw

RFC 1/3 arm64: dts: qcom: sdm845-cheza: add initial cheza dt

In reply to Rob Clark

From: Rob Clark <[email protected]>

This is essentialy a squash of a bunch of history of cheza dt updates from chromium kernel, some of which were themselves squashes of history from older chromium kernels.

I don't claim any credit other than wanting to more easily boot upstream kernel on cheza to have an easier way to test upstream driver work ;-)

I've added below in Cc tags all the original actual authors (apologies if I missed any).

Cc Douglas Anderson <[email protected]>
Cc Sibi Sankar <[email protected]>
Cc Evan Green <[email protected]>
Cc Matthias Kaehlcke <[email protected]>
Cc Abhinav Kumar <[email protected]>
Cc Brian Norris <[email protected]>
Cc Venkat Gopalakrishnan <[email protected]>
Cc Rajendra Nayak <[email protected]>
---
 arch/arm64/boot/dts/qcom/Makefile            |    3 +
 arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts |  238 ++++
 arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts |  238 ++++
 arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts |  180 +++
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi   | 1317 ++++++++++++++++++
 5 files changed, 1976 insertions(+)
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
arch/arm64/boot/dts/qcom/Makefile +3 -0
index b3fe72ff2955..7a038cf81543 100644
@@ -8,6 +8,9 @@ dtb-$(CONFIG_ARCH_QCOM)	+= msm8994-angler-rev-101.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= msm8996-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= msm8998-mtp.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r1.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r2.dtb
+dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-cheza-r3.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= sdm845-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-1000.dtb
 dtb-$(CONFIG_ARCH_QCOM)	+= qcs404-evb-4000.dtb
arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts new file +238 -0

238 lines not on this page · raw message

arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts new file +238 -0

238 lines not on this page · raw message

arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts new file +180 -0

180 lines not on this page · raw message

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi new file +1317 -0

1,317 lines not on this page · raw message

Signature · 1 line
2.20.1
author
#3 lore raw

RFC 2/3 arm64: dts: qcom: sdm845-cheza: Re-add reserved memory

In reply to Rob Clark

From: Douglas Anderson <[email protected]>

Let's fixup the reserved memory to re-add the things we deleted in ("CHROMIUM: arm64: dts: qcom: sdm845-cheza: Temporarily delete reserved-mem changes") in a way that plays nicely with the new upstream definitions.

---
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +34 -0
index 338c92ddd1c3..8ccbe246dff4 100644
@@ -156,10 +156,44 @@
 	};
 };
 
+/*
+ * Reserved memory changes
+ *
+ * Putting this all together (out of order with the rest of the file) to keep
+ * all modifications to the memory map (from sdm845.dtsi) in one place.
+ */
+
+/*
+ * Our mpss_region is 8MB bigger than the default one and that conflicts
+ * with venus_mem and cdsp_mem.
+ *
+ * For venus_mem we'll delete and re-create at a different address.
+ *
+ * cdsp_mem isn't used on cheza right now so we won't bother re-creating it; but
+ * that also means we need to delete cdsp_pas.
+ */
+/delete-node/ &venus_mem;
+/delete-node/ &cdsp_mem;
+/delete-node/ &cdsp_pas;
+
+/* Increase the size from 120 MB to 128 MB */
 &mpss_region {
 	reg = <0 0x8e000000 0 0x8000000>;
 };
 
+/* Increase the size from 2MB to 8MB */
+&rmtfs_mem {
+	reg = <0 0x88f00000 0 0x800000>;
+};
+
+/ {
+	reserved-memory {
+		venus_mem: memory@96000000 {
+			reg = <0 0x96000000 0 0x500000>;
+			no-map;
+		};
+	};
+};
 &qspi {
 	status = "okay";
 	pinctrl-names = "default";
Signature · 1 line
2.20.1
author
#9 lore raw

RFC 3/3 arm64: dts: qcom: sdm845-cheza: delete zap-shader

In reply to Rob Clark

From: Rob Clark <[email protected]>

This is unused on cheza. Delete the node to get rid of the reserved- memory section, and to avoid the driver from attempting to load a zap shader that doesn't exist every time it powers up the GPU.

---
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 ++
 arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +2 -0
index 8ccbe246dff4..28c28517b21a 100644
@@ -175,6 +175,8 @@
 /delete-node/ &venus_mem;
 /delete-node/ &cdsp_mem;
 /delete-node/ &cdsp_pas;
+/delete-node/ &zap_shader;
+/delete-node/ &gpu_mem;
 
 /* Increase the size from 120 MB to 128 MB */
 &mpss_region {
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
index b2d9e46c3916..2ea74b58a613 100644
@@ -1989,7 +1989,7 @@
 
 			qcom,gmu = <&gmu>;
 
-			zap-shader {
+			zap_shader: zap-shader {
 				memory-region = <&gpu_mem>;
 			};
 
Signature · 1 line
2.20.1

Rob Clark

author
#0 lore raw

cover arm64: dts: qcom: add cheza support

From: Rob Clark <[email protected]>

I cobbled together the dt for the cheza board (based on sdm845 SoC) from the chromium kernel, mostly to simplify running an upstream kernel on the device (it is a useful thing to be able to directly run an upstream kernel when testing/debugging/implementing driver changes, rather than having to cherry-pick everything back to an older kernel).

With this, and a few other fixes I've posted yesterday, plus sdm845.dtsi patches for GPU and MDSS interconnect support which have been posted, and a few other things which are making their way upstream, I can boot to GUI on cheza. (So at least display and GPU work, plus a myriad of other things required to get that far.)

In particular, the third patch depends on 'arm64: dts: sdm845: Add zap shader region for GPU'

Douglas Anderson (1):
arm64: dts: qcom: sdm845-cheza: Re-add reserved memory

Rob Clark (2):
arm64: dts: qcom: sdm845-cheza: add initial cheza dt
arm64: dts: qcom: sdm845-cheza: delete zap-shader

 arch/arm64/boot/dts/qcom/Makefile            |    3 +
 arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts |  238 +++
 arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts |  238 +++
 arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts |  180 +++
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi   | 1353 ++++++++++++++++++
 arch/arm64/boot/dts/qcom/sdm845.dtsi         |    2 +-
 6 files changed, 2013 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts
 create mode 100644 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
Signature · 1 line
2.20.1
#2 lore raw

Re: [RFC 1/3] arm64: dts: qcom: sdm845-cheza: add initial cheza dt

In reply to Rob Clark

Hi,

Quoted 21 lines · Rob Clark

From: Rob Clark <[email protected]>

This is essentialy a squash of a bunch of history of cheza dt updates from chromium kernel, some of which were themselves squashes of history from older chromium kernels.

I don't claim any credit other than wanting to more easily boot upstream kernel on cheza to have an easier way to test upstream driver work ;-)

I've added below in Cc tags all the original actual authors (apologies if I missed any).

Cc Douglas Anderson <[email protected]>
Cc Sibi Sankar <[email protected]>
Cc Evan Green <[email protected]>
Cc Matthias Kaehlcke <[email protected]>
Cc Abhinav Kumar <[email protected]>
Cc Brian Norris <[email protected]>
Cc Venkat Gopalakrishnan <[email protected]>
Cc Rajendra Nayak <[email protected]>
Quoted 7 lines
---
 arch/arm64/boot/dts/qcom/Makefile            |    3 +
 arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts |  238 ++++
 arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts |  238 ++++
 arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts |  180 +++
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi   | 1317 ++++++++++++++++++
 5 files changed, 1976 insertions(+)

In general I am supportive of getting cheza dts landed upstream.

One question is how much cleanup we want to do while landing upstream. We have a few TODO / HACK comments currently. Do we want to land what we have and clean these up in separate commits, or should we try to do cleanup beforehand. Bjron / Andy: do you have any opinions? I've commented on a few below.

arch/arm64/boot/dts/qcom/Makefile dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb · line 15

Quoted 13 lines
arch/arm64/boot/dts/qcom/Makefile +3 -0
index b3fe72ff2955..7a038cf81543 100644
@@ -8,6 +8,9 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8996-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += msm8998-mtp.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += sdm845-cheza-r1.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += sdm845-cheza-r2.dtb
+dtb-$(CONFIG_ARCH_QCOM)        += sdm845-cheza-r3.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += sdm845-mtp.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += qcs404-evb-1000.dtb
 dtb-$(CONFIG_ARCH_QCOM)        += qcs404-evb-4000.dtb

Something about the above makes "git am" unhappy and "patch -p1" think this is a malformed patch. When I delete the part touching the Makefile then I can apply OK.

Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts new file +4 -0
new file mode 100644
index 000000000000..35bb4629edd4
@@ -0,0 +1,238 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Cheza board device tree source
+ *

arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts line 14

Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845-cheza-r1.dts new file +10 -0
+ * Copyright 2018 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sdm845-cheza.dtsi"
+
+/ {
+       model = "Google Cheza (rev1)";
+       compatible = "google,cheza-rev1", "google,cheza", "qcom,sdm845";

See below for rev 3, but I think this might be better as:

compatible = "google,cheza-rev1", "qcom,sdm845";

Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts new file +4 -0
new file mode 100644
index 000000000000..4359a82d4bb4
@@ -0,0 +1,238 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Cheza board device tree source
+ *

arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts line 14

Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845-cheza-r2.dts new file +10 -0
+ * Copyright 2018 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sdm845-cheza.dtsi"
+
+/ {
+       model = "Google Cheza (rev2)";
+       compatible = "google,cheza-rev2", "google,cheza", "qcom,sdm845";

See above and below, but probably:

compatible = "google,cheza-rev2", "qcom,sdm845";

Quoted 16 lines
arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts new file +10 -0
new file mode 100644
index 000000000000..2c3f815b90c1
@@ -0,0 +1,180 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Cheza board device tree source
+ *
+ * Copyright 2018 Google LLC.
+ */
+
+/dts-v1/;
+
+#include "sdm845-cheza.dtsi"

arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts line 20

Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845-cheza-r3.dts new file +10 -0
+
+/ {
+       model = "Google Cheza (rev3+)";
+       compatible = "google,cheza-rev15", "google,cheza-rev14",
+                    "google,cheza-rev13", "google,cheza-rev12",
+                    "google,cheza-rev11", "google,cheza-rev10",
+                    "google,cheza-rev9", "google,cheza-rev8",
+                    "google,cheza-rev7", "google,cheza-rev6",
+                    "google,cheza-rev5", "google,cheza-rev4",
+                    "google,cheza-rev3", "google,cheza", "qcom,sdm845";

Julius Werner suggested that a better solution is that the newest dts should specify no revision. Thus this should be just:

compatible = "google,cheza", "qcom,sdm845";

Quoted 42 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi new file +36 -0
new file mode 100644
index 000000000000..338c92ddd1c3
@@ -0,0 +1,1317 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Google Cheza device tree source (common between revisions)
+ *
+ * Copyright 2018 Google LLC.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
+#include "sdm845.dtsi"
+
+/* PMICs depend on spmi_bus label and so must come after SoC */
+#include "pm8005.dtsi"
+#include "pm8998.dtsi"
+
+/ {
+       aliases {
+               bluetooth0 = &bluetooth;
+               hsuart0 = &uart6;
+               serial0 = &uart9;
+               wifi0 = &wifi;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       backlight: backlight {
+               compatible = "pwm-backlight";
+               pwms = <&cros_ec_pwm 0>;
+               enable-gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
+               power-supply = <&ppvar_sys>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&ap_edp_bklten>;
+       };

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 46

Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi new file +10 -0
+
+       reserved-memory {
+               rmtfs@88f00000 {
+                       compatible = "qcom,rmtfs-mem";
+                       reg = <0x0 0x88f00000 0x0 0x800000>;
+                       no-map;
+
+                       qcom,client-id = <1>;
+               };
+       };

You missed part of:

https://crrev.com/c/1588964 - CHROMIUM: arm64: dts: qcom:
sdm845-cheza: Temporarily delete reserved-mem changes

...that should make the above "reserved-memory" section go away.

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 625

Quoted 3 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi new file +3 -0
+&spi0 {
+       status = "okay";
+       spi-max-frequency = <3000000>;  /* TODO: Drop this? */

Drop "spi-max-frequency". That was part of original bindings but shouldn't be there anymore.

Quoted 5 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi new file +5 -0
+};
+
+&spi5 {
+       status = "okay";
+       spi-max-frequency = <800000>; /* TODO: Drop this */

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 640

Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi new file +10 -0
+       cr50@0 {
+               compatible = "google,cr50";
+               reg = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&h1_ap_int_odl>;
+               spi-max-frequency = <800000>;
+               interrupt-parent = <&tlmm>;
+               interrupts = <129 IRQ_TYPE_EDGE_RISING>;
+       };
+};

Presumably the above needs to be dropped since "google,cr50" isn't actually upstream.

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 644

Quoted 3 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi new file +3 -0
+&spi10 {
+       status = "okay";
+       spi-max-frequency = <3000000>;  /* TODO: Drop this? */

Drop "spi-max-frequency". That was part of original bindings but shouldn't be there anymore.

-Doug

#4 lore raw

Re: [RFC 2/3] arm64: dts: qcom: sdm845-cheza: Re-add reserved memory

In reply to Rob Clark

Hi,

Quoted 6 lines · Rob Clark

From: Douglas Anderson <[email protected]>

Let's fixup the reserved memory to re-add the things we deleted in ("CHROMIUM: arm64: dts: qcom: sdm845-cheza: Temporarily delete reserved-mem changes") in a way that plays nicely with the new upstream definitions.

The message above makes no sense since that commit you reference isn't in upstream.

...but in any case, why not squash this in with the previous commit?

Quoted 3 lines

Remove Stephen's Reviewed-by. In general reviews that happen in the Chrome OS gerrit shouldn't be carried over when things are posted upstream.

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 196

Quoted 13 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +13 -0
+/* Increase the size from 2MB to 8MB */
+&rmtfs_mem {
+       reg = <0 0x88f00000 0 0x800000>;
+};
+
+/ {
+       reserved-memory {
+               venus_mem: memory@96000000 {
+                       reg = <0 0x96000000 0 0x500000>;
+                       no-map;
+               };
+       };
+};

nit: blank line?

-Doug

#5 lore raw

Re: [RFC 2/3] arm64: dts: qcom: sdm845-cheza: Re-add reserved memory

Quoted 12 lines · Doug Anderson

Hi,

Quoted 6 lines · Rob Clark

From: Douglas Anderson <[email protected]>

Let's fixup the reserved memory to re-add the things we deleted in ("CHROMIUM: arm64: dts: qcom: sdm845-cheza: Temporarily delete reserved-mem changes") in a way that plays nicely with the new upstream definitions.

Quoted 4 lines

The message above makes no sense since that commit you reference isn't in upstream.

...but in any case, why not squash this in with the previous commit?

Yeah, I should have mentioned this was my intention, I just left it unsquashed since (at the time) it was something I had cherry-picked on top of current 4.19 cros kernel..

anyways, I pushed an (unsquashed, converted to fixup!'s) update to:

https://github.com/freedreno/kernel-msm/commits/wip/cheza-dtb-upstreaming

which has updates based on you're review comments (at least assuming I understood them correctly).. plus some unrelated to cheza-dt patches on top to get things actually working (ie. ignore everything on top of the fixup!'s)

I didn't see any comments on the 'delete zap-shader' patch, so hopefully that means what I did there was a sane (or at least not insane) way to handle android/linux tz vs what we have on cheza?

BR,
-R

Quoted 28 lines
Quoted 5 lines

Remove Stephen's Reviewed-by. In general reviews that happen in the Chrome OS gerrit shouldn't be carried over when things are posted upstream.

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 196

Quoted 13 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +13 -0
+/* Increase the size from 2MB to 8MB */
+&rmtfs_mem {
+       reg = <0 0x88f00000 0 0x800000>;
+};
+
+/ {
+       reserved-memory {
+               venus_mem: memory@96000000 {
+                       reg = <0 0x96000000 0 0x500000>;
+                       no-map;
+               };
+       };
+};

nit: blank line?

-Doug

#6 lore raw

Re: [RFC 2/3] arm64: dts: qcom: sdm845-cheza: Re-add reserved memory

Quoted 26 lines · Rob Clark
Quoted 12 lines · Doug Anderson

Hi,

Quoted 6 lines · Rob Clark

From: Douglas Anderson <[email protected]>

Let's fixup the reserved memory to re-add the things we deleted in ("CHROMIUM: arm64: dts: qcom: sdm845-cheza: Temporarily delete reserved-mem changes") in a way that plays nicely with the new upstream definitions.

Quoted 4 lines

The message above makes no sense since that commit you reference isn't in upstream.

...but in any case, why not squash this in with the previous commit?

Yeah, I should have mentioned this was my intention, I just left it unsquashed since (at the time) it was something I had cherry-picked on top of current 4.19 cros kernel..

anyways, I pushed an (unsquashed, converted to fixup!'s) update to:

https://github.com/freedreno/kernel-msm/commits/wip/cheza-dtb-upstreaming

Quoted 8 lines

which has updates based on you're review comments (at least assuming I understood them correctly).. plus some unrelated to cheza-dt patches on top to get things actually working (ie. ignore everything on top of the fixup!'s)

I didn't see any comments on the 'delete zap-shader' patch, so hopefully that means what I did there was a sane (or at least not insane) way to handle android/linux tz vs what we have on cheza?

Yeah. In a world where all the 845 firmware is in linux-firmware the best differentiating factor would be the absence of the reserved memory or the zap-shader node in the device tree. Otherwise we would have to try and fail to execute the scm call and then make some sort of educated guess as to if it failed for the "right" reasons.

Jordan

Quoted 26 lines
Quoted 26 lines
Quoted 3 lines

Remove Stephen's Reviewed-by. In general reviews that happen in the Chrome OS gerrit shouldn't be carried over when things are posted upstream.

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 196

Quoted 13 lines
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +13 -0
+/* Increase the size from 2MB to 8MB */
+&rmtfs_mem {
+       reg = <0 0x88f00000 0 0x800000>;
+};
+
+/ {
+       reserved-memory {
+               venus_mem: memory@96000000 {
+                       reg = <0 0x96000000 0 0x500000>;
+                       no-map;
+               };
+       };
+};

nit: blank line?

-Doug

Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#10 lore raw

Re: [RFC 3/3] arm64: dts: qcom: sdm845-cheza: delete zap-shader

In reply to Rob Clark

Hi,

Quoted 10 lines · Rob Clark

From: Rob Clark <[email protected]>

This is unused on cheza. Delete the node to get rid of the reserved- memory section, and to avoid the driver from attempting to load a zap shader that doesn't exist every time it powers up the GPU.

---
 arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 2 ++
 arch/arm64/boot/dts/qcom/sdm845.dtsi       | 2 +-

nit: up to Bjorn / Andy, but personally I'd put cheza and non-cheza changes in two patches.

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi line 178

Quoted 11 lines
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +1 -0
index 8ccbe246dff4..28c28517b21a 100644
@@ -175,6 +175,8 @@
 /delete-node/ &venus_mem;
 /delete-node/ &cdsp_mem;
 /delete-node/ &cdsp_pas;
+/delete-node/ &zap_shader;

nit: I'd probably move the delete of the zap shader to a slightly different place just because the rest of the lines here are deleting reserved memory regions.

Other than nits this seems OK to me. Not that I know anything about the zap shader or why a zap shader wouldn't be appropriate for cheza.

-Doug

#7 lore raw

Re: [RFC 2/3] arm64: dts: qcom: sdm845-cheza: Re-add reserved memory

In reply to Rob Clark

Hi,

Quoted 22 lines · Rob Clark
Quoted 12 lines · Doug Anderson

Hi,

Quoted 6 lines · Rob Clark

From: Douglas Anderson <[email protected]>

Let's fixup the reserved memory to re-add the things we deleted in ("CHROMIUM: arm64: dts: qcom: sdm845-cheza: Temporarily delete reserved-mem changes") in a way that plays nicely with the new upstream definitions.

Quoted 4 lines

The message above makes no sense since that commit you reference isn't in upstream.

...but in any case, why not squash this in with the previous commit?

Yeah, I should have mentioned this was my intention, I just left it unsquashed since (at the time) it was something I had cherry-picked on top of current 4.19 cros kernel..

Quoted 8 lines

anyways, I pushed an (unsquashed, converted to fixup!'s) update to:

https://github.com/freedreno/kernel-msm/commits/wip/cheza-dtb-upstreaming

which has updates based on you're review comments (at least assuming I understood them correctly).. plus some unrelated to cheza-dt patches on top to get things actually working (ie. ignore everything on top of the fixup!'s)

Looks OK to me. Are you going to post this? Bjorn / Andy: do you guys have opinions here?

Quoted 3 lines

I didn't see any comments on the 'delete zap-shader' patch, so hopefully that means what I did there was a sane (or at least not insane) way to handle android/linux tz vs what we have on cheza?

I wasn't CCed, so I assumed you were looking for feedback from others on that one. ;-) Oh, but I guess Jordan and Bjorn also weren't CCed... In any case, I replied now.

#8 lore raw

Re: [RFC 2/3] arm64: dts: qcom: sdm845-cheza: Re-add reserved memory

Quoted 30 lines · Doug Anderson

Hi,

Quoted 26 lines · Rob Clark
Quoted 12 lines · Doug Anderson

Hi,

Quoted 6 lines · Rob Clark

From: Douglas Anderson <[email protected]>

Let's fixup the reserved memory to re-add the things we deleted in ("CHROMIUM: arm64: dts: qcom: sdm845-cheza: Temporarily delete reserved-mem changes") in a way that plays nicely with the new upstream definitions.

Quoted 4 lines

The message above makes no sense since that commit you reference isn't in upstream.

...but in any case, why not squash this in with the previous commit?

Yeah, I should have mentioned this was my intention, I just left it unsquashed since (at the time) it was something I had cherry-picked on top of current 4.19 cros kernel..

anyways, I pushed an (unsquashed, converted to fixup!'s) update to:

https://github.com/freedreno/kernel-msm/commits/wip/cheza-dtb-upstreaming

Quoted 8 lines
Quoted 4 lines

which has updates based on you're review comments (at least assuming I understood them correctly).. plus some unrelated to cheza-dt patches on top to get things actually working (ie. ignore everything on top of the fixup!'s)

Looks OK to me. Are you going to post this? Bjorn / Andy: do you guys have opinions here?

I think this is a good opportunity to get people with Cheza off 4.19, so I'm all for landing this upstream.

Regards,
Bjorn

Quoted 8 lines
Quoted 4 lines

I didn't see any comments on the 'delete zap-shader' patch, so hopefully that means what I did there was a sane (or at least not insane) way to handle android/linux tz vs what we have on cheza?

I wasn't CCed, so I assumed you were looking for feedback from others on that one. ;-) Oh, but I guess Jordan and Bjorn also weren't CCed... In any case, I replied now.