sh: Improved kexec support for SuperH

@@ -105,6 +105,7 @@ const struct arch_map_entry arches[] = {
 	{ "sh3", KEXEC_ARCH_DEFAULT },
 	{ "sh4", KEXEC_ARCH_DEFAULT },
 	{ "sh4a", KEXEC_ARCH_DEFAULT },
+	{ "sh4al-dsp", KEXEC_ARCH_DEFAULT },
 	{ 0 },
 };
 

@@ -22,19 +22,31 @@
 #define MAX_MEMORY_RANGES 64
 static struct memory_range memory_range[MAX_MEMORY_RANGES];
 
+static int kexec_sh_memory_range_callback(void *data, int nr,
+					  char *str,
+					  unsigned long base,
+					  unsigned long length)
+{
+	if (nr < MAX_MEMORY_RANGES) {
+		memory_range[nr].start = base;
+		memory_range[nr].end = base + length - 1;
+		memory_range[nr].type = RANGE_RAM;
+		return 0;
+	}
+
+	return 1;
+}
+
 /* Return a sorted list of available memory ranges. */
 int get_memory_ranges(struct memory_range **range, int *ranges,
 		      unsigned long kexec_flags)
 {
-	int memory_ranges;
+	int nr;
 
-	memory_ranges = 0;
-	memory_range[memory_ranges].start = 0x08000000;
-	memory_range[memory_ranges].end   = 0x10000000;
-	memory_range[memory_ranges].type  = RANGE_RAM;
-	memory_ranges++;
+	nr = kexec_iomem_for_each_line("System RAM\n",
+				       kexec_sh_memory_range_callback, NULL);
 	*range = memory_range;
-	*ranges = memory_ranges;
+	*ranges = nr;
 	return 0;
 }
 

@@ -168,3 +168,32 @@ int is_crashkernel_mem_reserved(void)
 	return 0; /* kdump is not supported on this platform (yet) */
 }
 
+unsigned long virt_to_phys(unsigned long addr)
+{
+	unsigned long seg = addr & 0xe0000000;
+	if (seg != 0x80000000 && seg != 0xc0000000)
+		die("Virtual address %p is not in P1 or P2\n", (void *)addr);
+
+	return addr - seg;
+}
+
+/*
+ * add_segment() should convert base to a physical address on superh,
+ * while the default is just to work with base as is */
+void add_segment(struct kexec_info *info, const void *buf, size_t bufsz,
+		 unsigned long base, size_t memsz)
+{
+	add_segment_phys_virt(info, buf, bufsz, base, memsz, 1);
+}
+
+/*
+ * add_buffer() should convert base to a physical address on superh,
+ * while the default is just to work with base as is */
+unsigned long add_buffer(struct kexec_info *info, const void *buf,
+			 unsigned long bufsz, unsigned long memsz,
+			 unsigned long buf_align, unsigned long buf_min,
+			 unsigned long buf_max, int buf_end)
+{
+	return add_buffer_phys_virt(info, buf, bufsz, memsz, buf_align,
+				    buf_min, buf_max, buf_end, 1);
+}

@@ -96,8 +96,8 @@ int zImage_sh_load(int argc, char **argv
         paraml = (unsigned long *)param;
 	// paraml[0] = 1;  // readonly flag is set as default
 
-	add_segment(info, param, 4096, empty_zero, 4096);
-	add_segment(info, buf,   len,  (area | 0x00210000), len);
+	add_segment(info, param, 4096, 0x80000000 | empty_zero, 4096);
+	add_segment(info, buf,   len,  (area | 0x80210000), len);
 
 	/* For now we don't have arguments to pass :( */
 	info->entry = (void *)(0x80210000 | area);

@@ -65,16 +65,8 @@ void arch_usage(void)
     " none\n\n"
     "Default options:\n"
     " --append=\"%s\"\n"
-    " --empty-zero=0x%08x\n\n"
     " STRING of --appned is set form /proc/cmdline as default.\n"
-    " ADDRESS of --empty-zero can be set SHELL environment variable\n"
-    " KEXEC_EMPTY_ZERO as default.\n\n"
-    " ADDRESS can be get in the following method in your system. \n"
-    " 1) \"grep empty_zero /proc/kallsyms\". \n"
-    " 2) \"grep empty_zero System.map\". \n"
-    " 3) CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET in your kernel\n"
-    "    config file.\n"
-    ,get_append(), (unsigned int) get_empty_zero(NULL));
+    ,get_append());
 
 }
 

@@ -130,21 +122,6 @@ void arch_update_purgatory(struct kexec_
 {
 }
 
-
-unsigned long get_empty_zero(char *s)
-{
-        char *env;
-
-	env = getenv("KEXEC_EMPTY_ZERO");
-
-	if(s){
-	  env = s;
-	}else if(!env){
-	  env = "0x0c001000";
-	}
-	return 0x1fffffff & strtoul(env,(char **)NULL,0);
-}
-
 char append_buf[256];
 
 char *get_append(void)

@@ -162,6 +139,21 @@ char *get_append(void)
         return append_buf;
 }
 
