mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
s390/kdump: fix virtual vs physical address confusion
Fix virtual vs physical address confusion (which currently are the same). Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com> Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
parent
86295cb453
commit
39218bcf94
1 changed files with 7 additions and 8 deletions
|
@ -29,8 +29,7 @@
|
||||||
#include <asm/nmi.h>
|
#include <asm/nmi.h>
|
||||||
#include <asm/sclp.h>
|
#include <asm/sclp.h>
|
||||||
|
|
||||||
typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long,
|
typedef void (*relocate_kernel_t)(unsigned long, unsigned long, unsigned long);
|
||||||
unsigned long);
|
|
||||||
|
|
||||||
extern const unsigned char relocate_kernel[];
|
extern const unsigned char relocate_kernel[];
|
||||||
extern const unsigned long long relocate_kernel_len;
|
extern const unsigned long long relocate_kernel_len;
|
||||||
|
@ -58,7 +57,7 @@ static void __do_machine_kdump(void *image)
|
||||||
* prefix register of this CPU to zero
|
* prefix register of this CPU to zero
|
||||||
*/
|
*/
|
||||||
memcpy(absolute_pointer(__LC_FPREGS_SAVE_AREA),
|
memcpy(absolute_pointer(__LC_FPREGS_SAVE_AREA),
|
||||||
(void *)(prefix + __LC_FPREGS_SAVE_AREA), 512);
|
phys_to_virt(prefix + __LC_FPREGS_SAVE_AREA), 512);
|
||||||
|
|
||||||
__load_psw_mask(PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA);
|
__load_psw_mask(PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA);
|
||||||
start_kdump = (void *)((struct kimage *) image)->start;
|
start_kdump = (void *)((struct kimage *) image)->start;
|
||||||
|
@ -209,7 +208,7 @@ int machine_kexec_prepare(struct kimage *image)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* Get the destination where the assembler code should be copied to.*/
|
/* Get the destination where the assembler code should be copied to.*/
|
||||||
reboot_code_buffer = (void *) page_to_phys(image->control_code_page);
|
reboot_code_buffer = page_to_virt(image->control_code_page);
|
||||||
|
|
||||||
/* Then copy it */
|
/* Then copy it */
|
||||||
memcpy(reboot_code_buffer, relocate_kernel, relocate_kernel_len);
|
memcpy(reboot_code_buffer, relocate_kernel, relocate_kernel_len);
|
||||||
|
@ -249,18 +248,18 @@ void machine_crash_shutdown(struct pt_regs *regs)
|
||||||
*/
|
*/
|
||||||
static void __do_machine_kexec(void *data)
|
static void __do_machine_kexec(void *data)
|
||||||
{
|
{
|
||||||
unsigned long diag308_subcode;
|
unsigned long data_mover, entry, diag308_subcode;
|
||||||
relocate_kernel_t data_mover;
|
|
||||||
struct kimage *image = data;
|
struct kimage *image = data;
|
||||||
|
|
||||||
data_mover = (relocate_kernel_t) page_to_phys(image->control_code_page);
|
data_mover = page_to_phys(image->control_code_page);
|
||||||
|
entry = virt_to_phys(&image->head);
|
||||||
diag308_subcode = DIAG308_CLEAR_RESET;
|
diag308_subcode = DIAG308_CLEAR_RESET;
|
||||||
if (sclp.has_iplcc)
|
if (sclp.has_iplcc)
|
||||||
diag308_subcode |= DIAG308_FLAG_EI;
|
diag308_subcode |= DIAG308_FLAG_EI;
|
||||||
s390_reset_system();
|
s390_reset_system();
|
||||||
|
|
||||||
__arch_local_irq_stnsm(0xfb); /* disable DAT - avoid no-execute */
|
__arch_local_irq_stnsm(0xfb); /* disable DAT - avoid no-execute */
|
||||||
(*data_mover)(&image->head, image->start, diag308_subcode);
|
(*(relocate_kernel_t)data_mover)(entry, image->start, diag308_subcode);
|
||||||
|
|
||||||
/* Die if kexec returns */
|
/* Die if kexec returns */
|
||||||
disabled_wait();
|
disabled_wait();
|
||||||
|
|
Loading…
Reference in a new issue