| Message ID | 1589818051-20549-6-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 18/05/2020 18.07, Pierre Morel wrote: > To serve multiple times, the function get_clock_ms() is moved > from intercept.c test to the new file asm/time.h. > > Signed-off-by: Pierre Morel <pmorel@linux.ibm.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: Cornelia Huck <cohuck@redhat.com> > --- > lib/s390x/asm/time.h | 26 ++++++++++++++++++++++++++ > s390x/intercept.c | 11 +---------- > 2 files changed, 27 insertions(+), 10 deletions(-) > create mode 100644 lib/s390x/asm/time.h > > diff --git a/lib/s390x/asm/time.h b/lib/s390x/asm/time.h > new file mode 100644 > index 0000000..25c7a3c > --- /dev/null > +++ b/lib/s390x/asm/time.h > @@ -0,0 +1,26 @@ > +/* > + * Clock utilities for s390 > + * > + * Authors: > + * Thomas Huth <thuth@redhat.com> > + * > + * Copied from the s390/intercept test by: > + * 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_TIME_H_ > +#define _ASM_S390X_TIME_H_ Please also remove the underscores at the beginning (and preferably also at the end) here. Thanks, Thomas
On 2020-05-26 20:10, Thomas Huth wrote: > On 18/05/2020 18.07, Pierre Morel wrote: >> To serve multiple times, the function get_clock_ms() is moved >> from intercept.c test to the new file asm/time.h. ...snip... >> index 0000000..25c7a3c >> --- /dev/null >> +++ b/lib/s390x/asm/time.h >> @@ -0,0 +1,26 @@ >> +/* >> + * Clock utilities for s390 >> + * >> + * Authors: >> + * Thomas Huth <thuth@redhat.com> >> + * >> + * Copied from the s390/intercept test by: >> + * 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_TIME_H_ >> +#define _ASM_S390X_TIME_H_ > > Please also remove the underscores at the beginning (and preferably also > at the end) here. OK, Regards, Pierre
diff --git a/lib/s390x/asm/time.h b/lib/s390x/asm/time.h new file mode 100644 index 0000000..25c7a3c --- /dev/null +++ b/lib/s390x/asm/time.h @@ -0,0 +1,26 @@ +/* + * Clock utilities for s390 + * + * Authors: + * Thomas Huth <thuth@redhat.com> + * + * Copied from the s390/intercept test by: + * 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_TIME_H_ +#define _ASM_S390X_TIME_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 5f46b82..2e38257 100644 --- a/s390x/intercept.c +++ b/s390x/intercept.c @@ -14,6 +14,7 @@ #include <asm/interrupt.h> #include <asm/page.h> #include <asm/facility.h> +#include <asm/time.h> static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); @@ -153,16 +154,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);