mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Vincenzo Frascino" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Paul Burton <paulburton@kernel.org>, x86 <x86@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] mips: vdso: Enable mips to use common headers
Date: Sat, 21 Mar 2020 14:33:24 -0000	[thread overview]
Message-ID: <158480120493.28353.16624453777499675820.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200320145351.32292-23-vincenzo.frascino@arm.com>

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     c135fc875ce363ff8405a8e64408bca0aa2a865b
Gitweb:        https://git.kernel.org/tip/c135fc875ce363ff8405a8e64408bca0aa2a865b
Author:        Vincenzo Frascino <vincenzo.frascino@arm.com>
AuthorDate:    Fri, 20 Mar 2020 14:53:47 
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Sat, 21 Mar 2020 15:24:02 +01:00

mips: vdso: Enable mips to use common headers

Enable mips to use only the common headers in the implementation of
the vDSO library.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Paul Burton <paulburton@kernel.org>
Link: https://lkml.kernel.org/r/20200320145351.32292-23-vincenzo.frascino@arm.com

---
 arch/mips/include/asm/processor.h         | 16 +-------------
 arch/mips/include/asm/vdso/gettimeofday.h |  4 +---
 arch/mips/include/asm/vdso/processor.h    | 27 ++++++++++++++++++++++-
 3 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 arch/mips/include/asm/vdso/processor.h

diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h
index 7619ad3..4c9cc66 100644
--- a/arch/mips/include/asm/processor.h
+++ b/arch/mips/include/asm/processor.h
@@ -22,6 +22,7 @@
 #include <asm/dsemul.h>
 #include <asm/mipsregs.h>
 #include <asm/prefetch.h>
+#include <asm/vdso/processor.h>
 
 /*
  * System setup and hardware flags..
@@ -385,21 +386,6 @@ unsigned long get_wchan(struct task_struct *p);
 #define KSTK_ESP(tsk) (task_pt_regs(tsk)->regs[29])
 #define KSTK_STATUS(tsk) (task_pt_regs(tsk)->cp0_status)
 
-#ifdef CONFIG_CPU_LOONGSON64
-/*
- * Loongson-3's SFB (Store-Fill-Buffer) may buffer writes indefinitely when a
- * tight read loop is executed, because reads take priority over writes & the
- * hardware (incorrectly) doesn't ensure that writes will eventually occur.
- *
- * Since spin loops of any kind should have a cpu_relax() in them, force an SFB
- * flush from cpu_relax() such that any pending writes will become visible as
- * expected.
- */
-#define cpu_relax()	smp_mb()
-#else
-#define cpu_relax()	barrier()
-#endif
-
 /*
  * Return_address is a replacement for __builtin_return_address(count)
  * which on certain architectures cannot reasonably be implemented in GCC
diff --git a/arch/mips/include/asm/vdso/gettimeofday.h b/arch/mips/include/asm/vdso/gettimeofday.h
index 88c3de1..c63ddca 100644
--- a/arch/mips/include/asm/vdso/gettimeofday.h
+++ b/arch/mips/include/asm/vdso/gettimeofday.h
@@ -13,12 +13,8 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/compiler.h>
-#include <linux/time.h>
-
 #include <asm/vdso/vdso.h>
 #include <asm/clocksource.h>
-#include <asm/io.h>
 #include <asm/unistd.h>
 #include <asm/vdso.h>
 
diff --git a/arch/mips/include/asm/vdso/processor.h b/arch/mips/include/asm/vdso/processor.h
new file mode 100644
index 0000000..511c95d
--- /dev/null
+++ b/arch/mips/include/asm/vdso/processor.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2020 ARM Ltd.
+ */
+#ifndef __ASM_VDSO_PROCESSOR_H
+#define __ASM_VDSO_PROCESSOR_H
+
+#ifndef __ASSEMBLY__
+
+#ifdef CONFIG_CPU_LOONGSON64
+/*
+ * Loongson-3's SFB (Store-Fill-Buffer) may buffer writes indefinitely when a
+ * tight read loop is executed, because reads take priority over writes & the
+ * hardware (incorrectly) doesn't ensure that writes will eventually occur.
+ *
+ * Since spin loops of any kind should have a cpu_relax() in them, force an SFB
+ * flush from cpu_relax() such that any pending writes will become visible as
+ * expected.
+ */
+#define cpu_relax()	smp_mb()
+#else
+#define cpu_relax()	barrier()
+#endif
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_VDSO_PROCESSOR_H */

  reply	other threads:[~2020-03-21 14:33 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-20 14:53 [PATCH v5 00/26] Introduce common headers for vDSO Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 01/26] linux/const.h: Extract common header " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 02/26] linux/bits.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 03/26] linux/limits.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 04/26] x86:Introduce asm/vdso/clocksource.h Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] x86: Introduce asm/vdso/clocksource.h tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 05/26] arm: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 06/26] arm64: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 07/26] mips: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 08/26] linux/clocksource.h: Extract common header for vDSO Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 09/26] linux/math64.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 10/26] linux/time.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 11/26] linux/time32.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 12/26] linux/time64.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 13/26] linux/jiffies.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 14/26] linux/ktime.h: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 15/26] common: Introduce processor.h Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 16/26] scripts: Fix the inclusion order in modpost Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 17/26] linux/elfnote.h: Replace elf.h with UAPI equivalent Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 18/26] arm64: vdso32: Code clean up Vincenzo Frascino
2020-03-20 15:26   ` Catalin Marinas
2020-03-20 23:21   ` Stephen Boyd
2020-03-21 12:06     ` Catalin Marinas
2020-03-20 14:53 ` [PATCH v5 19/26] arm64: Introduce asm/vdso/processor.h Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 20/26] arm64: vdso: Include common headers in the vdso library Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 21/26] arm64: vdso32: " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 22/26] mips: vdso: Enable mips to use common headers Vincenzo Frascino
2020-03-21 14:33   ` tip-bot2 for Vincenzo Frascino [this message]
2020-03-20 14:53 ` [PATCH v5 23/26] x86: vdso: Enable x86 " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] x86/vdso: " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 24/26] arm: vdso: Enable arm " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 25/26] lib: vdso: Enable " Vincenzo Frascino
2020-03-21 14:33   ` [tip: timers/core] lib/vdso: " tip-bot2 for Vincenzo Frascino
2020-03-20 14:53 ` [PATCH v5 26/26] arm64: vdso32: Enable Clang Compilation Vincenzo Frascino
2020-03-20 23:15   ` Stephen Boyd
2020-03-21 14:33   ` [tip: timers/core] " tip-bot2 for Vincenzo Frascino

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=158480120493.28353.16624453777499675820.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=paulburton@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=vincenzo.frascino@arm.com \
    --cc=x86@kernel.org \
    /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

all inboxes | Powered by JetHome®