haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-bios: s390x: Move sleep and yield to helper.h 

They are definitely helper functions.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200624075226.92728-4-frankja@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
stable-6.0
Janosch Frank 2020-06-24 03:52:17 -04:00 committed by Thomas Huth
parent e70bc57ba0
commit 12ea90dbd8
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pc-bios/s390-ccw/helper.h
View File

@ -14,6 +14,7 @@
#define S390_CCW_HELPER_H
#include "s390-ccw.h"
#include "s390-time.h"
/* Avoids compiler warnings when casting a pointer to a u32 */
static inline uint32_t ptr2u32(void *ptr)
@ -28,4 +29,20 @@ static inline void *u32toptr(uint32_t n)
return (void *)(uint64_t)n;
}
static inline void yield(void)
{
asm volatile ("diag 0,0,0x44"
: :
: "memory", "cc");
}
static inline void sleep(unsigned int seconds)
{
ulong target = get_time_seconds() + seconds;
while (get_time_seconds() < target) {
yield();
}
}
#endif

18
pc-bios/s390-ccw/s390-ccw.h
View File

@ -142,26 +142,8 @@ static inline void debug_print_addr(const char *desc, void *p)
#define KVM_S390_VIRTIO_SET_STATUS 2
#define KVM_S390_VIRTIO_CCW_NOTIFY 3
static inline void yield(void)
{
asm volatile ("diag 0,0,0x44"
: :
: "memory", "cc");
}
#define MAX_SECTOR_SIZE 4096
#include "s390-time.h"
static inline void sleep(unsigned int seconds)
{
ulong target = get_time_seconds() + seconds;
while (get_time_seconds() < target) {
yield();
}
}
static inline void IPL_assert(bool term, const char *message)
{
if (!term) {

1
pc-bios/s390-ccw/virtio-net.c
View File

@ -20,6 +20,7 @@
#include "s390-ccw.h"
#include "virtio.h"
#include "s390-time.h"
#include "helper.h"
#ifndef DEBUG_VIRTIO_NET
#define DEBUG_VIRTIO_NET 0

1
pc-bios/s390-ccw/virtio-scsi.c
View File

@ -15,6 +15,7 @@
#include "scsi.h"
#include "virtio-scsi.h"
#include "s390-time.h"
#include "helper.h"
static ScsiDevice default_scsi_device;
static VirtioScsiCmdReq req;