From patchwork Fri Nov 14 01:22:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Levand X-Patchwork-Id: 5302351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A57F3C11AC for ; Fri, 14 Nov 2014 01:27:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6620201E4 for ; Fri, 14 Nov 2014 01:27:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F1067201C8 for ; Fri, 14 Nov 2014 01:27:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xp5dT-0006OT-GD; Fri, 14 Nov 2014 01:25:15 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xp5ac-0003Db-S2; Fri, 14 Nov 2014 01:22:18 +0000 Received: from geoff by merlin.infradead.org with local (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xp5aa-0006yk-Ag; Fri, 14 Nov 2014 01:22:16 +0000 Message-Id: <2b08174dd201077d4e7f6ec6c107650b22688723.1415926876.git.geoff@infradead.org> In-Reply-To: References: From: Geoff Levand Patch-Date: Thu, 13 Nov 2014 16:52:15 -0800 Subject: [PATCH 6/8] arm64/kexec: Add pr_devel output To: Catalin Marinas , Will Deacon Date: Fri, 14 Nov 2014 01:22:16 +0000 Cc: marc.zyngier@arm.com, Grant Likely , kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, christoffer.dall@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To aid in debugging kexec problems or when adding new functionality to kexec add a new routine kexec_image_info() and several inline pr_devel statements. Signed-off-by: Geoff Levand --- arch/arm64/kernel/machine_kexec.c | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/arm64/kernel/machine_kexec.c b/arch/arm64/kernel/machine_kexec.c index b0e5d76..775bcc3 100644 --- a/arch/arm64/kernel/machine_kexec.c +++ b/arch/arm64/kernel/machine_kexec.c @@ -35,6 +35,38 @@ static bool kexec_is_dtb(const void *dtb) } /** + * kexec_image_info - For debugging output. + */ +#define kexec_image_info(_i) _kexec_image_info(__func__, __LINE__, _i) +static void _kexec_image_info(const char *func, int line, + const struct kimage *image) +{ + unsigned long i; + +#if !defined(DEBUG) + return; +#endif + pr_devel("%s:%d:\n", func, line); + pr_devel(" kexec image info:\n"); + pr_devel(" type: %d\n", image->type); + pr_devel(" start: %lx\n", image->start); + pr_devel(" head: %lx\n", image->head); + pr_devel(" nr_segments: %lu\n", image->nr_segments); + + for (i = 0; i < image->nr_segments; i++) { + pr_devel(" segment[%lu]: %016lx - %016lx, " + "%lx bytes, %lu pages%s\n", + i, + image->segment[i].mem, + image->segment[i].mem + image->segment[i].memsz, + image->segment[i].memsz, + image->segment[i].memsz / PAGE_SIZE, + (kexec_is_dtb(image->segment[i].buf) ? + ", dtb segment" : "")); + } +} + +/** * kexec_find_dtb_seg - Helper routine to find the dtb segment. */ static const struct kexec_segment *kexec_find_dtb_seg( @@ -67,6 +99,8 @@ int machine_kexec_prepare(struct kimage *image) arm64_kexec_dtb_addr = dtb_seg ? dtb_seg->mem : 0; arm64_kexec_kimage_start = image->start; + kexec_image_info(image); + return 0; } @@ -121,6 +155,27 @@ void machine_kexec(struct kimage *image) reboot_code_buffer_phys = page_to_phys(image->control_code_page); reboot_code_buffer = phys_to_virt(reboot_code_buffer_phys); + kexec_image_info(image); + + pr_devel("%s:%d: control_code_page: %p\n", __func__, __LINE__, + image->control_code_page); + pr_devel("%s:%d: reboot_code_buffer_phys: %pa\n", __func__, __LINE__, + &reboot_code_buffer_phys); + pr_devel("%s:%d: reboot_code_buffer: %p\n", __func__, __LINE__, + reboot_code_buffer); + pr_devel("%s:%d: relocate_new_kernel: %p\n", __func__, __LINE__, + relocate_new_kernel); + pr_devel("%s:%d: relocate_new_kernel_size: 0x%lx(%lu) bytes\n", + __func__, __LINE__, relocate_new_kernel_size, + relocate_new_kernel_size); + + pr_devel("%s:%d: kexec_dtb_addr: %lx\n", __func__, __LINE__, + arm64_kexec_dtb_addr); + pr_devel("%s:%d: kexec_kimage_head: %lx\n", __func__, __LINE__, + arm64_kexec_kimage_head); + pr_devel("%s:%d: kexec_kimage_start: %lx\n", __func__, __LINE__, + arm64_kexec_kimage_start); + /* * Copy relocate_new_kernel to the reboot_code_buffer for use * after the kernel is shut down.