From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmk@arm.linux.org.uk (Russell King) Date: Mon, 06 Jun 2016 18:01:18 +0100 Subject: [PATCH kexec-tools v2 30/32] arm: fix type of phys_offset In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Some LPAE systems may have phys_offset above the 4GB mark. Hence, we need phys_offset to be a 64-bit integer. Reviewed-by: Pratyush Anand Signed-off-by: Russell King --- kexec/arch/arm/crashdump-arm.c | 4 ++-- kexec/arch/arm/crashdump-arm.h | 1 - kexec/arch/arm/phys_to_virt.c | 4 +++- kexec/arch/arm/phys_to_virt.h | 8 ++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 kexec/arch/arm/phys_to_virt.h diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index 2dc8846..2589582 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -33,6 +33,7 @@ #include "../../mem_regions.h" #include "crashdump-arm.h" #include "iomem.h" +#include "phys_to_virt.h" #if __BYTE_ORDER == __LITTLE_ENDIAN #define ELFDATANATIVE ELFDATA2LSB @@ -70,7 +71,6 @@ static struct crash_elf_info elf_info = { .page_offset = DEFAULT_PAGE_OFFSET, }; -unsigned long phys_offset; extern unsigned long long user_page_offset; /* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */ @@ -293,7 +293,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * region as PHYS_OFFSET. */ phys_offset = usablemem_rgns.ranges->start; - dbgprintf("phys_offset: %#lx\n", phys_offset); + dbgprintf("phys_offset: %#llx\n", phys_offset); if (get_kernel_page_offset(info, &elf_info)) return -1; diff --git a/kexec/arch/arm/crashdump-arm.h b/kexec/arch/arm/crashdump-arm.h index 7314960..6e87b13 100644 --- a/kexec/arch/arm/crashdump-arm.h +++ b/kexec/arch/arm/crashdump-arm.h @@ -16,7 +16,6 @@ extern struct memory_ranges usablemem_rgns; struct kexec_info; -extern unsigned long phys_offset; extern int load_crashdump_segments(struct kexec_info *, char *); #ifdef __cplusplus diff --git a/kexec/arch/arm/phys_to_virt.c b/kexec/arch/arm/phys_to_virt.c index c2fe2ea..46a4f68 100644 --- a/kexec/arch/arm/phys_to_virt.c +++ b/kexec/arch/arm/phys_to_virt.c @@ -1,6 +1,8 @@ #include "../../kexec.h" #include "../../crashdump.h" -#include "crashdump-arm.h" +#include "phys_to_virt.h" + +uint64_t phys_offset; /** * phys_to_virt() - translate physical address to virtual address diff --git a/kexec/arch/arm/phys_to_virt.h b/kexec/arch/arm/phys_to_virt.h new file mode 100644 index 0000000..b3147dd --- /dev/null +++ b/kexec/arch/arm/phys_to_virt.h @@ -0,0 +1,8 @@ +#ifndef PHYS_TO_VIRT_H +#define PHYS_TO_VIRT_H + +#include + +extern uint64_t phys_offset; + +#endif -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from pandora.armlinux.org.uk ([2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b9y30-0006IC-6z for kexec@lists.infradead.org; Mon, 06 Jun 2016 17:10:44 +0000 In-Reply-To: <20160606164129.GM1041@n2100.armlinux.org.uk> References: <20160606164129.GM1041@n2100.armlinux.org.uk> From: Russell King Subject: [PATCH kexec-tools v2 30/32] arm: fix type of phys_offset MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 06 Jun 2016 18:01:18 +0100 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+dwmw2=infradead.org@lists.infradead.org To: kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Pratyush Anand , Baoquan He Some LPAE systems may have phys_offset above the 4GB mark. Hence, we need phys_offset to be a 64-bit integer. Reviewed-by: Pratyush Anand Signed-off-by: Russell King --- kexec/arch/arm/crashdump-arm.c | 4 ++-- kexec/arch/arm/crashdump-arm.h | 1 - kexec/arch/arm/phys_to_virt.c | 4 +++- kexec/arch/arm/phys_to_virt.h | 8 ++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 kexec/arch/arm/phys_to_virt.h diff --git a/kexec/arch/arm/crashdump-arm.c b/kexec/arch/arm/crashdump-arm.c index 2dc8846..2589582 100644 --- a/kexec/arch/arm/crashdump-arm.c +++ b/kexec/arch/arm/crashdump-arm.c @@ -33,6 +33,7 @@ #include "../../mem_regions.h" #include "crashdump-arm.h" #include "iomem.h" +#include "phys_to_virt.h" #if __BYTE_ORDER == __LITTLE_ENDIAN #define ELFDATANATIVE ELFDATA2LSB @@ -70,7 +71,6 @@ static struct crash_elf_info elf_info = { .page_offset = DEFAULT_PAGE_OFFSET, }; -unsigned long phys_offset; extern unsigned long long user_page_offset; /* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */ @@ -293,7 +293,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline) * region as PHYS_OFFSET. */ phys_offset = usablemem_rgns.ranges->start; - dbgprintf("phys_offset: %#lx\n", phys_offset); + dbgprintf("phys_offset: %#llx\n", phys_offset); if (get_kernel_page_offset(info, &elf_info)) return -1; diff --git a/kexec/arch/arm/crashdump-arm.h b/kexec/arch/arm/crashdump-arm.h index 7314960..6e87b13 100644 --- a/kexec/arch/arm/crashdump-arm.h +++ b/kexec/arch/arm/crashdump-arm.h @@ -16,7 +16,6 @@ extern struct memory_ranges usablemem_rgns; struct kexec_info; -extern unsigned long phys_offset; extern int load_crashdump_segments(struct kexec_info *, char *); #ifdef __cplusplus diff --git a/kexec/arch/arm/phys_to_virt.c b/kexec/arch/arm/phys_to_virt.c index c2fe2ea..46a4f68 100644 --- a/kexec/arch/arm/phys_to_virt.c +++ b/kexec/arch/arm/phys_to_virt.c @@ -1,6 +1,8 @@ #include "../../kexec.h" #include "../../crashdump.h" -#include "crashdump-arm.h" +#include "phys_to_virt.h" + +uint64_t phys_offset; /** * phys_to_virt() - translate physical address to virtual address diff --git a/kexec/arch/arm/phys_to_virt.h b/kexec/arch/arm/phys_to_virt.h new file mode 100644 index 0000000..b3147dd --- /dev/null +++ b/kexec/arch/arm/phys_to_virt.h @@ -0,0 +1,8 @@ +#ifndef PHYS_TO_VIRT_H +#define PHYS_TO_VIRT_H + +#include + +extern uint64_t phys_offset; + +#endif -- 1.9.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec