Skip to contentSkip to conversation

kexec-tools: mipsel port

PATCH In review Simon Horman 2 participants 10 messages Feb 27, 2008 – Feb 28, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover kexec-tools: mipsel port

Hi,

After some recent questions by Tomasz Chmielewski I have dug up the mipsel port of kexec-tool and up-ported it to the lastest release of kexec-tools-testing, v20080227

ftp://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
http://lists.infradead.org/pipermail/kexec/2008-February/001346.html

I have just looked over the code and fixed up trivial errors to the point where it builds (using a cross-compiler). This mostly involved rediffing and updating Makefiles for recent build changes. Along the way I removed some unused variables and things like that.

I have not tested the code beyond making sure it builds - mainly because I do not have any mipsel hardware. I will see about using quemu, but it may take me a while to get a kernel and user-space up and running as I have not used mipsel before.

On the code itself, the most glaring problem is the use of "#ifdef __MIPSEL__". That code needs to be moved into kexec/arch/mips or some similar location.

I would really appreciate it if someone could test this code. And I would appreciate it even more if someone could help fix it up to a mergable state. Or alternatively, point me in the right direction to find people who want to help with this.

I am more than happy to merge the code once it is clean and working.

Have fun

Signature · 7 lines
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#1 lore raw

PATCH 1/7 kexec tools mipsel port

From: Francesco Chiechi <[email protected]>

Hello,

We developed a patch to port kexec-tools to mips arch and included support for command line passing through elf boot notes.
We did it for a customer of ours on a specific platform derived from toshiba tx4938 (so we think it should work at least for tx4938 evaluation board also). We would like to contribute it in case somebody else needs it or wants to improve it.
This patch works for us but the assembler part in particular, should be considered as a starting point because my assembly knowledge is not too deep.

As this is the first time I submit a patch I tried to guess reading tpp.txt if this is the right way to submit. Please let me know about any mistakes I may have made.

thanks

Francesco Chiechi

---

Wed, 27 Feb 2008 19:25:00 +0900
* Simon Horman <[email protected]>
- Upported to 20080227 release
- Note the #ifdef __MIPSEL__ stuff needs to be moved into kexec/arch/mipsel

 configure.ac                             |    2 
 kexec/arch/mipsel/Makefile               |    7 +
 kexec/arch/mipsel/include/arch/options.h |   11 +
 kexec/arch/mipsel/kexec-elf-mipsel.c     |  184 ++++++++++++++++++++++++++++++
 kexec/arch/mipsel/kexec-elf-rel-mipsel.c |   42 ++++++
 kexec/arch/mipsel/kexec-mipsel.c         |  167 +++++++++++++++++++++++++++
 kexec/arch/mipsel/kexec-mipsel.h         |   17 ++
 kexec/arch/mipsel/mipsel-setup-simple.S  |  110 +++++++++++++++++
 kexec/crashdump.c                        |    1 
 kexec/kexec-syscall.h                    |    3 
 kexec/kexec.c                            |  104 ++++++++++++++++
 purgatory/arch/mipsel/Makefile           |    7 +
 purgatory/arch/mipsel/console-mipsel.c   |    5 
 purgatory/arch/mipsel/include/limits.h   |   58 +++++++++
 purgatory/arch/mipsel/include/stdint.h   |   16 ++
 purgatory/arch/mipsel/purgatory-mipsel.c |    7 +
 purgatory/arch/mipsel/purgatory-mipsel.h |    6 
 17 files changed, 746 insertions(+), 1 deletion(-)
configure.ac +1 -1
Index: kexec-tools-mips/configure.ac
===================================================================
@@ -38,7 +38,7 @@ case $target_cpu in
 	sh4|sh4a|sh3|sh )
 		ARCH="sh"
 		;;
-	ia64|x86_64|alpha )
+	ia64|x86_64|alpha|mipsel )
 		ARCH="$target_cpu"
 		;;
 	* )
