* [PATCH 2/5] remoteproc: qcom: pas: Add MSM8226 ADSP support
2022-04-23 15:50 [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Luca Weiss
@ 2022-04-23 15:50 ` Luca Weiss
2022-04-23 15:50 ` [PATCH 3/5] ARM: dts: qcom: msm8226: Add ADSP node Luca Weiss
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Luca Weiss @ 2022-04-23 15:50 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Luca Weiss, Andy Gross,
Bjorn Andersson, Mathieu Poirier, linux-remoteproc, linux-kernel
Add a config for the ADSP present on MSM8226.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
drivers/remoteproc/qcom_q6v5_pas.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
index 1ae47cc153e5..319609fe753b 100644
--- a/drivers/remoteproc/qcom_q6v5_pas.c
+++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -848,6 +848,7 @@ static const struct adsp_data sdx55_mpss_resource = {
};
static const struct of_device_id adsp_of_match[] = {
+ { .compatible = "qcom,msm8226-adsp-pil", .data = &adsp_resource_init},
{ .compatible = "qcom,msm8974-adsp-pil", .data = &adsp_resource_init},
{ .compatible = "qcom,msm8996-adsp-pil", .data = &msm8996_adsp_resource},
{ .compatible = "qcom,msm8996-slpi-pil", .data = &slpi_resource_init},
--
2.36.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/5] ARM: dts: qcom: msm8226: Add ADSP node
2022-04-23 15:50 [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Luca Weiss
2022-04-23 15:50 ` [PATCH 2/5] remoteproc: qcom: pas: Add MSM8226 ADSP support Luca Weiss
@ 2022-04-23 15:50 ` Luca Weiss
2022-07-19 18:21 ` Luca Weiss
2022-04-23 15:50 ` [PATCH 4/5] ARM: dts: qcom: apq8026-asus-sparrow: Enable ADSP Luca Weiss
` (3 subsequent siblings)
5 siblings, 1 reply; 8+ messages in thread
From: Luca Weiss @ 2022-04-23 15:50 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Luca Weiss, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, devicetree,
linux-kernel
Add a node for the adsp found on msm8226.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
.../boot/dts/qcom-apq8026-asus-sparrow.dts | 2 +
arch/arm/boot/dts/qcom-msm8226.dtsi | 65 +++++++++++++++++++
2 files changed, 67 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
index ace8cea27949..818c1a201227 100644
--- a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
+++ b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
@@ -8,6 +8,8 @@
#include "qcom-msm8226.dtsi"
#include "qcom-pm8226.dtsi"
+/delete-node/ &adsp_region;
+
/ {
model = "ASUS ZenWatch 2";
compatible = "asus,sparrow", "qcom,apq8026";
diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi b/arch/arm/boot/dts/qcom-msm8226.dtsi
index 28eca15b5712..3016035d5e21 100644
--- a/arch/arm/boot/dts/qcom-msm8226.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8226.dtsi
@@ -8,6 +8,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,gcc-msm8974.h>
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/power/qcom-rpmpd.h>
#include <dt-bindings/reset/qcom,gcc-msm8974.h>
/ {
@@ -60,6 +61,11 @@ smem_region: smem@3000000 {
reg = <0x3000000 0x100000>;
no-map;
};
+
+ adsp_region: adsp@dc00000 {
+ reg = <0x0dc00000 0x1900000>;
+ no-map;
+ };
};
smd {
@@ -115,6 +121,31 @@ smem {
hwlocks = <&tcsr_mutex 3>;
};
+ smp2p-adsp {
+ compatible = "qcom,smp2p";
+ qcom,smem = <443>, <429>;
+
+ interrupt-parent = <&intc>;
+ interrupts = <GIC_SPI 158 IRQ_TYPE_EDGE_RISING>;
+
+ qcom,ipc = <&apcs 8 10>;
+
+ qcom,local-pid = <0>;
+ qcom,remote-pid = <2>;
+
+ adsp_smp2p_out: master-kernel {
+ qcom,entry-name = "master-kernel";
+ #qcom,smem-state-cells = <1>;
+ };
+
+ adsp_smp2p_in: slave-kernel {
+ qcom,entry-name = "slave-kernel";
+
+ interrupt-controller;
+ #interrupt-cells = <2>;
+ };
+ };
+
soc: soc {
compatible = "simple-bus";
#address-cells = <1>;
@@ -512,6 +543,40 @@ tcsr_mutex_block: syscon@fd484000 {
compatible = "syscon";
reg = <0xfd484000 0x2000>;
};
+
+ adsp: remoteproc@fe200000 {
+ compatible = "qcom,msm8226-adsp-pil";
+ reg = <0xfe200000 0x100>;
+
+ interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
+ <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+ <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+ <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+ <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+ interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
+
+ power-domains = <&rpmpd MSM8226_VDDCX>;
+ power-domain-names = "cx";
+
+ clocks = <&xo_board>;
+ clock-names = "xo";
+
+ memory-region = <&adsp_region>;
+
+ qcom,smem-states = <&adsp_smp2p_out 0>;
+ qcom,smem-state-names = "stop";
+
+ status = "disabled";
+
+ smd-edge {
+ interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
+
+ qcom,ipc = <&apcs 8 8>;
+ qcom,smd-edge = <1>;
+
+ label = "lpass";
+ };
+ };
};
timer {
--
2.36.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/5] ARM: dts: qcom: msm8226: Add ADSP node
2022-04-23 15:50 ` [PATCH 3/5] ARM: dts: qcom: msm8226: Add ADSP node Luca Weiss
@ 2022-07-19 18:21 ` Luca Weiss
0 siblings, 0 replies; 8+ messages in thread
From: Luca Weiss @ 2022-07-19 18:21 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, devicetree,
linux-kernel
Hi Bjorn,
On Samstag, 23. April 2022 17:50:57 CEST Luca Weiss wrote:
> Add a node for the adsp found on msm8226.
>
it seems the dt-bindings and driver patch has landed in 5.19 but I don't think
the 3 dts(i) patches are applied yet.
Could you please check and maybe apply them?
Regards
Luca
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
> .../boot/dts/qcom-apq8026-asus-sparrow.dts | 2 +
> arch/arm/boot/dts/qcom-msm8226.dtsi | 65 +++++++++++++++++++
> 2 files changed, 67 insertions(+)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
> b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts index
> ace8cea27949..818c1a201227 100644
> --- a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
> +++ b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
> @@ -8,6 +8,8 @@
> #include "qcom-msm8226.dtsi"
> #include "qcom-pm8226.dtsi"
>
> +/delete-node/ &adsp_region;
> +
> / {
> model = "ASUS ZenWatch 2";
> compatible = "asus,sparrow", "qcom,apq8026";
> diff --git a/arch/arm/boot/dts/qcom-msm8226.dtsi
> b/arch/arm/boot/dts/qcom-msm8226.dtsi index 28eca15b5712..3016035d5e21
> 100644
> --- a/arch/arm/boot/dts/qcom-msm8226.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8226.dtsi
> @@ -8,6 +8,7 @@
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> #include <dt-bindings/clock/qcom,gcc-msm8974.h>
> #include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/power/qcom-rpmpd.h>
> #include <dt-bindings/reset/qcom,gcc-msm8974.h>
>
> / {
> @@ -60,6 +61,11 @@ smem_region: smem@3000000 {
> reg = <0x3000000 0x100000>;
> no-map;
> };
> +
> + adsp_region: adsp@dc00000 {
> + reg = <0x0dc00000 0x1900000>;
> + no-map;
> + };
> };
>
> smd {
> @@ -115,6 +121,31 @@ smem {
> hwlocks = <&tcsr_mutex 3>;
> };
>
> + smp2p-adsp {
> + compatible = "qcom,smp2p";
> + qcom,smem = <443>, <429>;
> +
> + interrupt-parent = <&intc>;
> + interrupts = <GIC_SPI 158 IRQ_TYPE_EDGE_RISING>;
> +
> + qcom,ipc = <&apcs 8 10>;
> +
> + qcom,local-pid = <0>;
> + qcom,remote-pid = <2>;
> +
> + adsp_smp2p_out: master-kernel {
> + qcom,entry-name = "master-kernel";
> + #qcom,smem-state-cells = <1>;
> + };
> +
> + adsp_smp2p_in: slave-kernel {
> + qcom,entry-name = "slave-kernel";
> +
> + interrupt-controller;
> + #interrupt-cells = <2>;
> + };
> + };
> +
> soc: soc {
> compatible = "simple-bus";
> #address-cells = <1>;
> @@ -512,6 +543,40 @@ tcsr_mutex_block: syscon@fd484000 {
> compatible = "syscon";
> reg = <0xfd484000 0x2000>;
> };
> +
> + adsp: remoteproc@fe200000 {
> + compatible = "qcom,msm8226-adsp-pil";
> + reg = <0xfe200000 0x100>;
> +
> + interrupts-extended = <&intc GIC_SPI 162
IRQ_TYPE_EDGE_RISING>,
> + <&adsp_smp2p_in
0 IRQ_TYPE_EDGE_RISING>,
> + <&adsp_smp2p_in
1 IRQ_TYPE_EDGE_RISING>,
> + <&adsp_smp2p_in
2 IRQ_TYPE_EDGE_RISING>,
> + <&adsp_smp2p_in
3 IRQ_TYPE_EDGE_RISING>;
> + interrupt-names = "wdog", "fatal", "ready",
"handover", "stop-ack";
> +
> + power-domains = <&rpmpd MSM8226_VDDCX>;
> + power-domain-names = "cx";
> +
> + clocks = <&xo_board>;
> + clock-names = "xo";
> +
> + memory-region = <&adsp_region>;
> +
> + qcom,smem-states = <&adsp_smp2p_out 0>;
> + qcom,smem-state-names = "stop";
> +
> + status = "disabled";
> +
> + smd-edge {
> + interrupts = <GIC_SPI 156
IRQ_TYPE_EDGE_RISING>;
> +
> + qcom,ipc = <&apcs 8 8>;
> + qcom,smd-edge = <1>;
> +
> + label = "lpass";
> + };
> + };
> };
>
> timer {
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 4/5] ARM: dts: qcom: apq8026-asus-sparrow: Enable ADSP
2022-04-23 15:50 [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Luca Weiss
2022-04-23 15:50 ` [PATCH 2/5] remoteproc: qcom: pas: Add MSM8226 ADSP support Luca Weiss
2022-04-23 15:50 ` [PATCH 3/5] ARM: dts: qcom: msm8226: Add ADSP node Luca Weiss
@ 2022-04-23 15:50 ` Luca Weiss
2022-04-23 15:50 ` [PATCH 5/5] ARM: dts: qcom: apq8026-lg-lenok: " Luca Weiss
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Luca Weiss @ 2022-04-23 15:50 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Luca Weiss, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, devicetree,
linux-kernel
The customized reserved memory for ADSP is already configured, so we
just need to enable the node.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
index 818c1a201227..215613c65250 100644
--- a/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
+++ b/arch/arm/boot/dts/qcom-apq8026-asus-sparrow.dts
@@ -59,6 +59,10 @@ vreg_wlan: wlan-regulator {
};
};
+&adsp {
+ status = "okay";
+};
+
&blsp1_uart1 {
status = "okay";
--
2.36.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/5] ARM: dts: qcom: apq8026-lg-lenok: Enable ADSP
2022-04-23 15:50 [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Luca Weiss
` (2 preceding siblings ...)
2022-04-23 15:50 ` [PATCH 4/5] ARM: dts: qcom: apq8026-asus-sparrow: Enable ADSP Luca Weiss
@ 2022-04-23 15:50 ` Luca Weiss
2022-04-23 19:56 ` [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Krzysztof Kozlowski
2022-09-15 18:46 ` (subset) " Bjorn Andersson
5 siblings, 0 replies; 8+ messages in thread
From: Luca Weiss @ 2022-04-23 15:50 UTC (permalink / raw)
To: linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Luca Weiss, Andy Gross,
Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, devicetree,
linux-kernel
Configure the reserved memory for ADSP and enable it.
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
---
arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
index 2b7e52fda6a7..193569f0ca5f 100644
--- a/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
+++ b/arch/arm/boot/dts/qcom-apq8026-lg-lenok.dts
@@ -8,6 +8,8 @@
#include "qcom-msm8226.dtsi"
#include "qcom-pm8226.dtsi"
+/delete-node/ &adsp_region;
+
/ {
model = "LG G Watch R";
compatible = "lg,lenok", "qcom,apq8026";
@@ -23,6 +25,13 @@ chosen {
stdout-path = "serial0:115200n8";
};
+ reserved-memory {
+ adsp_region: adsp@3300000 {
+ reg = <0x03300000 0x1400000>;
+ no-map;
+ };
+ };
+
vreg_wlan: wlan-regulator {
compatible = "regulator-fixed";
@@ -38,6 +47,10 @@ vreg_wlan: wlan-regulator {
};
};
+&adsp {
+ status = "okay";
+};
+
&blsp1_i2c1 {
status = "okay";
--
2.36.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp
2022-04-23 15:50 [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Luca Weiss
` (3 preceding siblings ...)
2022-04-23 15:50 ` [PATCH 5/5] ARM: dts: qcom: apq8026-lg-lenok: " Luca Weiss
@ 2022-04-23 19:56 ` Krzysztof Kozlowski
2022-09-15 18:46 ` (subset) " Bjorn Andersson
5 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-04-23 19:56 UTC (permalink / raw)
To: Luca Weiss, linux-arm-msm
Cc: ~postmarketos/upstreaming, phone-devel, Andy Gross,
Bjorn Andersson, Mathieu Poirier, Rob Herring,
Krzysztof Kozlowski, Manivannan Sadhasivam, linux-remoteproc,
devicetree, linux-kernel
On 23/04/2022 17:50, Luca Weiss wrote:
> Add the compatible for the adsp found in MSM8226.
>
> Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
> ---
> Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml | 5 +++++
> 1 file changed, 5 insertions(+)
>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: (subset) [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp
2022-04-23 15:50 [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Luca Weiss
` (4 preceding siblings ...)
2022-04-23 19:56 ` [PATCH 1/5] dt-bindings: remoteproc: qcom: pas: Add MSM8226 adsp Krzysztof Kozlowski
@ 2022-09-15 18:46 ` Bjorn Andersson
5 siblings, 0 replies; 8+ messages in thread
From: Bjorn Andersson @ 2022-09-15 18:46 UTC (permalink / raw)
To: luca, linux-arm-msm
Cc: robh+dt, agross, phone-devel, mathieu.poirier,
krzysztof.kozlowski+dt, mani, devicetree,
~postmarketos/upstreaming, linux-remoteproc, linux-kernel
On Sat, 23 Apr 2022 17:50:55 +0200, Luca Weiss wrote:
> Add the compatible for the adsp found in MSM8226.
>
>
Applied, thanks!
[3/5] ARM: dts: qcom: msm8226: Add ADSP node
commit: 25ba74dd60022f2fa1630405d6eba7c37f45b13a
[4/5] ARM: dts: qcom: apq8026-asus-sparrow: Enable ADSP
commit: 268c661c172d783540f34a132290e78342bae3c5
[5/5] ARM: dts: qcom: apq8026-lg-lenok: Enable ADSP
commit: 5cbd20166f0ac7ae0272d25401b6ec5472482a19
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread