Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195485/?format=api
{ "id": 2195485, "url": "http://patchwork.ozlabs.org/api/patches/2195485/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260211082401.2407853-3-coxu@redhat.com/", "project": { "id": 2, "url": "http://patchwork.ozlabs.org/api/projects/2/?format=api", "name": "Linux PPC development", "link_name": "linuxppc-dev", "list_id": "linuxppc-dev.lists.ozlabs.org", "list_email": "linuxppc-dev@lists.ozlabs.org", "web_url": "https://github.com/linuxppc/wiki/wiki", "scm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git", "webscm_url": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/", "list_archive_url_format": "https://lore.kernel.org/linuxppc-dev/{}/", "commit_url_format": "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}" }, "msgid": "<20260211082401.2407853-3-coxu@redhat.com>", "list_archive_url": "https://lore.kernel.org/linuxppc-dev/20260211082401.2407853-3-coxu@redhat.com/", "date": "2026-02-11T08:24:00", "name": "[v4,2/2] arm64,ppc64le/kdump: pass dm-crypt keys to kdump kernel", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "632b4e4aeba48c802c9ddae5f86db6eaf6940739", "submitter": { "id": 81201, "url": "http://patchwork.ozlabs.org/api/people/81201/?format=api", "name": "Coiby Xu", "email": "coxu@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260211082401.2407853-3-coxu@redhat.com/mbox/", "series": [ { "id": 491790, "url": "http://patchwork.ozlabs.org/api/series/491790/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=491790", "date": "2026-02-11T08:23:59", "name": "kdump: Enable LUKS-encrypted dump target support in ARM64 and PowerPC", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/491790/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2195485/comments/", "check": "success", "checks": "http://patchwork.ozlabs.org/api/patches/2195485/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "\n <linuxppc-dev+bounces-16800-incoming=patchwork.ozlabs.org@lists.ozlabs.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linuxppc-dev@lists.ozlabs.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Mnwo53Ar;\n\tdkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com\n header.a=rsa-sha256 header.s=mimecast20190719 header.b=Mnwo53Ar;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=2404:9400:21b9:f100::1; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-16800-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)", "lists.ozlabs.org;\n arc=none smtp.remote-ip=170.10.133.124", "lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=redhat.com", "lists.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Mnwo53Ar;\n\tdkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com\n header.a=rsa-sha256 header.s=mimecast20190719 header.b=Mnwo53Ar;\n\tdkim-atps=neutral", "lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com\n (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com;\n envelope-from=coxu@redhat.com; receiver=lists.ozlabs.org)" ], "Received": [ "from lists.ozlabs.org (lists.ozlabs.org\n [IPv6:2404:9400:21b9:f100::1])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4f9s112Vy7z1xpY\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 11 Feb 2026 19:24:37 +1100 (AEDT)", "from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4f9s0k2vMwz2xlp;\n\tWed, 11 Feb 2026 19:24:22 +1100 (AEDT)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4f9s0j0h2Bz2yvy\n\tfor <linuxppc-dev@lists.ozlabs.org>; Wed, 11 Feb 2026 19:24:20 +1100 (AEDT)", "from mail-pf1-f197.google.com (mail-pf1-f197.google.com\n [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-496-2G3yac53OpiR8HKhcolVpA-1; Wed, 11 Feb 2026 03:24:15 -0500", "by mail-pf1-f197.google.com with SMTP id\n d2e1a72fcca58-82442b44d94so2828212b3a.2\n for <linuxppc-dev@lists.ozlabs.org>;\n Wed, 11 Feb 2026 00:24:15 -0800 (PST)", "from localhost ([209.132.188.88])\n by smtp.gmail.com with ESMTPSA id\n d2e1a72fcca58-8249e7d7136sm1228850b3a.42.2026.02.11.00.24.12\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 11 Feb 2026 00:24:13 -0800 (PST)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1770798262;\n\tcv=none;\n b=MAKdZ4vpQatrx47llNB6Vg1A6HsUBI2jhqX5qN4qdKMsDvfsWlfkTRpdRUgXJJhfoVcVKB7+qvSPkTdrN4uk/i8KikkV+afS+7hQQQf9YNHiNP+fhitXxsQTqR1ze/2ZwdCUOSOKDwmjR+aNooFIUeqOhRKq/jOlZsHi+I3ylDZcYgBT8hqmm4M026l+zUVcAb96S1vR7UecnyicIYPHeDBlCkk5Uff8OWt3L4xyYNqy8np/r0Z4181Vb0hwg8paPPz3aAB3O9XPL3mXv/8Xue1XeVtbBUo8fsKUfE6PRYS2blP39aKl2PpVBdoV936yn+Q50lT1gK6QVuTu0CNaGQ==", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1770798262; c=relaxed/relaxed;\n\tbh=Jg6rUiFx+q06U0spbnVO76byiw3N0jzh2FjIOHbS9H8=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:content-type;\n b=WlSr15q5OpK0n1jTEc9zkruA9EMz5VIiEiAPI+7kdxUUjM1v0ebV3lTWF/IgJKwlSexo1YzHYbx7XLBMUJmixDE1E5E2D5piwUZbbX2sgTFPu7/wgDilr59u7HlXJqXOKeG/XHSd89pEbPYHO//SB3Lyxw5r0otoY67vI36SorQQrjlP86E1eP8KJLrSxS9M76vqVpP3BFrZ1LJkNXnB6uaWXrQwI5cZWXRNHK1yi+ks/tJbn/Njjseb02vu6azd9vCXpWEw5L9gicCmp4yeFkh2f/oAOxnNbkbbnB89wdncIMiDhzeyTxudq57xO0BxpxKPnIVMdhsa10K6OWvIbA==", "ARC-Authentication-Results": "i=1; lists.ozlabs.org;\n dmarc=pass (p=quarantine dis=none) header.from=redhat.com;\n dkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Mnwo53Ar;\n dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com\n header.a=rsa-sha256 header.s=mimecast20190719 header.b=Mnwo53Ar;\n dkim-atps=neutral; spf=pass (client-ip=170.10.133.124;\n helo=us-smtp-delivery-124.mimecast.com; envelope-from=coxu@redhat.com;\n receiver=lists.ozlabs.org) smtp.mailfrom=redhat.com", "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1770798257;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\t to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=Jg6rUiFx+q06U0spbnVO76byiw3N0jzh2FjIOHbS9H8=;\n\tb=Mnwo53ArF/UDBoE3bsjVIWZz+MkFxTXWR2q+BQA2T82sr0Ny3bskFOQY+ErwPkflkQaW8Q\n\t1J1GsbgazhZx3ECRVb0WEJ0rxPb5N0nT9NzSi2fImclgwQEeS5MYcUJYOiUaCuktNy1zjF\n\tIrTcsbDKKA3fUToW3CVl2RhsvIQ+Nxs=", "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1770798257;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\t to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=Jg6rUiFx+q06U0spbnVO76byiw3N0jzh2FjIOHbS9H8=;\n\tb=Mnwo53ArF/UDBoE3bsjVIWZz+MkFxTXWR2q+BQA2T82sr0Ny3bskFOQY+ErwPkflkQaW8Q\n\t1J1GsbgazhZx3ECRVb0WEJ0rxPb5N0nT9NzSi2fImclgwQEeS5MYcUJYOiUaCuktNy1zjF\n\tIrTcsbDKKA3fUToW3CVl2RhsvIQ+Nxs=" ], "X-MC-Unique": "2G3yac53OpiR8HKhcolVpA-1", "X-Mimecast-MFC-AGG-ID": "2G3yac53OpiR8HKhcolVpA_1770798255", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1770798254; x=1771403054;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=Jg6rUiFx+q06U0spbnVO76byiw3N0jzh2FjIOHbS9H8=;\n b=q4PCwDQrxGMCOPA7U/EK13bGZMa4SzvsUn92UNNGcXNkn3MpsMymQehYLgkY7eySYy\n IghGoEKSzoU20Qd8hj6kcjqJUUJ/GdR9IObxNqmxyGD5eO7YqoJAZdA/f32xREQYuLup\n 78gIXTDQscYSsTi8sfw1ScYxAXVaT2aMyeOnddTjz240Ncfj/y0VrMVl6iu/wfReiY/b\n uEA9I76HjK2Oc46qgVXEXGm6mZ0fwHFgPqTfLICLAwAX5MSOV5ub/cnp//XkZktck1cM\n mJndzuNrk5lZZTrzDFUUmyqtCxY/n5uV97uIkuNrkpBADS55vuCOFk/UbMW36SGd4CA8\n FyQg==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCWd5V2WHM0yVmd67Vuk04MacGDAhH8Jawgr7hQ/QomJFijafhjruEMk38EGSyDv5REHtYPssyJAyHY6CdM=@lists.ozlabs.org", "X-Gm-Message-State": "AOJu0YxoAUHEbla3RzvZKvvx7PEg3p141Q8zpDWXjeXuPpSvRVz9KGZc\n\tx08TGSIkwzuxOewdplgHY5+phgbIOY8ve2eH0um9D31iOl9gSx9crxgLWwnGQmFDkH2UWUQ0Si3\n\ts4ifzDKcMVoqEo3MXYenJfFj+GHbJ9cKe9A6dodf6cKoOsJqG8PifZKD+L2ZsVehWYbM=", "X-Gm-Gg": "AZuq6aLx6LpVIWqQhbNpfRBB0fWkMHtD9oXtUTaBz1CBoLWmomzZlVZ9sDXJeLAOBZf\n\tyOQ3Cb22elpbHL4b3iLNq49CF0/OH4Ac2SIglZbfL2+++Zavtx6XIZO4kQCVlnz0Gs0EWoJzMER\n\tlMz0gXVOQa8xP76IFdDSLTlzr8Vnp4wjMGyya8C7rh+3Y0LtRqavci/Jgta3+tr9v5IsROIFtvb\n\tj5PDJcnAOMXnqgjChyHVw2U1f/YV3xGoIiYyxrEeFgmb80+DdM3CoR1KM4hmF1+8tPYYOA0j4eS\n\t6QviVQ3ShM2X19Ub8ZQrvv4l36xA18szJzD0lTOokiaNXz/yZjNVo/XACG3P58FR59DwzhECqlT\n\tXlwt98oPg7W21", "X-Received": [ "by 2002:a05:6a00:4211:b0:81f:c6d1:d167 with SMTP id\n d2e1a72fcca58-8249fdf39edmr1252050b3a.61.1770798254460;\n Wed, 11 Feb 2026 00:24:14 -0800 (PST)", "by 2002:a05:6a00:4211:b0:81f:c6d1:d167 with SMTP id\n d2e1a72fcca58-8249fdf39edmr1252015b3a.61.1770798253951;\n Wed, 11 Feb 2026 00:24:13 -0800 (PST)" ], "From": "Coiby Xu <coxu@redhat.com>", "To": "kexec@lists.infradead.org,\n\tlinux-arm-kernel@lists.infradead.org,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tdevicetree@vger.kernel.org", "Cc": "Arnaud Lefebvre <arnaud.lefebvre@clever-cloud.com>,\n\tBaoquan he <bhe@redhat.com>,\n\tDave Young <dyoung@redhat.com>,\n\tKairui Song <ryncsn@gmail.com>,\n\tPingfan Liu <kernelfans@gmail.com>,\n\tAndrew Morton <akpm@linux-foundation.org>,\n\tKrzysztof Kozlowski <krzk@kernel.org>,\n\tRob Herring <robh@kernel.org>,\n\tThomas Staudt <tstaudt@de.ibm.com>,\n\tSourabh Jain <sourabhjain@linux.ibm.com>,\n\tWill Deacon <will@kernel.org>,\n\tCatalin Marinas <catalin.marinas@arm.com>,\n\tMadhavan Srinivasan <maddy@linux.ibm.com>,\n\tMichael Ellerman <mpe@ellerman.id.au>,\n\tNicholas Piggin <npiggin@gmail.com>,\n\t\"Christophe Leroy (CS GROUP)\" <chleroy@kernel.org>,\n\tSaravana Kannan <saravanak@kernel.org>,\n\tlinux-kernel@vger.kernel.org (open list)", "Subject": "[PATCH v4 2/2] arm64,ppc64le/kdump: pass dm-crypt keys to kdump\n kernel", "Date": "Wed, 11 Feb 2026 16:24:00 +0800", "Message-ID": "<20260211082401.2407853-3-coxu@redhat.com>", "X-Mailer": "git-send-email 2.53.0", "In-Reply-To": "<20260211082401.2407853-1-coxu@redhat.com>", "References": "<20260211082401.2407853-1-coxu@redhat.com>", "X-Mailing-List": "linuxppc-dev@lists.ozlabs.org", "List-Id": "<linuxppc-dev.lists.ozlabs.org>", "List-Help": "<mailto:linuxppc-dev+help@lists.ozlabs.org>", "List-Owner": "<mailto:linuxppc-dev+owner@lists.ozlabs.org>", "List-Post": "<mailto:linuxppc-dev@lists.ozlabs.org>", "List-Archive": "<https://lore.kernel.org/linuxppc-dev/>,\n <https://lists.ozlabs.org/pipermail/linuxppc-dev/>", "List-Subscribe": "<mailto:linuxppc-dev+subscribe@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-digest@lists.ozlabs.org>,\n <mailto:linuxppc-dev+subscribe-nomail@lists.ozlabs.org>", "List-Unsubscribe": "<mailto:linuxppc-dev+unsubscribe@lists.ozlabs.org>", "Precedence": "list", "MIME-Version": "1.0", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "8_CL2mUDM6Z1zJgsLAFQD5bqEFN4wp9C2iKi0B3_qzU_1770798255", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-Spam-Status": "No, score=-0.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,\n\tDKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,\n\tRCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=disabled\n\tversion=4.0.1 OzLabs 8", "X-Spam-Checker-Version": "SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org" }, "content": "CONFIG_CRASH_DM_CRYPT has been introduced to support LUKS-encrypted\ndevice dump target by addressing two challenges [1],\n - Kdump kernel may not be able to decrypt the LUKS partition. For some\n machines, a system administrator may not have a chance to enter the\n password to decrypt the device in kdump initramfs after the 1st kernel\n crashes\n\n - LUKS2 by default use the memory-hard Argon2 key derivation function\n which is quite memory-consuming compared to the limited memory reserved\n for kdump.\n\nTo also enable this feature for ARM64 and PowerPC, we only need to add\na device tree property dmcryptkeys [2] as similar to elfcorehdr to pass\nthe memory address of the stored info of dm-crypt keys to the kdump\nkernel. Since this property is only needed by the kdump kernel, it won't\nbe exposed to user space.\n\n[1] https://lore.kernel.org/all/20250502011246.99238-1-coxu@redhat.com/\n[2] https://github.com/devicetree-org/dt-schema/pull/181\n\nCc: Arnaud Lefebvre <arnaud.lefebvre@clever-cloud.com>\nCc: Baoquan he <bhe@redhat.com>\nCc: Dave Young <dyoung@redhat.com>\nCc: Kairui Song <ryncsn@gmail.com>\nCc: Pingfan Liu <kernelfans@gmail.com>\nCc: Andrew Morton <akpm@linux-foundation.org>\nCc: Krzysztof Kozlowski <krzk@kernel.org>\nCc: Rob Herring <robh@kernel.org>\nCc: Thomas Staudt <tstaudt@de.ibm.com>\nCc: Sourabh Jain <sourabhjain@linux.ibm.com>\nCc: Will Deacon <will@kernel.org>\nSigned-off-by: Coiby Xu <coxu@redhat.com>\n---\n arch/arm64/kernel/machine_kexec_file.c | 4 ++++\n arch/powerpc/kexec/elf_64.c | 4 ++++\n drivers/of/fdt.c | 21 +++++++++++++++++++++\n drivers/of/kexec.c | 19 +++++++++++++++++++\n 4 files changed, 48 insertions(+)", "diff": "diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c\nindex 410060ebd86d..b6798bb2bb82 100644\n--- a/arch/arm64/kernel/machine_kexec_file.c\n+++ b/arch/arm64/kernel/machine_kexec_file.c\n@@ -134,6 +134,10 @@ int load_other_segments(struct kimage *image,\n \n \t\tkexec_dprintk(\"Loaded elf core header at 0x%lx bufsz=0x%lx memsz=0x%lx\\n\",\n \t\t\t image->elf_load_addr, kbuf.bufsz, kbuf.memsz);\n+\n+\t\tret = crash_load_dm_crypt_keys(image);\n+\t\tif (ret)\n+\t\t\tgoto out_err;\n \t}\n #endif\n \ndiff --git a/arch/powerpc/kexec/elf_64.c b/arch/powerpc/kexec/elf_64.c\nindex 5d6d616404cf..ea50a072debf 100644\n--- a/arch/powerpc/kexec/elf_64.c\n+++ b/arch/powerpc/kexec/elf_64.c\n@@ -79,6 +79,10 @@ static void *elf64_load(struct kimage *image, char *kernel_buf,\n \t\t\tgoto out;\n \t\t}\n \n+\t\tret = crash_load_dm_crypt_keys(image);\n+\t\tif (ret)\n+\t\t\tgoto out;\n+\n \t\t/* Setup cmdline for kdump kernel case */\n \t\tmodified_cmdline = setup_kdump_cmdline(image, cmdline,\n \t\t\t\t\t\t cmdline_len);\ndiff --git a/drivers/of/fdt.c b/drivers/of/fdt.c\nindex 331646d667b9..2967e4aff807 100644\n--- a/drivers/of/fdt.c\n+++ b/drivers/of/fdt.c\n@@ -866,6 +866,26 @@ static void __init early_init_dt_check_for_elfcorehdr(unsigned long node)\n \t\t elfcorehdr_addr, elfcorehdr_size);\n }\n \n+static void __init early_init_dt_check_for_dmcryptkeys(unsigned long node)\n+{\n+\tconst char *prop_name = \"linux,dmcryptkeys\";\n+\tconst __be32 *prop;\n+\n+\tif (!IS_ENABLED(CONFIG_CRASH_DM_CRYPT))\n+\t\treturn;\n+\n+\tpr_debug(\"Looking for dmcryptkeys property... \");\n+\n+\tprop = of_get_flat_dt_prop(node, prop_name, NULL);\n+\tif (!prop)\n+\t\treturn;\n+\n+\tdm_crypt_keys_addr = dt_mem_next_cell(dt_root_addr_cells, &prop);\n+\n+\t/* Property only accessible to crash dump kernel */\n+\tfdt_delprop(initial_boot_params, node, prop_name);\n+}\n+\n static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND;\n \n /*\n@@ -1097,6 +1117,7 @@ int __init early_init_dt_scan_chosen(char *cmdline)\n \n \tearly_init_dt_check_for_initrd(node);\n \tearly_init_dt_check_for_elfcorehdr(node);\n+\tearly_init_dt_check_for_dmcryptkeys(node);\n \n \trng_seed = of_get_flat_dt_prop(node, \"rng-seed\", &l);\n \tif (rng_seed && l > 0) {\ndiff --git a/drivers/of/kexec.c b/drivers/of/kexec.c\nindex 1ee2d31816ae..4bfb1ea5744e 100644\n--- a/drivers/of/kexec.c\n+++ b/drivers/of/kexec.c\n@@ -432,6 +432,25 @@ void *of_kexec_alloc_and_setup_fdt(const struct kimage *image,\n \t\tif (ret)\n \t\t\tgoto out;\n \n+\t\tif (image->dm_crypt_keys_addr != 0) {\n+\t\t\tret = fdt_appendprop_addrrange(fdt, 0, chosen_node,\n+\t\t\t\t\t\t \"linux,dmcryptkeys\",\n+\t\t\t\t\t\t image->dm_crypt_keys_addr,\n+\t\t\t\t\t\t image->dm_crypt_keys_sz);\n+\n+\t\t\tif (ret)\n+\t\t\t\tgoto out;\n+\n+\t\t\t/*\n+\t\t\t * Avoid dmcryptkeys from being stomped on in kdump kernel by\n+\t\t\t * setting up memory reserve map.\n+\t\t\t */\n+\t\t\tret = fdt_add_mem_rsv(fdt, image->dm_crypt_keys_addr,\n+\t\t\t\t\t image->dm_crypt_keys_sz);\n+\t\t\tif (ret)\n+\t\t\t\tgoto out;\n+\t\t}\n+\n #ifdef CONFIG_CRASH_DUMP\n \t\t/* add linux,usable-memory-range */\n \t\tret = fdt_appendprop_addrrange(fdt, 0, chosen_node,\n", "prefixes": [ "v4", "2/2" ] }