kexec/arch/mipsel/Makefile new file +7 -0
Index: kexec-tools-mips/kexec/arch/mipsel/Makefile
===================================================================
@@ -0,0 +1,7 @@
+#
+# kexec mipsel (linux booting linux)
+#
+KEXEC_C_SRCS+= kexec/arch/mipsel/kexec-mipsel.c
+KEXEC_C_SRCS+= kexec/arch/mipsel/kexec-elf-mipsel.c
+KEXEC_C_SRCS+= kexec/arch/mipsel/kexec-elf-rel-mipsel.c
+KEXEC_S_SRCS+= kexec/arch/mipsel/mipsel-setup-simple.S
kexec/arch/mipsel/include/arch/options.h new file +11 -0
Index: kexec-tools-mips/kexec/arch/mipsel/include/arch/options.h
===================================================================
@@ -0,0 +1,11 @@
+#ifndef KEXEC_ARCH_MIPS_OPTIONS_H
+#define KEXEC_ARCH_MIPS_OPTIONS_H
+
+#define OPT_ARCH_MAX   (OPT_MAX+0)
+
+#define KEXEC_ARCH_OPTIONS \
+       KEXEC_OPTIONS \
+
+#define KEXEC_ARCH_OPT_STR KEXEC_OPT_STR ""
+
+#endif /* KEXEC_ARCH_MIPS_OPTIONS_H */
kexec/arch/mipsel/kexec-elf-mipsel.c new file +184 -0

184 lines not on this page · raw message

kexec/arch/mipsel/kexec-elf-rel-mipsel.c new file +42 -0

42 lines not on this page · raw message

kexec/arch/mipsel/kexec-mipsel.c new file +167 -0

167 lines not on this page · raw message

kexec/arch/mipsel/kexec-mipsel.h new file +17 -0
Index: kexec-tools-mips/kexec/arch/mipsel/kexec-mipsel.h
===================================================================
@@ -0,0 +1,17 @@
+#ifndef KEXEC_MIPS_H
+#define KEXEC_MIPS_H
+
+extern unsigned char setup_simple_start[];
+extern uint32_t setup_simple_size;
+
+extern struct {
+       uint32_t spr8;
+       uint32_t spr9;
+} setup_simple_regs;
+
+int elf_mipsel_probe(const char *buf, off_t len);
+int elf_mipsel_load(int argc, char **argv, const char *buf, off_t len,
+       struct kexec_info *info);
+void elf_mipsel_usage(void);
+
+#endif /* KEXEC_MIPS_H */
kexec/arch/mipsel/mipsel-setup-simple.S new file +110 -0

110 lines not on this page · raw message

kexec/crashdump.c +1 -0
Index: kexec-tools-mips/kexec/crashdump.c
===================================================================
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
+#include <linux/limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
kexec/kexec-syscall.h +3 -0
Index: kexec-tools-mips/kexec/kexec-syscall.h
===================================================================
@@ -49,6 +49,9 @@
 #ifdef __arm__
 #define __NR_kexec_load		__NR_SYSCALL_BASE + 347  
 #endif
+#ifdef __MIPSEL__
+#define __NR_kexec_load                4311
+#endif
 #ifndef __NR_kexec_load
 #error Unknown processor architecture.  Needs a kexec_load syscall number.
 #endif
kexec/kexec.c +104 -0

134 lines not on this page · raw message

purgatory/arch/mipsel/Makefile new file +7 -0
Index: kexec-tools-mips/purgatory/arch/mipsel/Makefile
===================================================================
@@ -0,0 +1,7 @@
+#
+# Purgatory mipsel
+#
+
+PURGATORY_C_SRCS+= purgatory/arch/mipsel/purgatory-mipsel.c
+PURGATORY_C_SRCS+= purgatory/arch/mipsel/console-mipsel.c
+
purgatory/arch/mipsel/console-mipsel.c new file +5 -0
Index: kexec-tools-mips/purgatory/arch/mipsel/console-mipsel.c
===================================================================
@@ -0,0 +1,5 @@
+#include <purgatory.h>
+void putchar(int ch)
+{
+       /* Nothing for now */
+}
purgatory/arch/mipsel/include/limits.h new file +58 -0