+void kexec_sh_setup_zero_page(char *zero_page_buf, int zero_page_size,
+			      char *cmd_line)
+{
+	int n = zero_page_size - 0x100;
+
+	memset(zero_page_buf, 0, zero_page_size);
+	
+	if (cmd_line) {
+		if (n > strlen(cmd_line))
+			n = strlen(cmd_line);
+
+		memcpy(zero_page_buf + 0x100, cmd_line, n);
+		zero_page_buf[0x100 + n] = '\0';
+	}
+}
 
 int is_crashkernel_mem_reserved(void)
 {

@@ -12,6 +12,7 @@ int netbsd_sh_load(int argc, char **argv
 void netbsd_sh_usage(void);
 
 char *get_append(void);
-unsigned long get_empty_zero(char *s);
+void kexec_sh_setup_zero_page(char *zero_page_buf, int zero_page_size,
+			      char *cmd_line);
 
 #endif /* KEXEC_SH_H */

115 lines not on this page · raw message

@@ -79,7 +79,8 @@ int zImage_sh_load(int argc, char **argv
 {
         char *command_line;
 	int opt, k;
-	unsigned long empty_zero, area, zero_page_base, zero_page_size;
+	unsigned long empty_zero, zero_page_base, zero_page_size;
+	unsigned long image_base;
 	char *param;
 
 	static const struct option options[] = {

@@ -137,8 +138,12 @@ int zImage_sh_load(int argc, char **argv
 	add_segment(info, param, zero_page_size,
 		    0x80000000 | zero_page_base, zero_page_size);
 
-	area = empty_zero & 0x1c000000;
-	add_segment(info, buf,   len,  (area | 0x80210000), len);
-	info->entry = (void *)(0x80210000 | area);
+	/* load image a bit above the zero page, round up to 64k
+	 * the zImage will relocate itself, but only up seems supported.
+	 */
+
+	image_base = (empty_zero + (0x10000 - 1)) & ~(0x10000 - 1);
+	add_segment(info, buf, len, image_base, len);
+	info->entry = (void *)image_base;
 	return 0;
 }

114 lines not on this page · raw message

@@ -53,6 +53,7 @@ int get_memory_ranges(struct memory_rang
 /* Supported file types and callbacks */
 struct file_type file_type[] = {
        {"zImage-sh", zImage_sh_probe, zImage_sh_load, zImage_sh_usage},
+       {"elf-sh", elf_sh_probe, elf_sh_load, elf_sh_usage},
        {"netbsd-sh", netbsd_sh_probe, netbsd_sh_load, netbsd_sh_usage},
 };
 int file_types = sizeof(file_type) / sizeof(file_type[0]);

@@ -6,6 +6,11 @@ int zImage_sh_load(int argc, char **argv
 	struct kexec_info *info);
 void zImage_sh_usage(void);
 
+int elf_sh_probe(const char *buf, off_t len);
+int elf_sh_load(int argc, char **argv, const char *buf, off_t len,
+	struct kexec_info *info);
+void elf_sh_usage(void);
+
 int netbsd_sh_probe(const char *buf, off_t len);
 int netbsd_sh_load(int argc, char **argv, const char *buf, off_t len,
 	struct kexec_info *info);

@@ -65,16 +65,16 @@ void elf_sh_usage(void)
 		);
 }
 
-int elf_sh_load(int argc, char **argv, const char *buf, off_t len, 
-	struct kexec_info *info)
+int elf_sh_load(int argc, char **argv, const char *buf, off_t len,
+		struct kexec_info *info)
 {
 	struct mem_ehdr ehdr;
-	const char *command_line;
+	char *command_line;
 	struct mem_sym sym;
 	int opt;
 	static const struct option options[] = {
 		KEXEC_ARCH_OPTIONS
-		{ 0, 			0, NULL, 0 },
+		{ 0, 0, 0, 0 },
 	};
 
 	static const char short_options[] = KEXEC_OPT_STR "";

@@ -105,7 +105,7 @@ int elf_sh_load(int argc, char **argv, c
 
 	/* If we're booting a vmlinux then fill in empty_zero_page */
 	if (elf_rel_find_symbol(&ehdr, "empty_zero_page", &sym) == 0) {
-		unsigned char *zp = (void *)ehdr.e_shdr[sym.st_shndx].sh_data;
+		char *zp = (void *)ehdr.e_shdr[sym.st_shndx].sh_data;
 
 		kexec_sh_setup_zero_page(zp, 4096, command_line);
 	}