Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Olivier Masse <olivier.masse@nxp.com>
To:     sumit.semwal@linaro.org, benjamin.gaignard@collabora.com,
        Brian.Starkey@arm.com, christian.koenig@amd.com,
        linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
        linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org
Cc:     clement.faure@nxp.com, olivier.masse@nxp.com
Subject: [PATCH 5/5] plat-hikey: Add linaro,secure-heap compatible
Date:   Tue,  2 Aug 2022 11:58:43 +0200
Message-Id: <20220802095843.14614-6-olivier.masse@nxp.com>
In-Reply-To: <20220802095843.14614-1-olivier.masse@nxp.com>
References: <20220802095843.14614-1-olivier.masse@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?w44S6pk0jx5fXLp4QdyaZ1RCUQh13jmGIQ0caYHy7TLUvg0m1QEmImdq/eDE?=
 =?us-ascii?Q?E18iktoe3LZBKzF2r2l+lxS0jll3NZt3Ak7xPbWZA/XOkSsKC0EV2sVVYzkE?=
 =?us-ascii?Q?0oAHJi0+2VzphTpy9JyX9eW9Yic1e5p2+PAMVlgM5oTzyHZ/f6Ag5q1+xbVm?=
 =?us-ascii?Q?USwmeg7jDobMyW6TW8yt/mAzbsgqSWinSTP0iij/wU34wl37uUzuiQoTkeQn?=
 =?us-ascii?Q?YROzQgMADxkyBbzS6KKjXNJcqHCWivhu3SrjpmP9NjS2voK6Tf0EDwYVd7oz?=
 =?us-ascii?Q?qYiGh8qIbl7aK+W8DNFWUevbkGKrFqP3PqP17FIUkUyTxBG1KClSpbXii5M7?=
 =?us-ascii?Q?NucMl0gNCwKXRPmBUxS2OkQ4GsolrdwEqHdGMn3t7OI0aKCAnFSUQh5yyE2E?=
 =?us-ascii?Q?5VNoDChyVPqpQwwC3wGW1E+WSPryEWEAfD2UYgViowrSRWKT3TCM6CAnBjDX?=
 =?us-ascii?Q?sIpbFxoQvrPfIf1hq/5S79TPotyTNzMRd/6bncdFAm/liAAnK2bHwXE4N+1K?=
 =?us-ascii?Q?nhaQn3musgza7T6rtlgCRFA2jeM2+NDHtggtILtAJdDLVc2tdY2j2UNfoOR2?=
 =?us-ascii?Q?RQX6oenQtZe2N5vhARUywUaVlEkiScf/ga8cadEPAmFzJiWwoH++HZf0ldPe?=
 =?us-ascii?Q?KU6VzaWkmP6MAnjgAZL8j24jVJAs4YKmuLZNhcGWEZo477bTm3WzeEh7ciLV?=
 =?us-ascii?Q?8EXPXiaArxOIrUFKA/BFOaRvjv4JnEw3xIHs43OzttEKvvDhCAxIm1iRmTS2?=
 =?us-ascii?Q?7iulAA07fxUPUavq7dPOco6wcwsJxqM6g+bFT0dS/9t7ArEzdAQZVooQilRI?=
 =?us-ascii?Q?pHU5gXSnY9nEWmIvu0a+LiBbgRiW2Ztl2eAT1j6rEBZ+M7KGRDD6LgBhkD7S?=
 =?us-ascii?Q?X3f5N1zM8fjet9/eD8yYt+5X/Y6CL/mUfqsVN/ZxxLl37ut8r/s4Dmcfd7FD?=
 =?us-ascii?Q?DG28pdtMFfV3YeEPV4DNx3kuVWofRNqBm/hQw7I2fOsox25qbu/abN1+T/A9?=
 =?us-ascii?Q?BZmHSANSgfyDWOgUOr7dQlt+WufYdk+Eko0AZM0fgFkxqs+Wl2v8GxkKaSvO?=
 =?us-ascii?Q?mbhGea/r8pz8+7Wz1Gtmt4rCJEimvqLEZtxViIGzWUMdQvBc07O6RrmxHRfx?=
 =?us-ascii?Q?ymrFrQfH9koVNSI4rxPtGA0jmeWwL7hUvVOKTYvyfQB0OtwNe55xuhvcDHV3?=
 =?us-ascii?Q?DTbgdEVi6l056lJPMBo775fF5Q3K0Tuu0i11ojWf1Z2dblT0NbZVQTRuiuYy?=
 =?us-ascii?Q?U6XiQeHCnZGRc56Nfg9QIqYOB2NZdaqIy3/NmuMGgU3mBW/JNZf8IBFCsOWG?=
 =?us-ascii?Q?/ZaKFCFiX7gbUOZkwXenJHFfQqnBc9xlVS1NncYu+BMMGeVUa0SduJqEB2ew?=
 =?us-ascii?Q?0+PDs786jw07/agkR9qhlsKLHjW9pfP1n7qHTUcCk0BFg/BSjV9B9efs60Mf?=
 =?us-ascii?Q?BTlIQzA2lqIKmcMVW1JOkC2ZRrndKeD/iFaPlwI4rUeNrQroQEZDk7IU0VG/?=
 =?us-ascii?Q?G1S5+Oszs3xE6afG64oUzxAwZXizyI9ier27cVjLi2w0YzIiue6ayZd3iIJk?=
 =?us-ascii?Q?/Z4JA2+Utt/T9nZFZpLskxUt4/xGPZMrF0NXRUa2?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 219c9b1e-b2c4-4692-8da2-08da746d9be6
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6737.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2022 09:58:54.3587
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XbUbVGGO3CBWraDX6qkrzPjjNmBRvqTX9hINUUh2Of1C44RobwJOOdDpd+US+wC7bKn0V4ldQp0PDyx8NceGXg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8341
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TVD_SPACE_RATIO autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Add DMABUF_HEAPS_SECURE in defconfig

Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 11 +++++++++++
 arch/arm64/configs/defconfig                   |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 3df2afb2f637..e4af0d914279 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -258,6 +258,17 @@ optee {
 		};
 	};
 
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+
+		sdp@3e800000 {
+			compatible = "linaro,secure-heap";
+			no-map;
+			reg = <0 0x3E800000 0 0x00400000>;
+		};
+	};
+
 	sound_card {
 		compatible = "audio-graph-card";
 		dais = <&i2s0_port0>;
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index c09b07c22d57..4b625043313d 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1465,6 +1465,10 @@ CONFIG_CRYPTO_DEV_HISI_SEC2=m
 CONFIG_CRYPTO_DEV_HISI_ZIP=m
 CONFIG_CRYPTO_DEV_HISI_HPRE=m
 CONFIG_CRYPTO_DEV_HISI_TRNG=m
+CONFIG_DMABUF_HEAPS=y
+CONFIG_DMABUF_HEAPS_DEFERRED_FREE=y
+CONFIG_DMABUF_HEAPS_PAGE_POOL=y
+CONFIG_DMABUF_HEAPS_SECURE=y
 CONFIG_CMA_SIZE_MBYTES=32
 CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_KERNEL=y
-- 
2.25.0