58 lines not on this page · raw message

purgatory/arch/mipsel/include/stdint.h new file +16 -0
Index: kexec-tools-mips/purgatory/arch/mipsel/include/stdint.h
===================================================================
@@ -0,0 +1,16 @@
+#ifndef STDINT_H
+#define STDINT_H
+
+typedef unsigned long      size_t;
+
+typedef unsigned char      uint8_t;
+typedef unsigned short     uint16_t;
+typedef unsigned int       uint32_t;
+typedef unsigned long long uint64_t;
+
+typedef signed char        int8_t;
+typedef signed short       int16_t;
+typedef signed int         int32_t;
+typedef signed long long   int64_t;
+
+#endif /* STDINT_H */
purgatory/arch/mipsel/purgatory-mipsel.c new file +7 -0
Index: kexec-tools-mips/purgatory/arch/mipsel/purgatory-mipsel.c
===================================================================
@@ -0,0 +1,7 @@
+#include <purgatory.h>
+#include "purgatory-mipsel.h"
+
+void setup_arch(void)
+{
+       /* Nothing for now */
+}
purgatory/arch/mipsel/purgatory-mipsel.h new file +6 -0
Index: kexec-tools-mips/purgatory/arch/mipsel/purgatory-mipsel.h
===================================================================
@@ -0,0 +1,6 @@
+#ifndef PURGATORY_MIPSEL_H
+#define PURGATORY_MIPSEL_H
+
+/* nothing yet */
+
+#endif /* PURGATORY_MIPSEL_H */
Signature · 8 lines
-- 
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#2 lore raw

PATCH 2/7 kexec-tools: Remove purgatory/arch/mipsel/include/stdint.h

In reply to Simon Horman

Remove purgatory/arch/mipsel/include/stdint.h as it just duplicates things found in system header files.

---

 purgatory/arch/mipsel/include/stdint.h |   16 ----------------
 1 file changed, 16 deletions(-)
purgatory/arch/mipsel/include/stdint.h deleted +0 -16
Index: kexec-tools-mips/purgatory/arch/mipsel/include/stdint.h
===================================================================
@@ -1,16 +0,0 @@
-#ifndef STDINT_H
-#define STDINT_H
-
-typedef unsigned long      size_t;
-
-typedef unsigned char      uint8_t;
-typedef unsigned short     uint16_t;
-typedef unsigned int       uint32_t;
-typedef unsigned long long uint64_t;
-
-typedef signed char        int8_t;
-typedef signed short       int16_t;
-typedef signed int         int32_t;
-typedef signed long long   int64_t;
-
-#endif /* STDINT_H */
Signature · 8 lines
-- 
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#3 lore raw

PATCH 3/7 kexec-tools: Update mips port for recent build changes

In reply to Simon Horman

---

 kexec/Makefile                 |    1 +
 kexec/arch/mipsel/Makefile     |   13 +++++++++----
 purgatory/Makefile             |    1 +
 purgatory/arch/mipsel/Makefile |    8 ++++++--
 4 files changed, 17 insertions(+), 6 deletions(-)
kexec/Makefile +1 -0
Index: kexec-tools-mips/kexec/Makefile
===================================================================
@@ -33,6 +33,7 @@ include $(srcdir)/kexec/arch/alpha/Makef
 include $(srcdir)/kexec/arch/arm/Makefile
 include $(srcdir)/kexec/arch/i386/Makefile
 include $(srcdir)/kexec/arch/ia64/Makefile
