OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc-bios: s390x: Consolidate timing functions into time.h

Browse Source 
Let's consolidate timing related functions into one header.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200624075226.92728-3-frankja@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Janosch Frank 2020-06-24 03:52:16 -04:00 committed by Thomas Huth
parent 8c6cc7b9df
commit e70bc57ba0
7 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc-bios/s390-ccw/menu.c
View File

@ -12,6 +12,7 @@
#include "libc.h"
#include "s390-ccw.h"
#include "sclp.h"
#include "s390-time.h"
#define KEYCODE_NO_INP '\0'
#define KEYCODE_ESCAPE '\033'

15
pc-bios/s390-ccw/netmain.c
View File

@ -35,6 +35,7 @@
#include "s390-ccw.h"
#include "cio.h"
#include "virtio.h"
#include "s390-time.h"
#define DEFAULT_BOOT_RETRIES 10
#define DEFAULT_TFTP_RETRIES 20
@ -57,24 +58,14 @@ static SubChannelId net_schid = { .one = 1 };
static uint8_t mac[6];
static uint64_t dest_timer;
static uint64_t get_timer_ms(void)
{
uint64_t clk;
asm volatile(" stck %0 " : : "Q"(clk) : "memory");
/* Bit 51 is incremented each microsecond */
return (clk >> (63 - 51)) / 1000;
}
void set_timer(int val)
{
dest_timer = get_timer_ms() + val;
dest_timer = get_time_ms() + val;
}
int get_timer(void)
{
return dest_timer - get_timer_ms();
return dest_timer - get_time_ms();
}
int get_sec_ticks(void)

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

@ -74,8 +74,6 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
bool virtio_is_supported(SubChannelId schid);
void virtio_blk_setup_device(SubChannelId schid);
int virtio_read(ulong sector, void *load_addr);
u64 get_clock(void);
ulong get_second(void);
/* bootmap.c */
void zipl_load(void);
@ -153,11 +151,13 @@ static inline void yield(void)
#define MAX_SECTOR_SIZE 4096
#include "s390-time.h"
static inline void sleep(unsigned int seconds)
{
ulong target = get_second() + seconds;
ulong target = get_time_seconds() + seconds;
while (get_second() < target) {
while (get_time_seconds() < target) {
yield();
}
}

23
pc-bios/s390-ccw/s390-time.h Normal file
View File

@ -0,0 +1,23 @@
#ifndef TIME_H
#define TIME_H
static inline u64 get_clock(void)
{
u64 r;
asm volatile("stck %0" : "=Q" (r) : : "cc");
return r;
}
static inline u64 get_time_ms(void)
{
/* Bit 51 is incremented each microsecond */
return (get_clock() >> 12) / 1000;
}
static inline u64 get_time_seconds(void)
{
return get_time_ms() / 1000;
}
#endif

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

@ -19,6 +19,7 @@
#include <ethernet.h>
#include "s390-ccw.h"
#include "virtio.h"
#include "s390-time.h"
#ifndef DEBUG_VIRTIO_NET
#define DEBUG_VIRTIO_NET 0

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

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

18
pc-bios/s390-ccw/virtio.c
View File

@ -15,6 +15,7 @@
#include "virtio-scsi.h"
#include "bswap.h"
#include "helper.h"
#include "s390-time.h"
#define VRING_WAIT_REPLY_TIMEOUT 30
@ -157,19 +158,6 @@ void vring_send_buf(VRing *vr, void *p, int len, int flags)
}
}
u64 get_clock(void)
{
u64 r;
asm volatile("stck %0" : "=Q" (r) : : "cc");
return r;
}
ulong get_second(void)
{
return (get_clock() >> 12) / 1000000;
}
int vr_poll(VRing *vr)
{
if (vr->used->idx == vr->used_idx) {
@ -194,7 +182,7 @@ int vr_poll(VRing *vr)
*/
int vring_wait_reply(void)
{
ulong target_second = get_second() + vdev.wait_reply_timeout;
ulong target_second = get_time_seconds() + vdev.wait_reply_timeout;
/* Wait for any queue to be updated by the host */
do {
@ -207,7 +195,7 @@ int vring_wait_reply(void)
if (r) {
return 0;
}
} while (!vdev.wait_reply_timeout || (get_second() < target_second));
} while (!vdev.wait_reply_timeout || (get_time_seconds() < target_second));
return 1;
}