From: Pierre Morel <pmorel@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, frankja@linux.ibm.com,
david@redhat.com, thuth@redhat.com, cohuck@redhat.com
Subject: [kvm-unit-tests PATCH v9 05/12] s390x: export the clock get_clock_ms() utility
Date: Mon, 15 Jun 2020 11:31:54 +0200 [thread overview]
Message-ID: <1592213521-19390-6-git-send-email-pmorel@linux.ibm.com> (raw)
In-Reply-To: <1592213521-19390-1-git-send-email-pmorel@linux.ibm.com>
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..1791380
--- /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);
--
2.25.1
next prev parent reply other threads:[~2020-06-15 9:32 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 9:31 [kvm-unit-tests PATCH v9 00/12] s390x: Testing the Channel Subsystem I/O Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 01/12] s390x: Use PSW bits definitions in cstart Pierre Morel
2020-06-16 9:31 ` Thomas Huth
2020-06-16 9:39 ` Pierre Morel
2020-06-16 13:13 ` Thomas Huth
2020-06-16 13:58 ` Pierre Morel
2020-06-16 14:01 ` Pierre Morel
2020-06-16 15:14 ` Thomas Huth
2020-06-16 16:08 ` Pierre Morel
2020-06-16 16:11 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 02/12] s390x: Move control register bit definitions and add AFP to them Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 03/12] s390x: saving regs for interrupts Pierre Morel
2020-06-17 8:13 ` Cornelia Huck
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 04/12] s390x: interrupt registration Pierre Morel
2020-06-17 8:20 ` Cornelia Huck
2020-06-17 11:01 ` Pierre Morel
2020-06-15 9:31 ` Pierre Morel [this message]
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 06/12] s390x: clock and delays caluculations Pierre Morel
2020-06-16 9:35 ` Thomas Huth
2020-06-16 9:40 ` Pierre Morel
2020-06-17 8:27 ` Cornelia Huck
2020-06-17 11:04 ` Pierre Morel
2020-06-22 9:09 ` Janosch Frank
2020-06-30 16:13 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 07/12] s390x: define function to wait for interrupt Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 08/12] s390x: retrieve decimal and hexadecimal kernel parameters Pierre Morel
2020-06-16 9:47 ` Thomas Huth
2020-06-16 13:43 ` Pierre Morel
2020-06-17 8:37 ` Cornelia Huck
2020-06-17 11:05 ` Pierre Morel
2020-06-22 9:33 ` Janosch Frank
2020-06-22 10:57 ` Andrew Jones
2020-07-02 12:53 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 09/12] s390x: Library resources for CSS tests Pierre Morel
2020-06-16 10:31 ` Thomas Huth
2020-06-16 13:42 ` Pierre Morel
2020-06-17 8:42 ` Cornelia Huck
2020-06-17 11:08 ` Pierre Morel
2020-06-22 9:35 ` Janosch Frank
2020-06-24 12:26 ` Thomas Huth
2020-06-30 16:30 ` Pierre Morel
2020-06-15 9:31 ` [kvm-unit-tests PATCH v9 10/12] s390x: css: stsch, enumeration test Pierre Morel
2020-06-16 11:37 ` Thomas Huth
2020-06-16 13:42 ` Pierre Morel
2020-06-17 8:48 ` Cornelia Huck
2020-06-17 11:14 ` Pierre Morel
2020-06-15 9:32 ` [kvm-unit-tests PATCH v9 11/12] s390x: css: msch, enable test Pierre Morel
2020-06-16 11:43 ` Thomas Huth
2020-06-16 13:43 ` Pierre Morel
2020-06-17 8:54 ` Cornelia Huck
2020-06-17 11:25 ` Pierre Morel
2020-06-15 9:32 ` [kvm-unit-tests PATCH v9 12/12] s390x: css: ssch/tsch with sense and interrupt Pierre Morel
2020-06-17 9:54 ` Cornelia Huck
2020-06-17 11:55 ` Pierre Morel
2020-06-19 6:57 ` Cornelia Huck
2020-07-02 12:56 ` Pierre Morel
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=1592213521-19390-6-git-send-email-pmorel@linux.ibm.com \
--to=pmorel@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.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).