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

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

Merge "ARM: dts: msm: convert SPSS heap into secure CMA heap type for sdm845"

parents 5b8e7a4a c3e15fc1

arch/arm64/boot/dts/qcom/sdm845-ion.dtsi

+4 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -33,10 +33,10 @@ 
			qcom,ion-heap-type = "DMA";

		};



		qcom,ion-heap@13 { /* SPSS HEAP */

		qcom,ion-heap@13 { /* SECURE SPSS HEAP */

			reg = <13>;

			memory-region = <&sp_mem>;

			qcom,ion-heap-type = "DMA";

			memory-region = <&secure_sp_mem>;

			qcom,ion-heap-type = "HYP_CMA";

		};



		qcom,ion-heap@10 { /* SECURE DISPLAY HEAP */

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

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ 
			size = <0 0x1400000>;

		};



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

		secure_sp_mem: secure_sp_region { /* SPSS-HLOS ION shared mem */

			compatible = "shared-dma-pool";

			alloc-ranges = <0 0x00000000 0 0xffffffff>; /* 32-bit */

			reusable;

drivers/staging/android/uapi/msm_ion.h

+0 −9
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ enum cp_mem_usage { 
#define ION_FLAG_CP_NON_PIXEL		ION_BIT(20)

#define ION_FLAG_CP_CAMERA		ION_BIT(21)

#define ION_FLAG_CP_HLOS		ION_BIT(22)

#define ION_FLAG_CP_HLOS_FREE		ION_BIT(23)

#define ION_FLAG_CP_SEC_DISPLAY		ION_BIT(25)

#define ION_FLAG_CP_APP			ION_BIT(26)

#define ION_FLAG_CP_CAMERA_PREVIEW	ION_BIT(27)
@@ -96,13 +95,6 @@ enum cp_mem_usage { 
 */

#define ION_FLAG_SECURE			ION_BIT(ION_HEAP_ID_RESERVED)



/**

 * Flag for clients to force contiguous memort allocation

 *

 * Use of this flag is carefully monitored!

 */

#define ION_FLAG_FORCE_CONTIGUOUS	ION_BIT(30)



/*

 * Used in conjunction with heap which pool memory to force an allocation

 * to come from the page allocator directly instead of from the pool allocation
@@ -113,7 +105,6 @@ enum cp_mem_usage { 
 * Deprecated! Please use the corresponding ION_FLAG_*

 */

#define ION_SECURE ION_FLAG_SECURE

#define ION_FORCE_CONTIGUOUS ION_FLAG_FORCE_CONTIGUOUS



/**

 * Macro should be used with ion_heap_ids defined above.