| Message ID | 1574945167-29677-5-git-send-email-pmorel@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: Testing the Channel Subsystem I/O | expand |
On 28.11.19 13:46, Pierre Morel wrote: > To serve multiple times, the function get_clock_ms() is moved > from intercept.c test to the new file asm/clock.h. I'd probably call this "tod.h" instead. Nevermind. Reviewed-by: David Hildenbrand <david@redhat.com>
On 2019-11-29 13:03, David Hildenbrand wrote: > On 28.11.19 13:46, Pierre Morel wrote: >> To serve multiple times, the function get_clock_ms() is moved >> from intercept.c test to the new file asm/clock.h. > > I'd probably call this "tod.h" instead. Nevermind. > > Reviewed-by: David Hildenbrand <david@redhat.com> > > Thanks, Pierre
On 11/29/19 1:03 PM, David Hildenbrand wrote: > On 28.11.19 13:46, Pierre Morel wrote: >> To serve multiple times, the function get_clock_ms() is moved >> from intercept.c test to the new file asm/clock.h. > > I'd probably call this "tod.h" instead. Nevermind. time.h / timing.h? I'm planning on adding cpu timer functions somewhen next year... > > Reviewed-by: David Hildenbrand <david@redhat.com> > >
On 2019-12-02 12:13, Janosch Frank wrote: > On 11/29/19 1:03 PM, David Hildenbrand wrote: >> On 28.11.19 13:46, Pierre Morel wrote: >>> To serve multiple times, the function get_clock_ms() is moved >>> from intercept.c test to the new file asm/clock.h. >> >> I'd probably call this "tod.h" instead. Nevermind. > > time.h / timing.h? > I'm planning on adding cpu timer functions somewhen next year... as long as you both agree, I take the name you want. > >> >> Reviewed-by: David Hildenbrand <david@redhat.com> >> >> > >
diff --git a/lib/s390x/asm/clock.h b/lib/s390x/asm/clock.h new file mode 100644 index 0000000..e293741 --- /dev/null +++ b/lib/s390x/asm/clock.h @@ -0,0 +1,25 @@ +/* + * Clock utilities for s390 + * + * Authors: + * Thomas Huth <thuth@redhat.com> + * Pierre Morel <pmorel@linux.ibm.com> + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2. + */ +#ifndef _ASM_S390X_CLOCK_H_ +#define _ASM_S390X_CLOCK_H_ + +static inline uint64_t get_clock_ms(void) +{ + uint64_t clk; + + asm volatile(" stck %0 " : : "Q"(clk) : "memory"); + + /* Bit 51 is incrememented each microsecond */ + return (clk >> (63 - 51)) / 1000; +} + + +#endif diff --git a/s390x/intercept.c b/s390x/intercept.c index 404b4c6..ab08533 100644 --- a/s390x/intercept.c +++ b/s390x/intercept.c @@ -13,6 +13,7 @@ #include <asm/asm-offsets.h> #include <asm/interrupt.h> #include <asm/page.h> +#include <asm/clock.h> static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); @@ -159,16 +160,6 @@ static void test_testblock(void) check_pgm_int_code(PGM_INT_CODE_ADDRESSING); } -static uint64_t get_clock_ms(void) -{ - uint64_t clk; - - asm volatile(" stck %0 " : : "Q"(clk) : "memory"); - - /* Bit 51 is incrememented each microsecond */ - return (clk >> (63 - 51)) / 1000; -} - struct { const char *name; void (*func)(void);
To serve multiple times, the function get_clock_ms() is moved from intercept.c test to the new file asm/clock.h. Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> --- lib/s390x/asm/clock.h | 25 +++++++++++++++++++++++++ s390x/intercept.c | 11 +---------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 lib/s390x/asm/clock.h