* [PATCH v1 0/3][makedumpfile]Add support for PPC32
@ 2012-01-18 10:07 Suzuki K. Poulose
2012-01-18 10:09 ` [PATCH v1 1/3] [makedumpfile] Support for cross building Suzuki K. Poulose
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Suzuki K. Poulose @ 2012-01-18 10:07 UTC (permalink / raw)
To: tachibana, usui; +Cc: kexec
The following series implements makedumpfile support for PPC32.
The implementation is heavily based on PPC64. This also introduces
cross build support which is required for Embedded PPC Boards.
---
Suzuki K. Poulose (3):
[makedumpfile] Add support for PPC32
[ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64
[makedumpfile] Support building for cross build
Makefile | 26 ++++++++++++--
README | 5 +++
arch/ppc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
makedumpfile.c | 4 +-
makedumpfile.h | 28 +++++++++++++---
5 files changed, 153 insertions(+), 11 deletions(-)
create mode 100644 arch/ppc.c
--
Suzuki Poulose
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v1 1/3] [makedumpfile] Support for cross building 2012-01-18 10:07 [PATCH v1 0/3][makedumpfile]Add support for PPC32 Suzuki K. Poulose @ 2012-01-18 10:09 ` Suzuki K. Poulose 2012-02-10 9:42 ` Atsushi Kumagai 2012-01-18 10:09 ` [PATCH v1 2/3][makedumpfile][ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 Suzuki K. Poulose ` (2 subsequent siblings) 3 siblings, 1 reply; 12+ messages in thread From: Suzuki K. Poulose @ 2012-01-18 10:09 UTC (permalink / raw) To: tachibana, usui; +Cc: kexec Support cross building of makedumpfile. This would be useful for building the makedumpfile for embedded PPC boards. Support for PPC32 would be added in the later patches. Use TARGET variable to set the arch to build for. Also honour the value of CC if set. Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> --- Makefile | 12 +++++++++++- README | 5 +++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 9afbe1c..174a0d9 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,11 @@ VERSION=1.4.1 DATE=6 January 2012 +# Honour the environment variable CC +ifeq ($(strip $CC),) CC = gcc +endif + CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"' @@ -11,7 +15,13 @@ CFLAGS_ARCH = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # LDFLAGS = -L/usr/local/lib -I/usr/local/include -ARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ +# Use TARGET as the target architecture if specified. +# Defaults to uname -m +ifeq ($(strip($TARGET)),) +TARGET := $(shell uname -m) +endif + +ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -e s/ppc64/powerpc/ ) diff --git a/README b/README index 8aa4ab3..595b446 100644 --- a/README +++ b/README @@ -37,6 +37,11 @@ # cd makedumpfile-x.y.z 4.Build, and install: # make; make install + 5.Build for a different architecture than the host : + # make TARGET=<arch> ; make install + where <arch> is the 'uname -m' of the target architecture. + The user has to set the environment variable CC to appropriate + compiler for the target architecture. * SUPPORTED KERNELS This makedumpfile supports the following kernels. _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v1 1/3] [makedumpfile] Support for cross building 2012-01-18 10:09 ` [PATCH v1 1/3] [makedumpfile] Support for cross building Suzuki K. Poulose @ 2012-02-10 9:42 ` Atsushi Kumagai 0 siblings, 0 replies; 12+ messages in thread From: Atsushi Kumagai @ 2012-02-10 9:42 UTC (permalink / raw) To: suzuki; +Cc: kexec, tachibana, usui Hi, Suzuki On Wed, 18 Jan 2012 15:39:14 +0530 "Suzuki K. Poulose" <suzuki@in.ibm.com> wrote: > Support cross building of makedumpfile. This would be useful for building > the makedumpfile for embedded PPC boards. Support for PPC32 would be added > in the later patches. > > Use TARGET variable to set the arch to build for. Also honour the value of > CC if set. > > Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> > --- > > Makefile | 12 +++++++++++- > README | 5 +++++ > 2 files changed, 16 insertions(+), 1 deletions(-) This patch looks good. I will merge it to makedumpfile-1.4.3. Thanks Atsushi Kumagai > Support cross building of makedumpfile. This would be useful for building > the makedumpfile for embedded PPC boards. Support for PPC32 would be added > in the later patches. > > Use TARGET variable to set the arch to build for. Also honour the value of > CC if set. > > Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> > --- > > Makefile | 12 +++++++++++- > README | 5 +++++ > 2 files changed, 16 insertions(+), 1 deletions(-) > > diff --git a/Makefile b/Makefile > index 9afbe1c..174a0d9 100644 > --- a/Makefile > +++ b/Makefile > @@ -3,7 +3,11 @@ > VERSION=1.4.1 > DATE=6 January 2012 > > +# Honour the environment variable CC > +ifeq ($(strip $CC),) > CC = gcc > +endif > + > CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ > -DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(DATE)"' > @@ -11,7 +15,13 @@ CFLAGS_ARCH = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ > -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE > # LDFLAGS = -L/usr/local/lib -I/usr/local/include > > -ARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ > +# Use TARGET as the target architecture if specified. > +# Defaults to uname -m > +ifeq ($(strip($TARGET)),) > +TARGET := $(shell uname -m) > +endif > + > +ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ > -e s/arm.*/arm/ -e s/sa110/arm/ \ > -e s/s390x/s390/ -e s/parisc64/parisc/ \ > -e s/ppc64/powerpc/ ) > diff --git a/README b/README > index 8aa4ab3..595b446 100644 > --- a/README > +++ b/README > @@ -37,6 +37,11 @@ > # cd makedumpfile-x.y.z > 4.Build, and install: > # make; make install > + 5.Build for a different architecture than the host : > + # make TARGET=<arch> ; make install > + where <arch> is the 'uname -m' of the target architecture. > + The user has to set the environment variable CC to appropriate > + compiler for the target architecture. > > * SUPPORTED KERNELS > This makedumpfile supports the following kernels. > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v1 2/3][makedumpfile][ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 2012-01-18 10:07 [PATCH v1 0/3][makedumpfile]Add support for PPC32 Suzuki K. Poulose 2012-01-18 10:09 ` [PATCH v1 1/3] [makedumpfile] Support for cross building Suzuki K. Poulose @ 2012-01-18 10:09 ` Suzuki K. Poulose 2012-02-10 9:44 ` Atsushi Kumagai 2012-01-18 10:10 ` [PATCH v1 3/3] [makedumpfile] Add support for PPC32 Suzuki K. Poulose 2012-01-19 2:58 ` [PATCH v1 0/3][makedumpfile]Add " Atsushi Kumagai 3 siblings, 1 reply; 12+ messages in thread From: Suzuki K. Poulose @ 2012-01-18 10:09 UTC (permalink / raw) To: tachibana, usui; +Cc: kexec Makedumpfile uses __powerpc__ as the value of ARCH to control the PPC64 specfic definitions. Rename this to __powerpc64__ for a better readability of the code as the support for ppc32 will be introduced in the later series. We could use __powerpc32__ for PPC32. Signed-off-by: Suzuki Poulose <suzuki@in.ibm.com> --- Makefile | 5 +++-- makedumpfile.c | 2 +- makedumpfile.h | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 174a0d9..04e267f 100644 --- a/Makefile +++ b/Makefile @@ -24,11 +24,12 @@ endif ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc64/powerpc/ ) + -e s/ppc64/powerpc64/ ) + CFLAGS += -D__$(ARCH)__ CFLAGS_ARCH += -D__$(ARCH)__ -ifeq ($(ARCH), powerpc) +ifeq ($(ARCH), powerpc64) CFLAGS += -m64 CFLAGS_ARCH += -m64 endif diff --git a/makedumpfile.c b/makedumpfile.c index c51fda3..101f8b5 100644 --- a/makedumpfile.c +++ b/makedumpfile.c @@ -5691,7 +5691,7 @@ initial_xen(void) off_t offset; unsigned long size; -#ifdef __powerpc__ +#ifdef __powerpc64__ MSG("\n"); MSG("ppc64 xen is not supported.\n"); return FALSE; diff --git a/makedumpfile.h b/makedumpfile.h index 4b4a58b..efa325f 100644 --- a/makedumpfile.h +++ b/makedumpfile.h @@ -521,7 +521,7 @@ do { \ #endif /* x86_64 */ -#ifdef __powerpc__ +#ifdef __powerpc64__ #define __PAGE_OFFSET (0xc000000000000000) #define KERNELBASE PAGE_OFFSET #define VMALLOCBASE (0xD000000000000000) @@ -658,14 +658,14 @@ unsigned long long vaddr_to_paddr_x86_64(unsigned long vaddr); #define vaddr_to_paddr(X) vaddr_to_paddr_x86_64(X) #endif /* x86_64 */ -#ifdef __powerpc__ /* powerpc */ +#ifdef __powerpc64__ /* powerpc64 */ int get_machdep_info_ppc64(void); unsigned long long vaddr_to_paddr_ppc64(unsigned long vaddr); #define get_phys_base() TRUE #define get_machdep_info() get_machdep_info_ppc64() #define get_versiondep_info() TRUE #define vaddr_to_paddr(X) vaddr_to_paddr_ppc64(X) -#endif /* powerpc */ +#endif /* powerpc64 */ #ifdef __s390x__ /* s390x */ int get_machdep_info_s390x(void); @@ -1332,10 +1332,10 @@ int get_xen_info_ia64(void); #endif /* __ia64 */ -#ifdef __powerpc__ /* powerpc */ +#ifdef __powerpc64__ /* powerpc64 */ #define kvtop_xen(X) FALSE #define get_xen_info_arch(X) FALSE -#endif /* powerpc */ +#endif /* powerpc64 */ #ifdef __s390x__ /* s390x */ #define kvtop_xen(X) FALSE _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v1 2/3][makedumpfile][ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 2012-01-18 10:09 ` [PATCH v1 2/3][makedumpfile][ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 Suzuki K. Poulose @ 2012-02-10 9:44 ` Atsushi Kumagai 0 siblings, 0 replies; 12+ messages in thread From: Atsushi Kumagai @ 2012-02-10 9:44 UTC (permalink / raw) To: suzuki; +Cc: kexec, tachibana, usui Hi, Suzuki On Wed, 18 Jan 2012 15:39:44 +0530 "Suzuki K. Poulose" <suzuki@in.ibm.com> wrote: > Makedumpfile uses __powerpc__ as the value of ARCH to control the PPC64 > specfic definitions. Rename this to __powerpc64__ for a better readability > of the code as the support for ppc32 will be introduced in the later series. > We could use __powerpc32__ for PPC32. > > Signed-off-by: Suzuki Poulose <suzuki@in.ibm.com> > --- > > Makefile | 5 +++-- > makedumpfile.c | 2 +- > makedumpfile.h | 10 +++++----- > 3 files changed, 9 insertions(+), 8 deletions(-) I will make small changes to your patch: --- a/arch/ppc64.c +++ b/arch/ppc64.c @@ -18,7 +18,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef __powerpc__ +#ifdef __powerpc64__ #include "../print_info.h" #include "../elf_info.h" @@ -93,4 +93,4 @@ vaddr_to_paddr_ppc64(unsigned long vaddr) return NOT_PADDR; } -#endif /* powerpc */ +#endif /* powerpc64 */ The other parts looks good. I will merge this patch to makedumpfile-1.4.3. Thanks Atsushi Kumagai > diff --git a/Makefile b/Makefile > index 174a0d9..04e267f 100644 > --- a/Makefile > +++ b/Makefile > @@ -24,11 +24,12 @@ endif > ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ > -e s/arm.*/arm/ -e s/sa110/arm/ \ > -e s/s390x/s390/ -e s/parisc64/parisc/ \ > - -e s/ppc64/powerpc/ ) > + -e s/ppc64/powerpc64/ ) > + > CFLAGS += -D__$(ARCH)__ > CFLAGS_ARCH += -D__$(ARCH)__ > > -ifeq ($(ARCH), powerpc) > +ifeq ($(ARCH), powerpc64) > CFLAGS += -m64 > CFLAGS_ARCH += -m64 > endif > diff --git a/makedumpfile.c b/makedumpfile.c > index c51fda3..101f8b5 100644 > --- a/makedumpfile.c > +++ b/makedumpfile.c > @@ -5691,7 +5691,7 @@ initial_xen(void) > off_t offset; > unsigned long size; > > -#ifdef __powerpc__ > +#ifdef __powerpc64__ > MSG("\n"); > MSG("ppc64 xen is not supported.\n"); > return FALSE; > diff --git a/makedumpfile.h b/makedumpfile.h > index 4b4a58b..efa325f 100644 > --- a/makedumpfile.h > +++ b/makedumpfile.h > @@ -521,7 +521,7 @@ do { \ > > #endif /* x86_64 */ > > -#ifdef __powerpc__ > +#ifdef __powerpc64__ > #define __PAGE_OFFSET (0xc000000000000000) > #define KERNELBASE PAGE_OFFSET > #define VMALLOCBASE (0xD000000000000000) > @@ -658,14 +658,14 @@ unsigned long long vaddr_to_paddr_x86_64(unsigned long vaddr); > #define vaddr_to_paddr(X) vaddr_to_paddr_x86_64(X) > #endif /* x86_64 */ > > -#ifdef __powerpc__ /* powerpc */ > +#ifdef __powerpc64__ /* powerpc64 */ > int get_machdep_info_ppc64(void); > unsigned long long vaddr_to_paddr_ppc64(unsigned long vaddr); > #define get_phys_base() TRUE > #define get_machdep_info() get_machdep_info_ppc64() > #define get_versiondep_info() TRUE > #define vaddr_to_paddr(X) vaddr_to_paddr_ppc64(X) > -#endif /* powerpc */ > +#endif /* powerpc64 */ > > #ifdef __s390x__ /* s390x */ > int get_machdep_info_s390x(void); > @@ -1332,10 +1332,10 @@ int get_xen_info_ia64(void); > > #endif /* __ia64 */ > > -#ifdef __powerpc__ /* powerpc */ > +#ifdef __powerpc64__ /* powerpc64 */ > #define kvtop_xen(X) FALSE > #define get_xen_info_arch(X) FALSE > -#endif /* powerpc */ > +#endif /* powerpc64 */ > > #ifdef __s390x__ /* s390x */ > #define kvtop_xen(X) FALSE > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v1 3/3] [makedumpfile] Add support for PPC32 2012-01-18 10:07 [PATCH v1 0/3][makedumpfile]Add support for PPC32 Suzuki K. Poulose 2012-01-18 10:09 ` [PATCH v1 1/3] [makedumpfile] Support for cross building Suzuki K. Poulose 2012-01-18 10:09 ` [PATCH v1 2/3][makedumpfile][ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 Suzuki K. Poulose @ 2012-01-18 10:10 ` Suzuki K. Poulose 2012-02-10 9:45 ` Atsushi Kumagai 2012-01-19 2:58 ` [PATCH v1 0/3][makedumpfile]Add " Atsushi Kumagai 3 siblings, 1 reply; 12+ messages in thread From: Suzuki K. Poulose @ 2012-01-18 10:10 UTC (permalink / raw) To: tachibana, usui; +Cc: kexec Mostly a copy of ppc64 with renaming to _ppc variants. Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> --- Makefile | 11 ++++-- arch/ppc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ makedumpfile.c | 4 +- makedumpfile.h | 24 ++++++++++++- 4 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 arch/ppc.c diff --git a/Makefile b/Makefile index 04e267f..677cc8c 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ endif ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc64/powerpc64/ ) + -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/) CFLAGS += -D__$(ARCH)__ CFLAGS_ARCH += -D__$(ARCH)__ @@ -34,11 +34,16 @@ CFLAGS += -m64 CFLAGS_ARCH += -m64 endif +ifeq ($(ARCH), powerpc32) +CFLAGS += -m32 +CFLAGS_ARCH += -m32 +endif + SRC = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c OBJ_PART = print_info.o dwarf_info.o elf_info.o erase_info.o sadump_info.o -SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c -OBJ_ARCH = arch/arm.o arch/x86.o arch/x86_64.o arch/ia64.o arch/ppc64.o arch/s390x.o +SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c +OBJ_ARCH = arch/arm.o arch/x86.o arch/x86_64.o arch/ia64.o arch/ppc64.o arch/s390x.o arch/ppc.o all: makedumpfile diff --git a/arch/ppc.c b/arch/ppc.c new file mode 100644 index 0000000..2bc8d5f --- /dev/null +++ b/arch/ppc.c @@ -0,0 +1,101 @@ +/* + * ppc.c + * + * Created by: Suzuki K. Poulose <suzuki@in.ibm.com> + * - Based on ppc64 implementation + * Copyright (C) IBM Corporation, 2012. All rights reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation (version 2 of the License). + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#ifdef __powerpc32__ + +#include "../print_info.h" +#include "../elf_info.h" +#include "../makedumpfile.h" + +int +get_machdep_info_ppc(void) +{ + unsigned long vmlist, vmalloc_start; + + info->section_size_bits = _SECTION_SIZE_BITS; + info->max_physmem_bits = _MAX_PHYSMEM_BITS; + info->page_offset = __PAGE_OFFSET; + + if (SYMBOL(_stext) != NOT_FOUND_SYMBOL) + info->kernel_start = SYMBOL(_stext); + else { + ERRMSG("Can't get the symbol of _stext.\n"); + return FALSE; + } + + DEBUG_MSG("kernel_start : %lx\n", info->kernel_start); + + /* + * For the compatibility, makedumpfile should run without the symbol + * vmlist and the offset of vm_struct.addr if they are not necessary. + */ + if ((SYMBOL(vmlist) == NOT_FOUND_SYMBOL) + || (OFFSET(vm_struct.addr) == NOT_FOUND_STRUCTURE)) { + return TRUE; + } + if (!readmem(VADDR, SYMBOL(vmlist), &vmlist, sizeof(vmlist))) { + ERRMSG("Can't get vmlist.\n"); + return FALSE; + } + if (!readmem(VADDR, vmlist + OFFSET(vm_struct.addr), &vmalloc_start, + sizeof(vmalloc_start))) { + ERRMSG("Can't get vmalloc_start.\n"); + return FALSE; + } + info->vmalloc_start = vmalloc_start; + DEBUG_MSG("vmalloc_start: %lx\n", vmalloc_start); + + return TRUE; +} + +int +is_vmalloc_addr_ppc(unsigned long vaddr) +{ + return (info->vmalloc_start && vaddr >= info->vmalloc_start); +} + +unsigned long long +vaddr_to_paddr_ppc(unsigned long vaddr) +{ + unsigned long *pgd, *pmd; + unsigned long long pte; + unsigned long long paddr; + + paddr = vaddr_to_paddr_general(vaddr); + if (paddr != NOT_PADDR) + return paddr; + + if ((SYMBOL(vmlist) == NOT_FOUND_SYMBOL) + || (OFFSET(vm_struct.addr) == NOT_FOUND_STRUCTURE)) { + ERRMSG("Can't get necessary information for vmalloc translation.\n"); + return NOT_PADDR; + } + if (!is_vmalloc_addr_ppc(vaddr)) + return (vaddr - info->kernel_start); + + /* + * TODO: Support vmalloc translation. + */ + ERRMSG("This makedumpfile does not support vmalloc translation.\n"); + return NOT_PADDR; +} + +#endif /* powerpc32 */ diff --git a/makedumpfile.c b/makedumpfile.c index 101f8b5..cefb7cf 100644 --- a/makedumpfile.c +++ b/makedumpfile.c @@ -5691,9 +5691,9 @@ initial_xen(void) off_t offset; unsigned long size; -#ifdef __powerpc64__ +#if defined(__powerpc64__) || defined(__powerpc32__) MSG("\n"); - MSG("ppc64 xen is not supported.\n"); + MSG("xen is not supported on powerpc.\n"); return FALSE; #else if(!info->flag_elf_dumpfile) { diff --git a/makedumpfile.h b/makedumpfile.h index efa325f..1329271 100644 --- a/makedumpfile.h +++ b/makedumpfile.h @@ -530,6 +530,17 @@ do { \ #define _MAX_PHYSMEM_BITS (44) #endif +#ifdef __powerpc32__ + +#define __PAGE_OFFSET (0xc0000000) +#define KERNELBASE PAGE_OFFSET +#define VMALL_START (info->vmalloc_start) +#define KVBASE (SYMBOL(_stext)) +#define _SECTION_SIZE_BITS (24) +#define _MAX_PHYSMEM_BITS (44) + +#endif + #ifdef __s390x__ #define __PAGE_OFFSET (info->page_size - 1) #define KERNELBASE (0) @@ -667,6 +678,15 @@ unsigned long long vaddr_to_paddr_ppc64(unsigned long vaddr); #define vaddr_to_paddr(X) vaddr_to_paddr_ppc64(X) #endif /* powerpc64 */ +#ifdef __powerpc32__ /* powerpc32 */ +int get_machdep_info_ppc(void); +unsigned long long vaddr_to_paddr_ppc(unsigned long vaddr); +#define get_phys_base() TRUE +#define get_machdep_info() get_machdep_info_ppc() +#define get_versiondep_info() TRUE +#define vaddr_to_paddr(X) vaddr_to_paddr_ppc(X) +#endif /* powerpc */ + #ifdef __s390x__ /* s390x */ int get_machdep_info_s390x(void); unsigned long long vaddr_to_paddr_s390x(unsigned long vaddr); @@ -1332,10 +1352,10 @@ int get_xen_info_ia64(void); #endif /* __ia64 */ -#ifdef __powerpc64__ /* powerpc64 */ +#if defined(__powerpc64__) || defined(__powerpc32__) /* powerpcXX */ #define kvtop_xen(X) FALSE #define get_xen_info_arch(X) FALSE -#endif /* powerpc64 */ +#endif /* powerpcXX */ #ifdef __s390x__ /* s390x */ #define kvtop_xen(X) FALSE _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v1 3/3] [makedumpfile] Add support for PPC32 2012-01-18 10:10 ` [PATCH v1 3/3] [makedumpfile] Add support for PPC32 Suzuki K. Poulose @ 2012-02-10 9:45 ` Atsushi Kumagai 2012-02-10 11:36 ` Suzuki K. Poulose 0 siblings, 1 reply; 12+ messages in thread From: Atsushi Kumagai @ 2012-02-10 9:45 UTC (permalink / raw) To: suzuki; +Cc: kexec, tachibana, usui Hi, Suzuki On Wed, 18 Jan 2012 15:40:03 +0530 "Suzuki K. Poulose" <suzuki@in.ibm.com> wrote: > Mostly a copy of ppc64 with renaming to _ppc variants. > > Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com> > --- > > Makefile | 11 ++++-- > arch/ppc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > makedumpfile.c | 4 +- > makedumpfile.h | 24 ++++++++++++- > 4 files changed, 133 insertions(+), 7 deletions(-) > create mode 100644 arch/ppc.c I will make small changes: diff --git a/makedumpfile.c b/makedumpfile.c index cefb7cf..901b85c 100644 --- a/makedumpfile.c +++ b/makedumpfile.c @@ -5693,7 +5693,7 @@ initial_xen(void) #if defined(__powerpc64__) || defined(__powerpc32__) MSG("\n"); - MSG("xen is not supported on powerpc.\n"); + MSG("Xen is not supported on powerpc.\n"); return FALSE; #else if(!info->flag_elf_dumpfile) { diff --git a/makedumpfile.h b/makedumpfile.h index 88b7bc2..e43ea84 100644 --- a/makedumpfile.h +++ b/makedumpfile.h @@ -686,7 +686,7 @@ unsigned long long vaddr_to_paddr_ppc(unsigned long vaddr); #define get_machdep_info() get_machdep_info_ppc() #define get_versiondep_info() TRUE #define vaddr_to_paddr(X) vaddr_to_paddr_ppc(X) -#endif /* powerpc */ +#endif /* powerpc32 */ #ifdef __s390x__ /* s390x */ int get_machdep_info_s390x(void); The other parts looks good. I will merge this patch to makedumpfile-1.4.3. By the way, could you tell me kernel versions that you've tested ? I want to update "SUPPORTED KERNELS" in the README. Thanks Atsushi Kumagai > diff --git a/Makefile b/Makefile > index 04e267f..677cc8c 100644 > --- a/Makefile > +++ b/Makefile > @@ -24,7 +24,7 @@ endif > ARCH := $(shell echo ${TARGET} | sed -e s/i.86/x86/ -e s/sun4u/sparc64/ \ > -e s/arm.*/arm/ -e s/sa110/arm/ \ > -e s/s390x/s390/ -e s/parisc64/parisc/ \ > - -e s/ppc64/powerpc64/ ) > + -e s/ppc64/powerpc64/ -e s/ppc/powerpc32/) > > CFLAGS += -D__$(ARCH)__ > CFLAGS_ARCH += -D__$(ARCH)__ > @@ -34,11 +34,16 @@ CFLAGS += -m64 > CFLAGS_ARCH += -m64 > endif > > +ifeq ($(ARCH), powerpc32) > +CFLAGS += -m32 > +CFLAGS_ARCH += -m32 > +endif > + > SRC = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h > SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c > OBJ_PART = print_info.o dwarf_info.o elf_info.o erase_info.o sadump_info.o > -SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c > -OBJ_ARCH = arch/arm.o arch/x86.o arch/x86_64.o arch/ia64.o arch/ppc64.o arch/s390x.o > +SRC_ARCH = arch/arm.c arch/x86.c arch/x86_64.c arch/ia64.c arch/ppc64.c arch/s390x.c arch/ppc.c > +OBJ_ARCH = arch/arm.o arch/x86.o arch/x86_64.o arch/ia64.o arch/ppc64.o arch/s390x.o arch/ppc.o > > all: makedumpfile > > diff --git a/arch/ppc.c b/arch/ppc.c > new file mode 100644 > index 0000000..2bc8d5f > --- /dev/null > +++ b/arch/ppc.c > @@ -0,0 +1,101 @@ > +/* > + * ppc.c > + * > + * Created by: Suzuki K. Poulose <suzuki@in.ibm.com> > + * - Based on ppc64 implementation > + * Copyright (C) IBM Corporation, 2012. All rights reserved > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation (version 2 of the License). > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > + */ > + > +#ifdef __powerpc32__ > + > +#include "../print_info.h" > +#include "../elf_info.h" > +#include "../makedumpfile.h" > + > +int > +get_machdep_info_ppc(void) > +{ > + unsigned long vmlist, vmalloc_start; > + > + info->section_size_bits = _SECTION_SIZE_BITS; > + info->max_physmem_bits = _MAX_PHYSMEM_BITS; > + info->page_offset = __PAGE_OFFSET; > + > + if (SYMBOL(_stext) != NOT_FOUND_SYMBOL) > + info->kernel_start = SYMBOL(_stext); > + else { > + ERRMSG("Can't get the symbol of _stext.\n"); > + return FALSE; > + } > + > + DEBUG_MSG("kernel_start : %lx\n", info->kernel_start); > + > + /* > + * For the compatibility, makedumpfile should run without the symbol > + * vmlist and the offset of vm_struct.addr if they are not necessary. > + */ > + if ((SYMBOL(vmlist) == NOT_FOUND_SYMBOL) > + || (OFFSET(vm_struct.addr) == NOT_FOUND_STRUCTURE)) { > + return TRUE; > + } > + if (!readmem(VADDR, SYMBOL(vmlist), &vmlist, sizeof(vmlist))) { > + ERRMSG("Can't get vmlist.\n"); > + return FALSE; > + } > + if (!readmem(VADDR, vmlist + OFFSET(vm_struct.addr), &vmalloc_start, > + sizeof(vmalloc_start))) { > + ERRMSG("Can't get vmalloc_start.\n"); > + return FALSE; > + } > + info->vmalloc_start = vmalloc_start; > + DEBUG_MSG("vmalloc_start: %lx\n", vmalloc_start); > + > + return TRUE; > +} > + > +int > +is_vmalloc_addr_ppc(unsigned long vaddr) > +{ > + return (info->vmalloc_start && vaddr >= info->vmalloc_start); > +} > + > +unsigned long long > +vaddr_to_paddr_ppc(unsigned long vaddr) > +{ > + unsigned long *pgd, *pmd; > + unsigned long long pte; > + unsigned long long paddr; > + > + paddr = vaddr_to_paddr_general(vaddr); > + if (paddr != NOT_PADDR) > + return paddr; > + > + if ((SYMBOL(vmlist) == NOT_FOUND_SYMBOL) > + || (OFFSET(vm_struct.addr) == NOT_FOUND_STRUCTURE)) { > + ERRMSG("Can't get necessary information for vmalloc translation.\n"); > + return NOT_PADDR; > + } > + if (!is_vmalloc_addr_ppc(vaddr)) > + return (vaddr - info->kernel_start); > + > + /* > + * TODO: Support vmalloc translation. > + */ > + ERRMSG("This makedumpfile does not support vmalloc translation.\n"); > + return NOT_PADDR; > +} > + > +#endif /* powerpc32 */ > diff --git a/makedumpfile.c b/makedumpfile.c > index 101f8b5..cefb7cf 100644 > --- a/makedumpfile.c > +++ b/makedumpfile.c > @@ -5691,9 +5691,9 @@ initial_xen(void) > off_t offset; > unsigned long size; > > -#ifdef __powerpc64__ > +#if defined(__powerpc64__) || defined(__powerpc32__) > MSG("\n"); > - MSG("ppc64 xen is not supported.\n"); > + MSG("xen is not supported on powerpc.\n"); > return FALSE; > #else > if(!info->flag_elf_dumpfile) { > diff --git a/makedumpfile.h b/makedumpfile.h > index efa325f..1329271 100644 > --- a/makedumpfile.h > +++ b/makedumpfile.h > @@ -530,6 +530,17 @@ do { \ > #define _MAX_PHYSMEM_BITS (44) > #endif > > +#ifdef __powerpc32__ > + > +#define __PAGE_OFFSET (0xc0000000) > +#define KERNELBASE PAGE_OFFSET > +#define VMALL_START (info->vmalloc_start) > +#define KVBASE (SYMBOL(_stext)) > +#define _SECTION_SIZE_BITS (24) > +#define _MAX_PHYSMEM_BITS (44) > + > +#endif > + > #ifdef __s390x__ > #define __PAGE_OFFSET (info->page_size - 1) > #define KERNELBASE (0) > @@ -667,6 +678,15 @@ unsigned long long vaddr_to_paddr_ppc64(unsigned long vaddr); > #define vaddr_to_paddr(X) vaddr_to_paddr_ppc64(X) > #endif /* powerpc64 */ > > +#ifdef __powerpc32__ /* powerpc32 */ > +int get_machdep_info_ppc(void); > +unsigned long long vaddr_to_paddr_ppc(unsigned long vaddr); > +#define get_phys_base() TRUE > +#define get_machdep_info() get_machdep_info_ppc() > +#define get_versiondep_info() TRUE > +#define vaddr_to_paddr(X) vaddr_to_paddr_ppc(X) > +#endif /* powerpc */ > + > #ifdef __s390x__ /* s390x */ > int get_machdep_info_s390x(void); > unsigned long long vaddr_to_paddr_s390x(unsigned long vaddr); > @@ -1332,10 +1352,10 @@ int get_xen_info_ia64(void); > > #endif /* __ia64 */ > > -#ifdef __powerpc64__ /* powerpc64 */ > +#if defined(__powerpc64__) || defined(__powerpc32__) /* powerpcXX */ > #define kvtop_xen(X) FALSE > #define get_xen_info_arch(X) FALSE > -#endif /* powerpc64 */ > +#endif /* powerpcXX */ > > #ifdef __s390x__ /* s390x */ > #define kvtop_xen(X) FALSE > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v1 3/3] [makedumpfile] Add support for PPC32 2012-02-10 9:45 ` Atsushi Kumagai @ 2012-02-10 11:36 ` Suzuki K. Poulose 2012-02-13 2:01 ` Atsushi Kumagai 0 siblings, 1 reply; 12+ messages in thread From: Suzuki K. Poulose @ 2012-02-10 11:36 UTC (permalink / raw) To: Atsushi Kumagai; +Cc: usui, tachibana, kexec On 02/10/2012 03:15 PM, Atsushi Kumagai wrote: > Hi, Suzuki > > On Wed, 18 Jan 2012 15:40:03 +0530 > "Suzuki K. Poulose"<suzuki@in.ibm.com> wrote: > >> Mostly a copy of ppc64 with renaming to _ppc variants. >> >> Signed-off-by: Suzuki K. Poulose<suzuki@in.ibm.com> >> --- >> >> Makefile | 11 ++++-- >> arch/ppc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> makedumpfile.c | 4 +- >> makedumpfile.h | 24 ++++++++++++- >> 4 files changed, 133 insertions(+), 7 deletions(-) >> create mode 100644 arch/ppc.c > > I will make small changes: > > diff --git a/makedumpfile.c b/makedumpfile.c > index cefb7cf..901b85c 100644 > --- a/makedumpfile.c > +++ b/makedumpfile.c > @@ -5693,7 +5693,7 @@ initial_xen(void) > > #if defined(__powerpc64__) || defined(__powerpc32__) > MSG("\n"); > - MSG("xen is not supported on powerpc.\n"); > + MSG("Xen is not supported on powerpc.\n"); > return FALSE; > #else > if(!info->flag_elf_dumpfile) { > diff --git a/makedumpfile.h b/makedumpfile.h > index 88b7bc2..e43ea84 100644 > --- a/makedumpfile.h > +++ b/makedumpfile.h > @@ -686,7 +686,7 @@ unsigned long long vaddr_to_paddr_ppc(unsigned long vaddr); > #define get_machdep_info() get_machdep_info_ppc() > #define get_versiondep_info() TRUE > #define vaddr_to_paddr(X) vaddr_to_paddr_ppc(X) > -#endif /* powerpc */ > +#endif /* powerpc32 */ > > #ifdef __s390x__ /* s390x */ > int get_machdep_info_s390x(void); > > > The other parts looks good. > I will merge this patch to makedumpfile-1.4.3. > > By the way, could you tell me kernel versions that you've tested ? > I want to update "SUPPORTED KERNELS" in the README. I have tested this on 3.2.0. Eventhough the makedumpfile says the kernel is not supported, the dumps work fine. Thanks Suzuki _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 3/3] [makedumpfile] Add support for PPC32 2012-02-10 11:36 ` Suzuki K. Poulose @ 2012-02-13 2:01 ` Atsushi Kumagai 0 siblings, 0 replies; 12+ messages in thread From: Atsushi Kumagai @ 2012-02-13 2:01 UTC (permalink / raw) To: suzuki; +Cc: kexec, tachibana, usui Hi, Suzuki On Fri, 10 Feb 2012 17:06:35 +0530 "Suzuki K. Poulose" <suzuki@in.ibm.com> wrote: > > The other parts looks good. > > I will merge this patch to makedumpfile-1.4.3. > > > > By the way, could you tell me kernel versions that you've tested ? > > I want to update "SUPPORTED KERNELS" in the README. > > I have tested this on 3.2.0. Eventhough the makedumpfile says the kernel > is not supported, the dumps work fine. Thank you for your reply. It's helpful information. Thanks Atsushi Kumagai _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 0/3][makedumpfile]Add support for PPC32 2012-01-18 10:07 [PATCH v1 0/3][makedumpfile]Add support for PPC32 Suzuki K. Poulose ` (2 preceding siblings ...) 2012-01-18 10:10 ` [PATCH v1 3/3] [makedumpfile] Add support for PPC32 Suzuki K. Poulose @ 2012-01-19 2:58 ` Atsushi Kumagai 2012-02-06 9:07 ` Suzuki K. Poulose 3 siblings, 1 reply; 12+ messages in thread From: Atsushi Kumagai @ 2012-01-19 2:58 UTC (permalink / raw) To: suzuki; +Cc: kexec, tachibana, usui Hi Suzuki, On Wed, 18 Jan 2012 15:37:49 +0530 "Suzuki K. Poulose" <suzuki@in.ibm.com> wrote: > The following series implements makedumpfile support for PPC32. > > The implementation is heavily based on PPC64. This also introduces > cross build support which is required for Embedded PPC Boards. > > --- > > Suzuki K. Poulose (3): > [makedumpfile] Add support for PPC32 > [ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 > [makedumpfile] Support building for cross build > > > Makefile | 26 ++++++++++++-- > README | 5 +++ > arch/ppc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > makedumpfile.c | 4 +- > makedumpfile.h | 28 +++++++++++++--- > 5 files changed, 153 insertions(+), 11 deletions(-) > create mode 100644 arch/ppc.c > > -- > Suzuki Poulose Thank you for your patches. I will review them. Thanks Atsushi Kumagai _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 0/3][makedumpfile]Add support for PPC32 2012-01-19 2:58 ` [PATCH v1 0/3][makedumpfile]Add " Atsushi Kumagai @ 2012-02-06 9:07 ` Suzuki K. Poulose 2012-02-07 5:58 ` Atsushi Kumagai 0 siblings, 1 reply; 12+ messages in thread From: Suzuki K. Poulose @ 2012-02-06 9:07 UTC (permalink / raw) To: Atsushi Kumagai; +Cc: kexec, tachibana, usui On 01/19/2012 08:28 AM, Atsushi Kumagai wrote: Atsushi-San, > Hi Suzuki, > > On Wed, 18 Jan 2012 15:37:49 +0530 > "Suzuki K. Poulose"<suzuki@in.ibm.com> wrote: > >> The following series implements makedumpfile support for PPC32. >> >> The implementation is heavily based on PPC64. This also introduces >> cross build support which is required for Embedded PPC Boards. >> >> --- >> >> Suzuki K. Poulose (3): >> [makedumpfile] Add support for PPC32 >> [ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 >> [makedumpfile] Support building for cross build >> >> >> Makefile | 26 ++++++++++++-- >> README | 5 +++ >> arch/ppc.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> makedumpfile.c | 4 +- >> makedumpfile.h | 28 +++++++++++++--- >> 5 files changed, 153 insertions(+), 11 deletions(-) >> create mode 100644 arch/ppc.c >> >> -- >> Suzuki Poulose > > Thank you for your patches. > I will review them. Did you get a chance to review my patches ? Suzuki _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 0/3][makedumpfile]Add support for PPC32 2012-02-06 9:07 ` Suzuki K. Poulose @ 2012-02-07 5:58 ` Atsushi Kumagai 0 siblings, 0 replies; 12+ messages in thread From: Atsushi Kumagai @ 2012-02-07 5:58 UTC (permalink / raw) To: suzuki; +Cc: kexec, tachibana, usui Hi Suzuki, On Mon, 06 Feb 2012 14:37:15 +0530 "Suzuki K. Poulose" <suzuki@in.ibm.com> wrote: > On 01/19/2012 08:28 AM, Atsushi Kumagai wrote: > > > > > Thank you for your patches. > > I will review them. > > Did you get a chance to review my patches ? > > Suzuki I'm reviewing your patches now, and I will inform you of the result in the course of this week. Additionally, the followings are scheduled for v1.4.3. - Add support for PPC32 - Fix VtoP method for x86 remap allocator - Fix segmentation fault for -x/--split options - Support newer kernels v1.4.3 will be released before the end of this month if all steps go smoothly. Thanks Atsushi Kumagai _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-02-13 2:03 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-01-18 10:07 [PATCH v1 0/3][makedumpfile]Add support for PPC32 Suzuki K. Poulose 2012-01-18 10:09 ` [PATCH v1 1/3] [makedumpfile] Support for cross building Suzuki K. Poulose 2012-02-10 9:42 ` Atsushi Kumagai 2012-01-18 10:09 ` [PATCH v1 2/3][makedumpfile][ppc64] Rename the __powerpc__ macro to __powerpc64__ for PPC64 Suzuki K. Poulose 2012-02-10 9:44 ` Atsushi Kumagai 2012-01-18 10:10 ` [PATCH v1 3/3] [makedumpfile] Add support for PPC32 Suzuki K. Poulose 2012-02-10 9:45 ` Atsushi Kumagai 2012-02-10 11:36 ` Suzuki K. Poulose 2012-02-13 2:01 ` Atsushi Kumagai 2012-01-19 2:58 ` [PATCH v1 0/3][makedumpfile]Add " Atsushi Kumagai 2012-02-06 9:07 ` Suzuki K. Poulose 2012-02-07 5:58 ` Atsushi Kumagai
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.