diff options
| author | ming_qian <ming.qian@nxp.com> | 2019-01-29 16:34:21 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:36:02 +0800 |
| commit | a1229ecbf93aba6aec3dde27f8d5fc305c7d2f4a (patch) | |
| tree | 2d5b5a4edbffeda636b30a31007f92642023e64f /arch/arm64/boot/dts/freescale | |
| parent | f8524c61bf9e3b273eccc7c311f171725081f5fa (diff) | |
MLK-20797-2: VPU Encoder: reserve memory for actframe
the region of CMA associated with M0+ core is in [256M, 1G]
It can't be guaranteed that it's uncachable for M0+ core.
There are some risk, reserve memory to make sure it's in [128M, 256M].
Eliminate the potential risks
Signed-off-by: ming_qian <ming.qian@nxp.com>
Diffstat (limited to 'arch/arm64/boot/dts/freescale')
7 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi index d84784f2b322..2a8da9b34d11 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8dx.dtsi @@ -136,6 +136,10 @@ no-map; reg = <0 0x92400000 0 0x2000000>; }; + encoder_reserved: encoder_reserved@0x94400000 { + no-map; + reg = <0 0x94400000 0 0x800000>; + }; /* global autoconfigured region for contiguous allocations */ linux,cma { compatible = "shared-dma-pool"; @@ -3360,6 +3364,7 @@ boot-region = <&encoder_boot>; rpc-region = <&encoder_rpc>; + reserved-region = <&encoder_reserved>; reg = <0x0 0x2d000000 0x0 0x1000000>, /*VPU Encoder*/ <0x0 0x2c000000 0x0 0x2000000>; /*VPU*/ reg-names = "vpu_regs"; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0-dpu2.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0-dpu2.dts index 2ab79704e56b..8a4b314b29f1 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0-dpu2.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0-dpu2.dts @@ -275,6 +275,10 @@ xen,passthrough; reg = <0 0x91400000 0 0x1000000>; }; + encoder_reserved_mem: encoder_reserved_mem@0x94400000 { + xen,passthrough; + reg = <0 0x94400000 0 0x800000>; + }; decoder_str_mem: str_mem@0x94400000 { xen,passthrough; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0.dts index 3bb9fe6b9a0c..6225544ee6df 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-dom0.dts @@ -339,6 +339,10 @@ xen,passthrough; reg = <0 0x92400000 0 0x2000000>; }; + encoder_reserved_mem: encoder_reserved_mem@0x94400000 { + xen,passthrough; + reg = <0 0x94400000 0 0x800000>; + }; /* This piece memory is used by M41, M40 is not covered */ m41_mem: m41_mem@0x94400000 { diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts index 556c8be14b17..cc031c39a728 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu-dpu1.dts @@ -123,6 +123,10 @@ reg = <0 0x92200000 0 0x200000>; }; + encoder_reserved: encoder_reserved@0x94400000 { + no-map; + reg = <0 0x94400000 0 0x800000>; + }; decoder_str: str@0x94400000 { no-map; reg = <0 0x94400000 0 0x1800000>; @@ -241,6 +245,7 @@ boot-region = <&encoder_boot>; rpc-region = <&encoder_rpc>; + reserved-region = <&encoder_reserved>; reg = <0x0 0x2d000000 0x0 0x1000000>, /*VPU Encoder*/ <0x0 0x2c000000 0x0 0x2000000>; /*VPU*/ reg-names = "vpu_regs"; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts index cd204df406be..1ef40bd43df7 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-domu.dts @@ -150,6 +150,10 @@ no-map; reg = <0 0x92400000 0 0x2000000>; }; + encoder_reserved: encoder_reserved@0x94400000 { + no-map; + reg = <0 0x94400000 0 0x800000>; + }; /* global autoconfigured region for contiguous allocations */ linux,cma { @@ -310,6 +314,7 @@ boot-region = <&encoder_boot>; rpc-region = <&encoder_rpc>; + reserved-region = <&encoder_reserved>; reg = <0x0 0x2d000000 0x0 0x1000000>, /*VPU Encoder*/ <0x0 0x2c000000 0x0 0x2000000>; /*VPU*/ reg-names = "vpu_regs"; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi index 59a43fc513ee..9e6d07fef941 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi @@ -113,6 +113,10 @@ no-map; reg = <0 0x92400000 0 0x2000000>; }; + encoder_reserved: encoder_reserved@0x94400000 { + no-map; + reg = <0 0x94400000 0 0x800000>; + }; /* global autoconfigured region for contiguous allocations */ linux,cma { @@ -198,6 +202,7 @@ boot-region = <&encoder_boot>; rpc-region = <&encoder_rpc>; + reserved-region = <&encoder_reserved>; reg = <0x0 0x2d000000 0x0 0x1000000>, /*VPU Encoder*/ <0x0 0x2c000000 0x0 0x2000000>; /*VPU*/ reg-names = "vpu_regs"; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-dom0.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-dom0.dts index 80d1d99a1c65..623b30113dc5 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-dom0.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-dom0.dts @@ -74,6 +74,9 @@ dsp_reserved_mem: dsp_reserved_mem@0x92400000 { reg = <0 0x92400000 0 0x2000000>; }; + encoder_reserved_mem: encoder_reserved_mem@0x94400000 { + reg = <0 0x94400000 0 0x800000>; + }; rtc0: rtc@23000000 { interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; |