| Message ID | 1562859668-14209-13-git-send-email-gokulsri@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | remoteproc: qcom: q6v5-wcss: Add support for secure pil | expand |
Quoting Gokul Sriram Palanisamy (2019-07-11 08:41:08) > diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi > index 6a61a63..c24e3f6 100644 > --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi > +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi > @@ -10,6 +10,22 @@ > model = "Qualcomm Technologies, Inc. IPQ8074"; > compatible = "qcom,ipq8074"; > > + reserved-memory { > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; > + > + smem_region:smem@4ab00000 { Put a space between the colon and the node name. Also, just call it memory@4ab00000. smem_region: memory@4ab00000 { > + no-map; > + reg = <0x0 0x4ab00000 0x0 0x00100000>; > + }; > + > + q6_region: q6@4b000000 { memory@ > + no-map; > + reg = <0x0 0x4b000000 0x0 0x05f00000>; > + }; > + }; > + > firmware { > scm { > compatible = "qcom,scm-ipq8074", "qcom,scm"; > @@ -431,6 +447,115 @@ > "axi_m_sticky"; > status = "disabled"; > }; > + apcs: syscon@b111000 { Add a newline between nodes please. > + compatible = "syscon"; > + reg = <0x0B111000 0x1000>; > + }; > + > + wcss: smp2p-wcss { This node should be outside the soc node because it doesn't have a reg property > + compatible = "qcom,smp2p"; > + qcom,smem = <435>, <428>; > + > + interrupt-parent = <&intc>; > + interrupts = <0 322 1>; > + > + qcom,ipc = <&apcs 8 9>; > + > + qcom,local-pid = <0>; > + qcom,remote-pid = <1>; > + > + wcss_smp2p_out: master-kernel { > + qcom,entry-name = "master-kernel"; > + qcom,smp2p-feature-ssr-ack; > + #qcom,smem-state-cells = <1>; > + }; > + > + wcss_smp2p_in: slave-kernel { > + qcom,entry-name = "slave-kernel"; > + > + interrupt-controller; > + #interrupt-cells = <2>; > + }; > + }; > + > + tcsr_q6_block: syscon@1945000 { Do you really need _block in these aliases? > + compatible = "syscon"; > + reg = <0x1945000 0xE000>; > + }; > + > + tcsr_mutex_block: syscon@193d000 { > + compatible = "syscon"; > + reg = <0x1905000 0x8000>; > + }; > + > + tcsr_mutex: hwlock@193d000 { > + compatible = "qcom,tcsr-mutex"; > + syscon = <&tcsr_mutex_block 0 0x80>; > + #hwlock-cells = <1>; > + }; > + > + smem: qcom,smem@4AB00000 { lowercase please. And just 'smem' I guess. > + compatible = "qcom,smem"; > + memory-region = <&smem_region>; > + hwlocks = <&tcsr_mutex 0>; > + }; > + > + apcs_glb: mailbox@b111000 { > + compatible = "qcom,ipq8074-apcs-apps-global"; > + reg = <0xb111000 0x1000>; These addresses should be padded out to 8 digits for the address part (not the size). > + > + #mbox-cells = <1>; > + }; > + > + q6v5_wcss: q6v5_wcss@CD00000 { lowercase. > + compatible = "qcom,ipq8074-wcss-pil"; > + reg = <0xCD00000 0x4040>, > + <0x4AB000 0x20>;
On 2019-07-18 01:43, Stephen Boyd wrote: > Quoting Gokul Sriram Palanisamy (2019-07-11 08:41:08) >> diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi >> b/arch/arm64/boot/dts/qcom/ipq8074.dtsi >> index 6a61a63..c24e3f6 100644 >> --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi >> +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi >> @@ -10,6 +10,22 @@ >> model = "Qualcomm Technologies, Inc. IPQ8074"; >> compatible = "qcom,ipq8074"; >> >> + reserved-memory { >> + #address-cells = <2>; >> + #size-cells = <2>; >> + ranges; >> + >> + smem_region:smem@4ab00000 { > > Put a space between the colon and the node name. Also, just call it > memory@4ab00000. ok, will fix. > > smem_region: memory@4ab00000 { > >> + no-map; >> + reg = <0x0 0x4ab00000 0x0 0x00100000>; >> + }; >> + >> + q6_region: q6@4b000000 { > > memory@ ok, will fix. > >> + no-map; >> + reg = <0x0 0x4b000000 0x0 0x05f00000>; >> + }; >> + }; >> + >> firmware { >> scm { >> compatible = "qcom,scm-ipq8074", "qcom,scm"; >> @@ -431,6 +447,115 @@ >> "axi_m_sticky"; >> status = "disabled"; >> }; >> + apcs: syscon@b111000 { > > Add a newline between nodes please. ok, will fix. > >> + compatible = "syscon"; >> + reg = <0x0B111000 0x1000>; >> + }; >> + >> + wcss: smp2p-wcss { > > This node should be outside the soc node because it doesn't have a reg > property ok, will fix. > >> + compatible = "qcom,smp2p"; >> + qcom,smem = <435>, <428>; >> + >> + interrupt-parent = <&intc>; >> + interrupts = <0 322 1>; >> + >> + qcom,ipc = <&apcs 8 9>; >> + >> + qcom,local-pid = <0>; >> + qcom,remote-pid = <1>; >> + >> + wcss_smp2p_out: master-kernel { >> + qcom,entry-name = "master-kernel"; >> + qcom,smp2p-feature-ssr-ack; >> + #qcom,smem-state-cells = <1>; >> + }; >> + >> + wcss_smp2p_in: slave-kernel { >> + qcom,entry-name = "slave-kernel"; >> + >> + interrupt-controller; >> + #interrupt-cells = <2>; >> + }; >> + }; >> + >> + tcsr_q6_block: syscon@1945000 { > > Do you really need _block in these aliases? ok, will fix it to "tcsr_q6" > >> + compatible = "syscon"; >> + reg = <0x1945000 0xE000>; >> + }; >> + >> + tcsr_mutex_block: syscon@193d000 { >> + compatible = "syscon"; >> + reg = <0x1905000 0x8000>; >> + }; >> + >> + tcsr_mutex: hwlock@193d000 { >> + compatible = "qcom,tcsr-mutex"; >> + syscon = <&tcsr_mutex_block 0 0x80>; >> + #hwlock-cells = <1>; >> + }; >> + >> + smem: qcom,smem@4AB00000 { > > lowercase please. And just 'smem' I guess. ok, will fix. > >> + compatible = "qcom,smem"; >> + memory-region = <&smem_region>; >> + hwlocks = <&tcsr_mutex 0>; >> + }; >> + >> + apcs_glb: mailbox@b111000 { >> + compatible = "qcom,ipq8074-apcs-apps-global"; >> + reg = <0xb111000 0x1000>; > > These addresses should be padded out to 8 digits for the address part > (not the size). ok, will fix. > >> + >> + #mbox-cells = <1>; >> + }; >> + >> + q6v5_wcss: q6v5_wcss@CD00000 { > > lowercase. ok, will fix. > >> + compatible = "qcom,ipq8074-wcss-pil"; >> + reg = <0xCD00000 0x4040>, >> + <0x4AB000 0x20>; Regards, Gokul
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi index 6a61a63..c24e3f6 100644 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi @@ -10,6 +10,22 @@ model = "Qualcomm Technologies, Inc. IPQ8074"; compatible = "qcom,ipq8074"; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + smem_region:smem@4ab00000 { + no-map; + reg = <0x0 0x4ab00000 0x0 0x00100000>; + }; + + q6_region: q6@4b000000 { + no-map; + reg = <0x0 0x4b000000 0x0 0x05f00000>; + }; + }; + firmware { scm { compatible = "qcom,scm-ipq8074", "qcom,scm"; @@ -431,6 +447,115 @@ "axi_m_sticky"; status = "disabled"; }; + apcs: syscon@b111000 { + compatible = "syscon"; + reg = <0x0B111000 0x1000>; + }; + + wcss: smp2p-wcss { + compatible = "qcom,smp2p"; + qcom,smem = <435>, <428>; + + interrupt-parent = <&intc>; + interrupts = <0 322 1>; + + qcom,ipc = <&apcs 8 9>; + + qcom,local-pid = <0>; + qcom,remote-pid = <1>; + + wcss_smp2p_out: master-kernel { + qcom,entry-name = "master-kernel"; + qcom,smp2p-feature-ssr-ack; + #qcom,smem-state-cells = <1>; + }; + + wcss_smp2p_in: slave-kernel { + qcom,entry-name = "slave-kernel"; + + interrupt-controller; + #interrupt-cells = <2>; + }; + }; + + tcsr_q6_block: syscon@1945000 { + compatible = "syscon"; + reg = <0x1945000 0xE000>; + }; + + tcsr_mutex_block: syscon@193d000 { + compatible = "syscon"; + reg = <0x1905000 0x8000>; + }; + + tcsr_mutex: hwlock@193d000 { + compatible = "qcom,tcsr-mutex"; + syscon = <&tcsr_mutex_block 0 0x80>; + #hwlock-cells = <1>; + }; + + smem: qcom,smem@4AB00000 { + compatible = "qcom,smem"; + memory-region = <&smem_region>; + hwlocks = <&tcsr_mutex 0>; + }; + + apcs_glb: mailbox@b111000 { + compatible = "qcom,ipq8074-apcs-apps-global"; + reg = <0xb111000 0x1000>; + + #mbox-cells = <1>; + }; + + q6v5_wcss: q6v5_wcss@CD00000 { + compatible = "qcom,ipq8074-wcss-pil"; + reg = <0xCD00000 0x4040>, + <0x4AB000 0x20>; + reg-names = "qdsp6", + "rmb"; + qca,auto-restart; + qca,extended-intc; + interrupts-extended = <&intc 0 325 1>, + <&wcss_smp2p_in 0 0>, + <&wcss_smp2p_in 1 0>, + <&wcss_smp2p_in 2 0>, + <&wcss_smp2p_in 3 0>; + interrupt-names = "wdog", + "fatal", + "ready", + "handover", + "stop-ack"; + + resets = <&gcc GCC_WCSSAON_RESET>, + <&gcc GCC_WCSS_BCR>, + <&gcc GCC_WCSS_Q6_BCR>; + + reset-names = "wcss_aon_reset", + "wcss_reset", + "wcss_q6_reset"; + + clocks = <&gcc GCC_PRNG_AHB_CLK>; + clock-names = "prng"; + + qcom,halt-regs = <&tcsr_q6_block 0xA000 0xD000 0x0>; + + qcom,smem-states = <&wcss_smp2p_out 0>, + <&wcss_smp2p_out 1>; + qcom,smem-state-names = "shutdown", + "stop"; + + memory-region = <&q6_region>; + + glink-edge { + interrupts = <GIC_SPI 321 IRQ_TYPE_EDGE_RISING>; + qcom,remote-pid = <1>; + mboxes = <&apcs_glb 8>; + + rpm_requests { + qcom,glink-channels = "IPCRTR"; + }; + }; + }; }; cpus {