From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92A50C4725D for ; Fri, 19 Jan 2024 14:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=m/X0tYI04icLsaYIeAELHQy4WlvOOSipLe8hWJBViyU=; b=owAvGhjYmZEMzQ nQM24eWNW7ZpNw6Dr8BwXdbuMNvuBVPB72k3/wc78p9cEeMxz3rAAGl8i7Sj4B961v9Q2P0LKLIa2 a0UpYdpGe7winssdxw5+Wd6FLEscAL+3cjzyHO6qNFeZPTxJyMZhKhPEjJVLNe75a62BCpPCwv9bX 5MSsldAdGJixveTPB5axtnezpilJE8Pv8DjrNtbgAs26nHFrRIG/CgTf30FMGhzXYZnKHIsRkwXJT FNHwI4A/XrUbL0LtAqZ89wSKixVqGUU1cGNNlgGTwpkqCS5h336S2LUim2DNiF/wzTCCPS2EpH8Mq 2a/5Nr9LR8GnmY5KK47A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQqGt-005ugD-33; Fri, 19 Jan 2024 14:55:03 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rQqGk-005uWA-0C for kexec@bombadil.infradead.org; Fri, 19 Jan 2024 14:54:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:Content-type :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=CzEBAOFW13qp4KHc8tiUTZOfgP X9NmIUmw1EOvaCs1dA/WyqGCotIqcpCwt8VcFnARDJTkKmlfORMWjBp1jiaKIldEntJIWV8hPNZIe h9mD5b9fK9WklDVwjBlSxsoAlRa0bn9brTBbqBxn3z6CIURtVhoNxmIoIHkExcCo9cueLCpRAYIwE YHQDiefQLf6DUJ/fEzUmlPDnzQW1EQU6jl/6Esgi5k/DnIr1MyzvFjyHC0CCQfBbKPu6nD4bRZQ+Z ChTXtGVZC4/CdjpGBGMIafew3Fx1P1AzDUp551fivZsvNH3isHjPX/LVhveBaWIpmogBfPBWVZaeC SKNwNtfg==; Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rQqGa-00000001cUk-3eAW for kexec@lists.infradead.org; Fri, 19 Jan 2024 14:54:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705676083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=ORzIrdUDBWYLF9AqgtgaMPMQ9Yhp3mVzOU1mE7ijFBU4mEE6PX5aOme9tVYAg5Siolf+DC lOttDUw+hps91o/Bqvzr0KQDw3kBflN2GN/O2/0KbeEmIBUzTfg1NjtKnpIFeQxGHJjTbU 2XML8XKPwkIvPhJDfCnfmlPNsYUcK04= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705676083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=ORzIrdUDBWYLF9AqgtgaMPMQ9Yhp3mVzOU1mE7ijFBU4mEE6PX5aOme9tVYAg5Siolf+DC lOttDUw+hps91o/Bqvzr0KQDw3kBflN2GN/O2/0KbeEmIBUzTfg1NjtKnpIFeQxGHJjTbU 2XML8XKPwkIvPhJDfCnfmlPNsYUcK04= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-osoDulHkOveZzpDk9NGWvg-1; Fri, 19 Jan 2024 09:54:38 -0500 X-MC-Unique: osoDulHkOveZzpDk9NGWvg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12C54868A02; Fri, 19 Jan 2024 14:54:37 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBA8251D5; Fri, 19 Jan 2024 14:54:30 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: kexec@lists.infradead.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-mips@vger.kernel.org, linux-riscv@lists.infradead.org, loongarch@lists.linux.dev, akpm@linux-foundation.org, ebiederm@xmission.com, hbathini@linux.ibm.com, piliu@redhat.com, viro@zeniv.linux.org.uk, Baoquan He Subject: [PATCH v2 14/14] loongarch, crash: wrap crash dumping code into crash related ifdefs Date: Fri, 19 Jan 2024 22:52:41 +0800 Message-ID: <20240119145241.769622-15-bhe@redhat.com> In-Reply-To: <20240119145241.769622-1-bhe@redhat.com> References: <20240119145241.769622-1-bhe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240119_145446_428310_D149C64B X-CRM114-Status: UNSURE ( 9.49 ) X-CRM114-Notice: Please train this message. X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org Now crash codes under kernel/ folder has been split out from kexec code, crash dumping can be separated from kexec reboot in config items on loongarch with some adjustments. Here wrap up crash dumping codes with CONFIG_CRASH_DUMP ifdeffery, and use IS_ENABLED(CONFIG_CRASH_RESERVE) check to decide if compiling in the crashkernel reservation code. Signed-off-by: Baoquan He --- arch/loongarch/kernel/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index d183a745fb85..61f88dd97947 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -258,11 +258,13 @@ static void __init arch_reserve_vmcore(void) static void __init arch_parse_crashkernel(void) { -#ifdef CONFIG_KEXEC int ret; unsigned long long total_mem; unsigned long long crash_base, crash_size; + if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) + return; + total_mem = memblock_phys_mem_size(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base, @@ -283,7 +285,6 @@ static void __init arch_parse_crashkernel(void) crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; -#endif } static void __init fdt_setup(void) @@ -468,7 +469,7 @@ static void __init resource_init(void) request_resource(res, &bss_resource); } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_CRASH_RESERVE if (crashk_res.start < crashk_res.end) { insert_resource(&iomem_resource, &crashk_res); pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n", -- 2.41.0 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 603F354FA5 for ; Fri, 19 Jan 2024 14:54:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705676086; cv=none; b=NV8fedw3RjSXryppqpEFdG+JWg5TnKLdFG+btbjsKHXsfVmmR7ih3lSAG10R6wFP8caiPtJ5dJeDHHilKOjYvMG+O+itbE9xupdnv1FbvrAziw6XBsQxm+8Ncrv00YipIAZnYiiYOjoGmThF1AR210NX7ny/bVlQKqeR7Isug7w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705676086; c=relaxed/simple; bh=OUjhJFF9q7D4YR1pSHqAvZMEA4AEazo/hcoLLBgzWxI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=g8T7alEzH6T1pu8ab8RmFQ3SKGtnvCHl76eCFzYOT6tC30b2HxCoiNLF8VMVBQNS5GwMc1rr8v9W2GMpB7oIGvB2oidtTtmbUMsSCBxC/IQGidzvZMx+EBHP58nhaFK3ZHX3BcjK3izaRMQ1gensEKtJGQyPBBWIm/IEot/JBYQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=H2+jInUI; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="H2+jInUI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705676084; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=H2+jInUIj+zICM22D2UZGIWa3MpvisdF0A3+BwqGaxhzaL1ETyD0rBDgXq28mIgQgaxEnL sG8i78vjnG5189DXWW43wUyeTbS1FhMt0gq4cHqzp/rDkul3+HD7auVq4Wha8z2nSwMZ8U nkxtn9SUGD3EsXI43DlRDlTx8dVJxVk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-osoDulHkOveZzpDk9NGWvg-1; Fri, 19 Jan 2024 09:54:38 -0500 X-MC-Unique: osoDulHkOveZzpDk9NGWvg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12C54868A02; Fri, 19 Jan 2024 14:54:37 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBA8251D5; Fri, 19 Jan 2024 14:54:30 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: kexec@lists.infradead.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-mips@vger.kernel.org, linux-riscv@lists.infradead.org, loongarch@lists.linux.dev, akpm@linux-foundation.org, ebiederm@xmission.com, hbathini@linux.ibm.com, piliu@redhat.com, viro@zeniv.linux.org.uk, Baoquan He Subject: [PATCH v2 14/14] loongarch, crash: wrap crash dumping code into crash related ifdefs Date: Fri, 19 Jan 2024 22:52:41 +0800 Message-ID: <20240119145241.769622-15-bhe@redhat.com> In-Reply-To: <20240119145241.769622-1-bhe@redhat.com> References: <20240119145241.769622-1-bhe@redhat.com> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Now crash codes under kernel/ folder has been split out from kexec code, crash dumping can be separated from kexec reboot in config items on loongarch with some adjustments. Here wrap up crash dumping codes with CONFIG_CRASH_DUMP ifdeffery, and use IS_ENABLED(CONFIG_CRASH_RESERVE) check to decide if compiling in the crashkernel reservation code. Signed-off-by: Baoquan He --- arch/loongarch/kernel/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index d183a745fb85..61f88dd97947 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -258,11 +258,13 @@ static void __init arch_reserve_vmcore(void) static void __init arch_parse_crashkernel(void) { -#ifdef CONFIG_KEXEC int ret; unsigned long long total_mem; unsigned long long crash_base, crash_size; + if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) + return; + total_mem = memblock_phys_mem_size(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base, @@ -283,7 +285,6 @@ static void __init arch_parse_crashkernel(void) crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; -#endif } static void __init fdt_setup(void) @@ -468,7 +469,7 @@ static void __init resource_init(void) request_resource(res, &bss_resource); } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_CRASH_RESERVE if (crashk_res.start < crashk_res.end) { insert_resource(&iomem_resource, &crashk_res); pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n", -- 2.41.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9C42FC47DAF for ; Fri, 19 Jan 2024 14:55:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=61tIRM7BauN+V/BV8cxyVZVyQzbO4IDtbKbJLCs6BxM=; b=0sG1SbEimyhM/X I9J2M1GXPNCJyPMBoM3i+TRL3nxKOOTbTvMhECXfhFVLqXeasO2hldZ8yBkbEAPOtLgfbg5Xc+KSy keTbXt4rk+Zj0YFluFcX1c2vWY483eQoXMFuppQKuAhHV+pL2JeZtsO15D/Egzp3JmoN4CX/KtK4m VqyAf5gLCywEQNbZSrxfmvwVPC3jzeipp5/TtKL7xJjcAh0FTqKsa6ztvvKzX7eCBhGmIyax4G491 o0sin44xzB9xoIFLU7fKl09pqo1CVRyrBhRUqdDwbP75C/v2yMQ1lCXCM9U6SEZ3aAc9H+YmvNCBT HTaxnvW22r4+vZOkskQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQqGo-005ub3-2O; Fri, 19 Jan 2024 14:54:58 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rQqGZ-005uMB-03 for linux-riscv@lists.infradead.org; Fri, 19 Jan 2024 14:54:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705676081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=AnmkdkQiYVCCYD+Hsc2i83b4MO211wqNi4AC/Ld0g3I68hjuNb9dKuZN5NDC9CXtNrm9YI HoXK7Ps2hPy8/r7tyDeAi3K/ib4/3EOqkalo4B7YwoSMDbopXEeU9d8AWhIkUgz51L/NaD 5upeA4dRa7UgzSe/77HHrv4s3GcnmHA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-osoDulHkOveZzpDk9NGWvg-1; Fri, 19 Jan 2024 09:54:38 -0500 X-MC-Unique: osoDulHkOveZzpDk9NGWvg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12C54868A02; Fri, 19 Jan 2024 14:54:37 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBA8251D5; Fri, 19 Jan 2024 14:54:30 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: kexec@lists.infradead.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-mips@vger.kernel.org, linux-riscv@lists.infradead.org, loongarch@lists.linux.dev, akpm@linux-foundation.org, ebiederm@xmission.com, hbathini@linux.ibm.com, piliu@redhat.com, viro@zeniv.linux.org.uk, Baoquan He Subject: [PATCH v2 14/14] loongarch, crash: wrap crash dumping code into crash related ifdefs Date: Fri, 19 Jan 2024 22:52:41 +0800 Message-ID: <20240119145241.769622-15-bhe@redhat.com> In-Reply-To: <20240119145241.769622-1-bhe@redhat.com> References: <20240119145241.769622-1-bhe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240119_065443_179246_32BE008C X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Now crash codes under kernel/ folder has been split out from kexec code, crash dumping can be separated from kexec reboot in config items on loongarch with some adjustments. Here wrap up crash dumping codes with CONFIG_CRASH_DUMP ifdeffery, and use IS_ENABLED(CONFIG_CRASH_RESERVE) check to decide if compiling in the crashkernel reservation code. Signed-off-by: Baoquan He --- arch/loongarch/kernel/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index d183a745fb85..61f88dd97947 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -258,11 +258,13 @@ static void __init arch_reserve_vmcore(void) static void __init arch_parse_crashkernel(void) { -#ifdef CONFIG_KEXEC int ret; unsigned long long total_mem; unsigned long long crash_base, crash_size; + if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) + return; + total_mem = memblock_phys_mem_size(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base, @@ -283,7 +285,6 @@ static void __init arch_parse_crashkernel(void) crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; -#endif } static void __init fdt_setup(void) @@ -468,7 +469,7 @@ static void __init resource_init(void) request_resource(res, &bss_resource); } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_CRASH_RESERVE if (crashk_res.start < crashk_res.end) { insert_resource(&iomem_resource, &crashk_res); pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n", -- 2.41.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BCCD2C4725D for ; Fri, 19 Jan 2024 15:05:36 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=glTwoKh6; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=glTwoKh6; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4TGjbg2vvsz3vsd for ; Sat, 20 Jan 2024 02:05:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=glTwoKh6; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=glTwoKh6; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=bhe@redhat.com; receiver=lists.ozlabs.org) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4TGjMC3sjgz3cNV for ; Sat, 20 Jan 2024 01:54:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705676085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=glTwoKh6UQIx7ulLHvzWmPsB7DFjRg1r6qcFqqWFcyeGfPveGkdrRBfJkfZwNBT7mP096b EsEsDajuIC7wS0ascF7OHX8ULufDb9IPLT0Sd4ebm/NY0UO7hirqDqGl1hTl2F+si6UZos POD+1aVJ+BytImAWaZea0v5AlA07stU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705676085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=glTwoKh6UQIx7ulLHvzWmPsB7DFjRg1r6qcFqqWFcyeGfPveGkdrRBfJkfZwNBT7mP096b EsEsDajuIC7wS0ascF7OHX8ULufDb9IPLT0Sd4ebm/NY0UO7hirqDqGl1hTl2F+si6UZos POD+1aVJ+BytImAWaZea0v5AlA07stU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-osoDulHkOveZzpDk9NGWvg-1; Fri, 19 Jan 2024 09:54:38 -0500 X-MC-Unique: osoDulHkOveZzpDk9NGWvg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12C54868A02; Fri, 19 Jan 2024 14:54:37 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBA8251D5; Fri, 19 Jan 2024 14:54:30 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Subject: [PATCH v2 14/14] loongarch, crash: wrap crash dumping code into crash related ifdefs Date: Fri, 19 Jan 2024 22:52:41 +0800 Message-ID: <20240119145241.769622-15-bhe@redhat.com> In-Reply-To: <20240119145241.769622-1-bhe@redhat.com> References: <20240119145241.769622-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-s390@vger.kernel.org, Baoquan He , piliu@redhat.com, linux-sh@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-mips@vger.kernel.org, ebiederm@xmission.com, loongarch@lists.linux.dev, hbathini@linux.ibm.com, linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org, viro@zeniv.linux.org.uk Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Now crash codes under kernel/ folder has been split out from kexec code, crash dumping can be separated from kexec reboot in config items on loongarch with some adjustments. Here wrap up crash dumping codes with CONFIG_CRASH_DUMP ifdeffery, and use IS_ENABLED(CONFIG_CRASH_RESERVE) check to decide if compiling in the crashkernel reservation code. Signed-off-by: Baoquan He --- arch/loongarch/kernel/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index d183a745fb85..61f88dd97947 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -258,11 +258,13 @@ static void __init arch_reserve_vmcore(void) static void __init arch_parse_crashkernel(void) { -#ifdef CONFIG_KEXEC int ret; unsigned long long total_mem; unsigned long long crash_base, crash_size; + if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) + return; + total_mem = memblock_phys_mem_size(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base, @@ -283,7 +285,6 @@ static void __init arch_parse_crashkernel(void) crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; -#endif } static void __init fdt_setup(void) @@ -468,7 +469,7 @@ static void __init resource_init(void) request_resource(res, &bss_resource); } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_CRASH_RESERVE if (crashk_res.start < crashk_res.end) { insert_resource(&iomem_resource, &crashk_res); pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n", -- 2.41.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10B28C47DD7 for ; Fri, 19 Jan 2024 14:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7tLr/f1Vm5NJVaAV5AbzFBRo7em5pYmJ1z0qkOZcvO8=; b=VTbBQ9XaALAiHZ 4258i2FXkieJiNkT3/IPUDjXVYYDwqA2Py6/c1ZP1QQJLApJynwvz5tOyr4M6oD0RrEI/m81sN9NK aGNLjJrHlFQFJ2kQawFEA2Y61NQNsIP5zVWjiSrW4P0/vNVWLDWZ7ETv56nkeluQaEJ5Ce9N4ZSWL V0gKiyY9Vcw8MhwmtKHdHslNUNB2W38l4OFca2QZD6s/y3qAwZ6xiCluAaRsARCoyIEz1qNy24pYT naxRo71SDpAsRnUbDEwViVWzP7zzvtIXs4ugLPsIo7M8MePFagYputLAYbSUFHUOPo2wXs8TTOxvR qchSChCq8Pti1/EZ0ElA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQqGk-005uXS-3D; Fri, 19 Jan 2024 14:54:55 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rQqGY-005uMA-1c for linux-arm-kernel@lists.infradead.org; Fri, 19 Jan 2024 14:54:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705676081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jDvYJxBJvZegSwo4Kk9zAYMdDY4WlX7FhACBVJ8AwnU=; b=AnmkdkQiYVCCYD+Hsc2i83b4MO211wqNi4AC/Ld0g3I68hjuNb9dKuZN5NDC9CXtNrm9YI HoXK7Ps2hPy8/r7tyDeAi3K/ib4/3EOqkalo4B7YwoSMDbopXEeU9d8AWhIkUgz51L/NaD 5upeA4dRa7UgzSe/77HHrv4s3GcnmHA= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-osoDulHkOveZzpDk9NGWvg-1; Fri, 19 Jan 2024 09:54:38 -0500 X-MC-Unique: osoDulHkOveZzpDk9NGWvg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12C54868A02; Fri, 19 Jan 2024 14:54:37 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.116.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBA8251D5; Fri, 19 Jan 2024 14:54:30 +0000 (UTC) From: Baoquan He To: linux-kernel@vger.kernel.org Cc: kexec@lists.infradead.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-mips@vger.kernel.org, linux-riscv@lists.infradead.org, loongarch@lists.linux.dev, akpm@linux-foundation.org, ebiederm@xmission.com, hbathini@linux.ibm.com, piliu@redhat.com, viro@zeniv.linux.org.uk, Baoquan He Subject: [PATCH v2 14/14] loongarch, crash: wrap crash dumping code into crash related ifdefs Date: Fri, 19 Jan 2024 22:52:41 +0800 Message-ID: <20240119145241.769622-15-bhe@redhat.com> In-Reply-To: <20240119145241.769622-1-bhe@redhat.com> References: <20240119145241.769622-1-bhe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240119_065442_617653_048DE2CB X-CRM114-Status: GOOD ( 10.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now crash codes under kernel/ folder has been split out from kexec code, crash dumping can be separated from kexec reboot in config items on loongarch with some adjustments. Here wrap up crash dumping codes with CONFIG_CRASH_DUMP ifdeffery, and use IS_ENABLED(CONFIG_CRASH_RESERVE) check to decide if compiling in the crashkernel reservation code. Signed-off-by: Baoquan He --- arch/loongarch/kernel/setup.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c index d183a745fb85..61f88dd97947 100644 --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -258,11 +258,13 @@ static void __init arch_reserve_vmcore(void) static void __init arch_parse_crashkernel(void) { -#ifdef CONFIG_KEXEC int ret; unsigned long long total_mem; unsigned long long crash_base, crash_size; + if (!IS_ENABLED(CONFIG_CRASH_RESERVE)) + return; + total_mem = memblock_phys_mem_size(); ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base, @@ -283,7 +285,6 @@ static void __init arch_parse_crashkernel(void) crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; -#endif } static void __init fdt_setup(void) @@ -468,7 +469,7 @@ static void __init resource_init(void) request_resource(res, &bss_resource); } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_CRASH_RESERVE if (crashk_res.start < crashk_res.end) { insert_resource(&iomem_resource, &crashk_res); pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n", -- 2.41.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel