Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaa23eb8 authored by Manu Gautam's avatar Manu Gautam
Browse files

usb_bam: Remove support for USB3 internal memory as BAM FIFOs 



Earlier USB3 controller's internal memory was used BAM FIFO for
QDSS pipe. As there is now dedicated chunk in OCIMEM assigned
to support the same, drop support for using USB3 private memory.

Change-Id: Ic2ffb6c1f8589e57e06f1e72560fcb49e5a9511a
Signed-off-by: default avatarManu Gautam <mgautam@codeaurora.org>
parent ecad6475

Documentation/devicetree/bindings/platform/msm/usb-bam.txt

+6 −11
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ Required properties: 
            If SSUSB_BAM is used, "ssusb" should be present.

            If HSUSB_BAM is used, "hsusb" should be present.

            If HSIC_BAM is used, "hsic" should be present.



            If a QSCRATCH RAM1 register is designated for providing USB3

            private memory to use as a BAM FIFO, specify "qscratch_ram1_reg".

- interrupts: IRQ lines for BAM devices

- interrupt-names: BAM interrupt name(s), in 1-1 correspondence with

            'interrupts' above.
@@ -31,7 +28,7 @@ Required properties: 


Optional properties:

- qcom,usb-bam-fifo-baseaddr: base address for bam pipe's data and descriptor

  fifos. This can be on chip memory (ocimem) or usb private memory. This

  fifos. This can be on chip memory (ocimem). This

  property is required if sub-node's mem-type is ocimem or usb private mem.



A number of USB BAM pipe parameters are represented as sub-nodes:
@@ -40,14 +37,13 @@ Subnode Required: 
- label: a string describing uniquely the usb bam pipe. The string can be

  constracted as follows: <core>-<peer>-<direction>-<pipe num>.

	core options: hsusb, ssusb/dwc3, hsic

	peer options: qdss, ipa, a2

	peer options: qdss, ipa

	direction options: in (from peer to usb), out (from usb to peer)

	pipe num options: 0..127

- qcom,usb-bam-mem-type: Type of memory used by this PIPE. Can be one of

            0 - Uses SPS's dedicated pipe memory

            1 - USB's private memory residing @ 'qcom,usb-bam-fifo-baseaddr'

            2 - System RAM allocated by driver

	    3 - OCI memory residing @ 'qcom,usb-bam-fifo-baseaddr'

            1 - System RAM allocated by driver

	    2 - OCI memory residing @ 'qcom,usb-bam-fifo-baseaddr'

- qcom,bam-type: BAM type can be one of

	0 - SSUSB_BAM

	1 - HSUSB_BAM
@@ -57,9 +53,8 @@ Subnode Required: 
	1 - to usb (in)

- qcom,pipe-num: pipe number

- qcom,peer-bam: peer BAM can be one of

	0 - A2_P_BAM

	1 - QDSS_P_BAM

	2 - IPA_P_BAM

	0 - QDSS_P_BAM

	1 - IPA_P_BAM

- qcom,data-fifo-size: data fifo size

- qcom,descriptor-fifo-size: descriptor fifo size

arch/arm/boot/dts/qcom/mdm9640.dtsi

