On 24.03.20 16:08, Janosch Frank wrote:
> Let's consolidate timing related functions into one header.
>
> Signed-off-by: Janosch Frank <fran...@linux.ibm.com>
> ---
> pc-bios/s390-ccw/menu.c | 1 +
> pc-bios/s390-ccw/netmain.c | 15 +++----------
> pc-bios/s390-ccw/s390-ccw.h | 18 ----------------
> pc-bios/s390-ccw/time.h | 39 ++++++++++++++++++++++++++++++++++
> pc-bios/s390-ccw/virtio-net.c | 1 +
> pc-bios/s390-ccw/virtio-scsi.c | 1 +
> pc-bios/s390-ccw/virtio.c | 18 +++-------------
> 7 files changed, 48 insertions(+), 45 deletions(-)
> create mode 100644 pc-bios/s390-ccw/time.h
>
> diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
> index ce3815b2010d20cb..7925c33248836913 100644
> --- a/pc-bios/s390-ccw/menu.c
> +++ b/pc-bios/s390-ccw/menu.c
> @@ -12,6 +12,7 @@
> #include "libc.h"
> #include "s390-ccw.h"
> #include "sclp.h"
> +#include "time.h"
>
> #define KEYCODE_NO_INP '\0'
> #define KEYCODE_ESCAPE '\033'
> diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
> index 309ffa30d9922077..a8e2b1b6233735d8 100644
> --- a/pc-bios/s390-ccw/netmain.c
> +++ b/pc-bios/s390-ccw/netmain.c
> @@ -35,6 +35,7 @@
> #include "s390-ccw.h"
> #include "cio.h"
> #include "virtio.h"
> +#include "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_milli() + val;
> }
>
> int get_timer(void)
> {
> - return dest_timer - get_timer_ms();
> + return dest_timer - get_time_milli();
> }
>
> int get_sec_ticks(void)
> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
> index 21f27e79906ea297..c5820e43aed143d0 100644
> --- a/pc-bios/s390-ccw/s390-ccw.h
> +++ b/pc-bios/s390-ccw/s390-ccw.h
> @@ -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);
> @@ -144,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/time.h b/pc-bios/s390-ccw/time.h
> new file mode 100644
> index 0000000000000000..98f5acaa33b500bd
> --- /dev/null
> +++ b/pc-bios/s390-ccw/time.h
> @@ -0,0 +1,39 @@
> +#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_milli(void)
Milli Vanilli?
Please, just use common abbreviations. "ms" is certainly good enough.
--
Thanks,
David / dhildenb
