From: Janosch Frank <frankja@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
thuth@redhat.com, david@redhat.com
Subject: [PATCH v3 3/9] pc-bios: s390x: Move sleep and yield to helper.h
Date: Wed, 27 May 2020 03:49:14 -0400 [thread overview]
Message-ID: <20200527074920.43669-4-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200527074920.43669-1-frankja@linux.ibm.com>
They are definitely helper functions.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
pc-bios/s390-ccw/helper.h | 17 +++++++++++++++++
pc-bios/s390-ccw/s390-ccw.h | 16 ----------------
pc-bios/s390-ccw/virtio-net.c | 1 +
pc-bios/s390-ccw/virtio-scsi.c | 1 +
4 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/pc-bios/s390-ccw/helper.h b/pc-bios/s390-ccw/helper.h
index 78d5bc7442..d1b8b14d30 100644
--- a/pc-bios/s390-ccw/helper.h
+++ b/pc-bios/s390-ccw/helper.h
@@ -14,6 +14,7 @@
#define S390_CCW_HELPER_H
#include "s390-ccw.h"
+#include "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
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 9514b76596..c5820e43ae 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -142,24 +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
-static inline void sleep(unsigned int seconds)
-{
- ulong target = get_second() + seconds;
-
- while (get_second() < target) {
- yield();
- }
-}
-
static inline void IPL_assert(bool term, const char *message)
{
if (!term) {
diff --git a/pc-bios/s390-ccw/virtio-net.c b/pc-bios/s390-ccw/virtio-net.c
index 4de03728bb..f018d58994 100644
--- a/pc-bios/s390-ccw/virtio-net.c
+++ b/pc-bios/s390-ccw/virtio-net.c
@@ -20,6 +20,7 @@
#include "s390-ccw.h"
#include "virtio.h"
#include "time.h"
+#include "helper.h"
#ifndef DEBUG_VIRTIO_NET
#define DEBUG_VIRTIO_NET 0
diff --git a/pc-bios/s390-ccw/virtio-scsi.c b/pc-bios/s390-ccw/virtio-scsi.c
index 0620651da8..907f8a08bd 100644
--- a/pc-bios/s390-ccw/virtio-scsi.c
+++ b/pc-bios/s390-ccw/virtio-scsi.c
@@ -15,6 +15,7 @@
#include "scsi.h"
#include "virtio-scsi.h"
#include "time.h"
+#include "helper.h"
static ScsiDevice default_scsi_device;
static VirtioScsiCmdReq req;
--
2.25.1
next prev parent reply other threads:[~2020-05-27 7:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 7:49 [PATCH v3 0/9] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-05-27 7:49 ` [PATCH v3 1/9] pc-bios: s390x: cio.c cleanup and compile fix Janosch Frank
2020-05-27 8:24 ` Christian Borntraeger
2020-05-27 8:34 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 2/9] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-05-27 8:36 ` Christian Borntraeger
2020-05-27 8:41 ` Janosch Frank
2020-05-27 7:49 ` Janosch Frank [this message]
2020-05-27 8:34 ` [PATCH v3 3/9] pc-bios: s390x: Move sleep and yield to helper.h Christian Borntraeger
2020-05-27 8:35 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 4/9] pc-bios: s390x: Get rid of magic offsets into the lowcore Janosch Frank
2020-05-27 8:50 ` Christian Borntraeger
2020-05-27 11:23 ` Janosch Frank
2020-05-27 7:49 ` [PATCH v3 5/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant Janosch Frank
2020-05-27 7:49 ` [PATCH v3 6/9] pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR Janosch Frank
2020-05-27 7:49 ` [PATCH v3 7/9] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-05-27 7:49 ` [PATCH v3 8/9] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-05-27 7:49 ` [PATCH v3 9/9] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-05-27 10:30 ` [PATCH v3 0/9] pc-bios: s390x: Cleanup part 1 no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200527074920.43669-4-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).