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

Commit df15f46f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes... 

Merge changes I81747f93,Ief527579,Idabce39c,I3ff1894f,I73e0402e,I6a10c3e9,I6c2cd9a9,I31f49d6b,I26c82d4b,I80d49d20,I9b12fb45,Ie4f1e9bd,I6bb6ba82 into msm-next

* changes:
  ion: Revert upstream changes for now
  ARM: dts: msm: Describe reserved-memory regions for sdm855
  drivers: dma-removed: page align size on free
  mm/memblock: disable local irqs while late memblock changes
  drivers: dma-removed: Don't free prohibited memmap entries
  mm/memblock: fix a race between search and remove
  of: update reserved-memory document to include removed-dma-pool
  drivers: dma-removed: introduce no-map-fixup
  drivers: dma-removed: use memset_io for ioremap region
  drivers: dma-removed: fix data type to hold base address
  drivers: dma-removed: align size first
  drivers: Add dma removed ops
  of: platform: initialize of_reserved_mem
parents e28aa353 1dbd9a27

Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt

+12 −0
Original line number Original line Diff line number Diff line
@@ -51,12 +51,24 @@ compatible (optional) - standard definition 
          used as a shared pool of DMA buffers for a set of devices. It can

          used as a shared pool of DMA buffers for a set of devices. It can

          be used by an operating system to instanciate the necessary pool

          be used by an operating system to instanciate the necessary pool

          management subsystem if necessary.

          management subsystem if necessary.

	- removed-dma-pool: This indicates a region of memory which is meant to

	  be carved out and not exposed to kernel.

        - vendor specific string in the form <vendor>,[<device>-]<usage>

        - vendor specific string in the form <vendor>,[<device>-]<usage>

no-map (optional) - empty property

no-map (optional) - empty property

    - Indicates the operating system must not create a virtual mapping

    - Indicates the operating system must not create a virtual mapping

      of the region as part of its standard mapping of system memory,

      of the region as part of its standard mapping of system memory,

      nor permit speculative access to it under any circumstances other

      nor permit speculative access to it under any circumstances other

      than under the control of the device driver using the region.

      than under the control of the device driver using the region.

no-map-fixup (optional) - empty property

    - Indicates the operating system must reserve the memory region and keep

      virtual mapping. Upon first allocation the actual allocated region is

      removed for any virtual mapping and behaves as "no-map" while the

      remaining memory is returned back to the system for normal use. One would

      like to use this property where he is not sure about how much region size

      must be reserved, so he gives it a max size which then is shrink once

      (first) allocation is done. This property is for some specific use cases,

      if unsure please don't use it. This property cannot be used together with

      "no-map" attribute.

reusable (optional) - empty property

reusable (optional) - empty property

    - The operating system can use the memory in this region with the

    - The operating system can use the memory in this region with the

      limitation that the device driver(s) owning the region need to be

      limitation that the device driver(s) owning the region need to be

arch/arm64/boot/dts/qcom/sdm855.dtsi

+129 −0
Original line number Original line Diff line number Diff line
@@ -204,6 +204,135 @@ 
	};

	};





	soc: soc { };

	soc: soc { };



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		hyp_mem: hyp_mem@85700000 {

			no-map;

			reg = <0x0 0x85700000 0x0 0x600000>;

		};



		xbl_aop_mem: xbl_aop_mem@85e00000 {

			no-map;

			reg = <0x0 0x85e00000 0x0 0x140000>;

		};



		removed_regions: removed_regions@86000000 {

			no-map;

			reg = <0x0 0x86000000 0x0 0x2f00000>;

		};



		pil_camera_mem: camera_region@8ab00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8ab00000 0x0 0x500000>;

		};



		pil_modem_mem: modem_region@8b000000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x8b000000 0x0 0x7D00000>;

		};



		pil_video_mem: pil_video_region@92d00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x92d00000 0x0 0x500000>;

		};



		pil_cdsp_mem: cdsp_regions@93200000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x93200000 0x0 0x800000>;

		};



		pil_adsp_mem: pil_adsp_region@93a00000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x93a00000 0x0 0x1a00000>;

		};



		pil_slpi_mem: pil_slpi_region@95400000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x95400000 0x0 0x1400000>;

		};



		pil_ipa_fw_mem: pil_ipa_fw_region@96800000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x96800000 0x0 0x10000>;

		};



		pil_ipa_gsi_mem: pil_ipa_gsi_region@96810000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x96810000 0x0 0x5000>;

		};



		pil_gpu_mem: pil_gpu_region@96815000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x96815000 0x0 0x1000>;

		};



		pil_npu_mem: pil_npu_mem@96880000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x96880000 0x0 0x80000>;

		};



		pil_spss_mem: spss_region@96900000 {

			compatible = "removed-dma-pool";

			no-map;

			reg = <0x0 0x96900000 0x0 0x100000>;

		};



		adsp_mem: adsp_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0xc00000>;

		};



		qseecom_mem: qseecom_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x1400000>;

		};



		sp_mem: sp_region {  /* SPSS-HLOS ION shared mem */

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x800000>;

		};



		secure_display_memory: secure_display_region {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x5c00000>;

		};



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";

			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;

			reusable;

			alignment = <0x0 0x400000>;

			size = <0x0 0x2000000>;

			linux,cma-default;

		};

	};

};

};





#include "sdm855-gdsc.dtsi"

#include "sdm855-gdsc.dtsi"

arch/arm64/configs/sdm855-perf_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,6 @@ CONFIG_DMADEVICES=y 
CONFIG_UIO=y

CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_ARM_SMMU=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SCM=y

CONFIG_EXTCON=y

CONFIG_EXTCON=y

arch/arm64/configs/sdm855_defconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -302,7 +302,6 @@ CONFIG_DMADEVICES=y 
CONFIG_UIO=y

CONFIG_UIO=y

CONFIG_STAGING=y

CONFIG_STAGING=y

CONFIG_ASHMEM=y

CONFIG_ASHMEM=y

CONFIG_ION=y

CONFIG_ARM_SMMU=y

CONFIG_ARM_SMMU=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_SCM=y

CONFIG_EXTCON=y

CONFIG_EXTCON=y

drivers/base/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ obj-$(CONFIG_DEVTMPFS) += devtmpfs.o 
obj-$(CONFIG_DMA_CMA) += dma-contiguous.o

obj-$(CONFIG_DMA_CMA) += dma-contiguous.o

obj-y			+= power/

obj-y			+= power/

obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o

obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o

obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o

obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o dma-removed.o

obj-$(CONFIG_ISA_BUS_API)	+= isa.o

obj-$(CONFIG_ISA_BUS_API)	+= isa.o

obj-$(CONFIG_FW_LOADER)	+= firmware_class.o

obj-$(CONFIG_FW_LOADER)	+= firmware_class.o

obj-$(CONFIG_NUMA)	+= node.o

obj-$(CONFIG_NUMA)	+= node.o