+18 −18
Original line number Diff line number Diff line
@@ -990,11 +990,11 @@ 


		qcom,pipe0 {

			label = "ssusb-ipa-out-0";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <0>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0x08b04000>;

			qcom,src-bam-pipe-index = <1>;

			qcom,data-fifo-size = <0x8000>;
@@ -1003,11 +1003,11 @@ 
		};

		qcom,pipe1 {

			label = "ssusb-ipa-in-0";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x08b04000>;

			qcom,dst-bam-pipe-index = <0>;

			qcom,data-fifo-size = <0x8000>;
@@ -1016,11 +1016,11 @@ 
		};

		qcom,pipe2 {

			label = "ssusb-qdss-in-0";

			qcom,usb-bam-mem-type = <3>;

			qcom,usb-bam-mem-type = <2>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,peer-bam = <0>;

			qcom,src-bam-physical-address = <0x00884000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0x08b04000>;
@@ -1033,11 +1033,11 @@ 
		};

		qcom,pipe3 {

			label = "ssusb-ipa-out-1";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <0>;

			qcom,pipe-num = <1>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0x08b04000>;

			qcom,src-bam-pipe-index = <3>;

			qcom,data-fifo-size = <0x8000>;
@@ -1046,11 +1046,11 @@ 
		};

		qcom,pipe4 {

			label = "ssusb-ipa-in-1";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <1>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x08b04000>;

			qcom,dst-bam-pipe-index = <2>;

			qcom,data-fifo-size = <0x8000>;
@@ -1059,11 +1059,11 @@ 
		};

		qcom,pipe5 {

			label = "ssusb-ipa-out-2";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <0>;

			qcom,pipe-num = <2>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0x08b04000>;

			qcom,src-bam-pipe-index = <5>;

			qcom,data-fifo-size = <0x8000>;
@@ -1072,11 +1072,11 @@ 
		};

		qcom,pipe6 {

			label = "ssusb-ipa-in-2";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <2>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x08b04000>;

			qcom,dst-bam-pipe-index = <4>;

			qcom,data-fifo-size = <0x8000>;
@@ -1085,11 +1085,11 @@ 
		};

		qcom,pipe7  {

			label = "ssusb-ipa-out-3";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <0>;

			qcom,pipe-num = <3>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0x08b04000>;

			qcom,src-bam-pipe-index = <6>;

			qcom,data-fifo-size = <0x8000>;
@@ -1098,11 +1098,11 @@ 
		};

		qcom,pipe8  {

			label = "ssusb-ipa-in-3";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <3>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x08b04000>;

			qcom,dst-bam-pipe-index = <7>;

			qcom,data-fifo-size = <0x8000>;

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -759,11 +759,11 @@ 


		qcom,pipe0 {

			label = "hsusb-qdss-in-0";

			qcom,usb-bam-mem-type = <3>;

			qcom,usb-bam-mem-type = <2>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,peer-bam = <0>;

			qcom,src-bam-physical-address = <0x884000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0x78c4000>;

arch/arm/boot/dts/qcom/msm8952.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -960,11 +960,11 @@ 


		qcom,pipe0 {

			label = "hsusb-ipa-out-0";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <1>;

			qcom,dir = <0>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0x78c4000>;

			qcom,src-bam-pipe-index = <1>;

			qcom,data-fifo-size = <0x8000>;
@@ -973,11 +973,11 @@ 
		};

		qcom,pipe1 {

			label = "hsusb-ipa-in-0";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x78c4000>;

			qcom,dst-bam-pipe-index = <0>;

			qcom,data-fifo-size = <0x8000>;
@@ -987,11 +987,11 @@ 


		qcom,pipe2 {

			label = "hsusb-qdss-in-0";

			qcom,usb-bam-mem-type = <3>;

			qcom,usb-bam-mem-type = <2>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,peer-bam = <0>;

			qcom,src-bam-physical-address = <0x884000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0x78c4000>;
@@ -1006,11 +1006,11 @@ 
		/* USB BAM pipe (consumer) configuration for accelerated DPL */

		qcom,pipe3 {

			label = "hsusb-dpl-ipa-in-1";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <1>;

			qcom,dir = <1>;

			qcom,pipe-num = <1>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x78c4000>;

			qcom,dst-bam-pipe-index = <3>;

			qcom,data-fifo-size = <0x8000>;

arch/arm/boot/dts/qcom/msm8996.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -2230,11 +2230,11 @@ 


		qcom,pipe0 {

			label = "ssusb-ipa-out-0";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <0>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,src-bam-physical-address = <0x06b04000>;

			qcom,src-bam-pipe-index = <1>;

			qcom,data-fifo-size = <0x8000>;
@@ -2243,11 +2243,11 @@ 
		};

		qcom,pipe1 {

			label = "ssusb-ipa-in-0";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x06b04000>;

			qcom,dst-bam-pipe-index = <0>;

			qcom,data-fifo-size = <0x8000>;
@@ -2256,11 +2256,11 @@ 
		};

		qcom,pipe2 {

			label = "ssusb-qdss-in-0";

			qcom,usb-bam-mem-type = <3>;

			qcom,usb-bam-mem-type = <2>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <0>;

			qcom,peer-bam = <1>;

			qcom,peer-bam = <0>;

			qcom,src-bam-physical-address = <0x03084000>;

			qcom,src-bam-pipe-index = <0>;

			qcom,dst-bam-physical-address = <0x06b04000>;
@@ -2273,11 +2273,11 @@ 
		};

		qcom,pipe3 {

			label = "ssusb-dpl-ipa-in-1";

			qcom,usb-bam-mem-type = <2>;

			qcom,usb-bam-mem-type = <1>;

			qcom,bam-type = <0>;

			qcom,dir = <1>;

			qcom,pipe-num = <1>;

			qcom,peer-bam = <2>;

			qcom,peer-bam = <1>;

			qcom,dst-bam-physical-address = <0x06b04000>;

			qcom,dst-bam-pipe-index = <2>;

			qcom,data-fifo-size = <0x8000>;