+include $(srcdir)/kexec/arch/mipsel/Makefile
 include $(srcdir)/kexec/arch/ppc/Makefile
 include $(srcdir)/kexec/arch/ppc64/Makefile
 include $(srcdir)/kexec/arch/s390/Makefile
kexec/arch/mipsel/Makefile +9 -4
Index: kexec-tools-mips/kexec/arch/mipsel/Makefile
===================================================================
@@ -1,7 +1,12 @@
 #
 # kexec mipsel (linux booting linux)
 #
-KEXEC_C_SRCS+= kexec/arch/mipsel/kexec-mipsel.c
-KEXEC_C_SRCS+= kexec/arch/mipsel/kexec-elf-mipsel.c
-KEXEC_C_SRCS+= kexec/arch/mipsel/kexec-elf-rel-mipsel.c
-KEXEC_S_SRCS+= kexec/arch/mipsel/mipsel-setup-simple.S
+mipsel_KEXEC_SRCS =  kexec/arch/mipsel/kexec-mipsel.c
+mipsel_KEXEC_SRCS += kexec/arch/mipsel/kexec-elf-mipsel.c
+mipsel_KEXEC_SRCS += kexec/arch/mipsel/kexec-elf-rel-mipsel.c
+mipsel_KEXEC_SRCS += kexec/arch/mipsel/mipsel-setup-simple.S
+
+dist += kexec/arch/mipsel/Makefile $(mipsel_KEXEC_SRCS)			\
+	kexec/arch/mipsel/kexec-mipsel.h				\
+	kexec/arch/mipsel/include/arch/options.h
+
purgatory/Makefile +1 -0
Index: kexec-tools-mips/purgatory/Makefile
===================================================================
@@ -20,6 +20,7 @@ include $(srcdir)/purgatory/arch/alpha/M
 include $(srcdir)/purgatory/arch/arm/Makefile
 include $(srcdir)/purgatory/arch/i386/Makefile
 include $(srcdir)/purgatory/arch/ia64/Makefile
+include $(srcdir)/purgatory/arch/mipsel/Makefile
 include $(srcdir)/purgatory/arch/ppc/Makefile
 include $(srcdir)/purgatory/arch/ppc64/Makefile
 include $(srcdir)/purgatory/arch/s390/Makefile
purgatory/arch/mipsel/Makefile +6 -2
Index: kexec-tools-mips/purgatory/arch/mipsel/Makefile
===================================================================
@@ -2,6 +2,10 @@
 # Purgatory mipsel
 #
 
-PURGATORY_C_SRCS+= purgatory/arch/mipsel/purgatory-mipsel.c
-PURGATORY_C_SRCS+= purgatory/arch/mipsel/console-mipsel.c
+mipsel_PURGATORY_C_SRCS+= purgatory/arch/mipsel/purgatory-mipsel.c
+mipsel_PURGATORY_C_SRCS+= purgatory/arch/mipsel/console-mipsel.c
+
+dist += purgatory/arch/mipsel/Makefile $(mipsel_PURGATORY_C_SRCS)	\
+	purgatory/arch/mipsel/include/limits.h				\
+	purgatory/arch/mipsel/purgatory-mipsel.h
 
Signature · 8 lines
-- 
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#4 lore raw

PATCH 4/7 kexec-tools: Remove unused variables in arch_process_options()

In reply to Simon Horman

---

 kexec/arch/mipsel/kexec-mipsel.c |    2 --
 1 file changed, 2 deletions(-)
kexec/arch/mipsel/kexec-mipsel.c +0 -2
Index: kexec-tools-mips/kexec/arch/mipsel/kexec-mipsel.c
===================================================================
@@ -111,8 +111,6 @@ int arch_process_options(int argc, char 
        };
        static const char short_options[] = KEXEC_ARCH_OPT_STR;
        int opt;
-       unsigned long value;
-       char *end;
 
        opterr = 0; /* Don't complain about unrecognized options here */
        while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
Signature · 8 lines
-- 
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#5 lore raw

