s390/kexec_file: Simplify parmarea access

Access the parmarea in head.S via a struct instead of individual offsets.

While at it make the fields in the parmarea .quads.

Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

3 files changed, 8 insertions, 17 deletions

diff --git a/arch/s390/kernel/kexec_elf.c b/arch/s390/kernel/kexec_elf.c
index 5cf340b778f1..1cdf90767cba 100644
--- a/arch/s390/kernel/kexec_elf.c
+++ b/arch/s390/kernel/kexec_elf.c
@@ -42,6 +42,7 @@ static int kexec_file_add_elf_kernel(struct kimage *image,
 
 		if (entry - phdr->p_paddr < phdr->p_memsz) {
 			data->kernel_buf = buf.buffer;
+			data->parm = buf.buffer + PARMAREA;
 			data->memsz += STARTUP_NORMAL_OFFSET;
 
 			buf.buffer += STARTUP_NORMAL_OFFSET;
diff --git a/arch/s390/kernel/kexec_image.c b/arch/s390/kernel/kexec_image.c
index 3800852595e8..d9025adc2bbb 100644
--- a/arch/s390/kernel/kexec_image.c
+++ b/arch/s390/kernel/kexec_image.c
@@ -32,6 +32,7 @@ static int kexec_file_add_image_kernel(struct kimage *image,
 	ret = kexec_add_buffer(&buf);
 
 	data->kernel_buf = kernel;
+	data->parm = (void *)kernel + PARMAREA;
 	data->memsz += buf.memsz + STARTUP_NORMAL_OFFSET;
 
 	return ret;
diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c
index 32023b4f9dc0..8a85ecd8428c 100644
--- a/arch/s390/kernel/machine_kexec_file.c
+++ b/arch/s390/kernel/machine_kexec_file.c
@@ -25,24 +25,12 @@ int *kexec_file_update_kernel(struct kimage *image,
 	if (image->cmdline_buf_len >= ARCH_COMMAND_LINE_SIZE)
 		return ERR_PTR(-EINVAL);
 
-	if (image->cmdline_buf_len)
-		memcpy(data->kernel_buf + COMMAND_LINE_OFFSET,
-		       image->cmdline_buf, image->cmdline_buf_len);
+	memcpy(data->parm->command_line, image->cmdline_buf,
+	       image->cmdline_buf_len);
 
 	if (image->type == KEXEC_TYPE_CRASH) {
-		loc = (unsigned long *)(data->kernel_buf + OLDMEM_BASE_OFFSET);
-		*loc = crashk_res.start;
-
-		loc = (unsigned long *)(data->kernel_buf + OLDMEM_SIZE_OFFSET);
-		*loc = crashk_res.end - crashk_res.start + 1;
-	}
-
-	if (image->initrd_buf) {
-		loc = (unsigned long *)(data->kernel_buf + INITRD_START_OFFSET);
-		*loc = data->initrd_load_addr;
-
-		loc = (unsigned long *)(data->kernel_buf + INITRD_SIZE_OFFSET);
-		*loc = image->initrd_buf_len;
+		data->parm->oldmem_base = crashk_res.start;
+		data->parm->oldmem_size = crashk_res.end - crashk_res.start + 1;
 	}
 
 	return NULL;
@@ -127,7 +115,8 @@ int kexec_file_add_initrd(struct kimage *image, struct s390_load_data *data,
 		buf.mem += crashk_res.start;
 	buf.memsz = buf.bufsz;
 
-	data->initrd_load_addr = buf.mem;
+	data->parm->initrd_start = buf.mem;
+	data->parm->initrd_size = buf.memsz;
 	data->memsz += buf.memsz;
 
 	ret = kexec_add_buffer(&buf);