[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 11/24] s390-ccw.img: replace while loop with a disable
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 11/24] s390-ccw.img: replace while loop with a disabled wait on s390 bios |
Date: |
Fri, 26 Apr 2013 20:19:20 +0200 |
From: Christian Borntraeger <address@hidden>
dont waste cpu power on an error condition. Lets stop the guest
with a disabled wait.
Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
pc-bios/s390-ccw/main.c | 2 ++
pc-bios/s390-ccw/s390-ccw.h | 3 +++
pc-bios/s390-ccw/start.S | 15 +++++++++++++++
3 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 0913aac..67f4987 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -16,6 +16,7 @@ char stack[PAGE_SIZE * 8]
__attribute__((__aligned__(PAGE_SIZE)));
void virtio_panic(const char *string)
{
sclp_print(string);
+ disabled_wait();
while (1) { }
}
@@ -52,5 +53,6 @@ int main(void)
virtio_setup();
if (zipl_load() < 0)
sclp_print("Failed to load OS from hard disk\n");
+ disabled_wait();
while (1) { }
}
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index a03dbaf..8241b0a 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -45,6 +45,9 @@ typedef unsigned long long __u64;
#include "cio.h"
+/* start.s */
+void disabled_wait(void);
+
/* main.c */
void virtio_panic(const char *string);
diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S
index c2b9a19..09deee7 100644
--- a/pc-bios/s390-ccw/start.S
+++ b/pc-bios/s390-ccw/start.S
@@ -3,6 +3,7 @@
* into the pc-bios directory of qemu.
*
* Copyright (c) 2013 Alexander Graf <address@hidden>
+ * Copyright 2013 IBM Corp.
*
* This work is licensed under the terms of the GNU GPL, version 2 or (at
* your option) any later version. See the COPYING file in the top-level
@@ -14,3 +15,17 @@ _start:
larl %r15, stack + 0x8000 /* Set up stack */
j main /* And call C */
+
+/*
+ * void disabled_wait(void)
+ *
+ * stops the current guest cpu.
+ */
+ .globl disabled_wait
+disabled_wait:
+ larl %r1,disabled_wait_psw
+ lpswe 0(%r1)
+
+ .align 8
+disabled_wait_psw:
+ .quad 0x0002000180000000,0x0000000000000000
--
1.6.0.2
- [Qemu-ppc] [PULL 00/24] s390 patch queue 2013-04-26, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 02/24] S390: IPL: Support ELF firmware, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 04/24] S390: ccw firmware: Add start assembly, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 01/24] S390: Make IPL reset address dynamic, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 13/24] s390-ccw.img: Take care of the elf->img transition, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 11/24] s390-ccw.img: replace while loop with a disabled wait on s390 bios,
Alexander Graf <=
- [Qemu-ppc] [PATCH 10/24] S390: ccw firmware: Add Makefile, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 12/24] s390-ccw.img: build s390-ccw rom on s3900 system by default, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 14/24] s390-ccw.img: Fix compile warning in s390 ccw virtio code, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 05/24] S390: ccw firmware: Add main program, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 08/24] S390: ccw firmware: Add glue header, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 09/24] S390: ccw firmware: Add bootmap interpreter, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 18/24] s390-ccw.img: Get queue config from host., Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 23/24] Utilize selective runtime reg sync for hot code paths, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 20/24] S390: CCW: Use new, working firmware by default, Alexander Graf, 2013/04/26
- [Qemu-ppc] [PATCH 06/24] S390: ccw firmware: Add sclp output, Alexander Graf, 2013/04/26