PATCH 5/7 kexec-tools: Remove duplication declaration of BOOTLOADER_VERSION

In reply to Simon Horman

BOOTLOADER_VERSION is defined in kexec.h

---

 kexec/arch/mipsel/kexec-elf-mipsel.c |    1 -
 1 file changed, 1 deletion(-)
kexec/arch/mipsel/kexec-elf-mipsel.c +0 -1
Index: kexec-tools-mips/kexec/arch/mipsel/kexec-elf-mipsel.c
===================================================================
@@ -32,7 +32,6 @@
 static const int probe_debug = 0;
 
 #define BOOTLOADER         "kexec"
-#define BOOTLOADER_VERSION VERSION
 #define MAX_COMMAND_LINE   256
 
 #define UPSZ(X) ((sizeof(X) + 3) & ~3)
Signature · 8 lines
-- 
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#6 lore raw

PATCH 6/7 kexec-tools: Remove unused arch_options global variable

In reply to Simon Horman

---

 kexec/arch/mipsel/kexec-mipsel.c |    3 ---
 1 file changed, 3 deletions(-)
kexec/arch/mipsel/kexec-mipsel.c +0 -3
Index: kexec-tools-mips/kexec/arch/mipsel/kexec-mipsel.c
===================================================================
@@ -100,9 +100,6 @@ void arch_usage(void)
 {
 }
 
-static struct {
-} arch_options = {
-};
 int arch_process_options(int argc, char **argv)
 {
        static const struct option options[] = {
Signature · 8 lines
-- 
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#7 lore raw

PATCH 7/7 kexec-tools: Remove unused variables from elf_mipsel_load

In reply to Simon Horman

---

 kexec/arch/mipsel/kexec-elf-mipsel.c |    2 --
 1 file changed, 2 deletions(-)
kexec/arch/mipsel/kexec-elf-mipsel.c +0 -2
Index: kexec-tools-mips/kexec/arch/mipsel/kexec-elf-mipsel.c
===================================================================
@@ -116,9 +116,7 @@ int elf_mipsel_load(int argc, char **arg
        int command_line_len;
        unsigned char *setup_start;
        uint32_t setup_size;
-       int result;
        int opt;
-       int i;
 #define OPT_APPEND     (OPT_ARCH_MAX+0)
        static const struct option options[] = {
                KEXEC_ARCH_OPTIONS
Signature · 8 lines
-- 
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#8 lore raw
In reply to Simon Horman
Quoted 8 lines · Simon Horman

Hi,

After some recent questions by Tomasz Chmielewski I have dug up the mipsel port of kexec-tool and up-ported it to the lastest release of kexec-tools-testing, v20080227

ftp://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
http://lists.infradead.org/pipermail/kexec/2008-February/001346.html

(...)

Quoted 4 lines

I would really appreciate it if someone could test this code. And I would appreciate it even more if someone could help fix it up to a mergable state. Or alternatively, point me in the right direction to find people who want to help with this.

Added CC: to linux-mips mailing list since it might be of some interest there, too.

Signature · 7 lines
Tomasz Chmielewski
http://wpkg.org

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#9 lore raw
Quoted 12 lines · Tomasz Chmielewski
Quoted 8 lines · Simon Horman

Hi,

After some recent questions by Tomasz Chmielewski I have dug up the mipsel port of kexec-tool and up-ported it to the lastest release of kexec-tools-testing, v20080227

ftp://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
http://lists.infradead.org/pipermail/kexec/2008-February/001346.html

(...)

Quoted 7 lines
Quoted 4 lines

I would really appreciate it if someone could test this code. And I would appreciate it even more if someone could help fix it up to a mergable state. Or alternatively, point me in the right direction to find people who want to help with this.

Added CC: to linux-mips mailing list since it might be of some interest there, too.

I'll try to do the same for future posts.

Signature · 7 lines
Horms


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec