Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Christophe Leroy <christophe.leroy@csgroup.eu>
To:     Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        Paul Mackerras <paulus@samba.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        "masahiroy@kernel.org" <masahiroy@kernel.org>
CC:     Christophe Leroy <christophe.leroy@csgroup.eu>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: [PATCH v4 5/5] powerpc/vdso: Move cvdso_call macro into
 gettimeofday.S
Thread-Topic: [PATCH v4 5/5] powerpc/vdso: Move cvdso_call macro into
 gettimeofday.S
Thread-Index: AQHYDuQ30VAgV6brFk6OKmb40I797Q==
Date:   Fri, 21 Jan 2022 16:30:34 +0000
Message-ID: <72720359d4c58e3a3b96dd74952741225faac3de.1642782130.git.christophe.leroy@csgroup.eu>
References: <c2cbb8f046b7efc251053521dc39b752795e26b7.1642782130.git.christophe.leroy@csgroup.eu>
In-Reply-To: <c2cbb8f046b7efc251053521dc39b752795e26b7.1642782130.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?PG8R03t4iiizvErPoUH9eRWRmGFe91uHklE2GHz06Huqvy2y+kmSC+m0UY?=
 =?iso-8859-1?Q?0GYYFBZC6t4/CbAHl5RUimDu+JEa7ZOTC2gFB5WuCZuaWT+kFkhK0q9pwJ?=
 =?iso-8859-1?Q?Ux7dWmNRxtSaLputB+PcfBnm7Lz6ygL7JQ0Bow8tRLNE/TNOZL9j3rcWSp?=
 =?iso-8859-1?Q?rMhbQ9TjNXy06Z/AYtBx+YsMohipAwQiXZdoy0VQVtXmBQ4AKAxSoJhgZ/?=
 =?iso-8859-1?Q?p4ge5jqsfR+n7qpQhnOMiv3nb86SvUDNTyJEnyMAO0eR+gywP2p11IAZX/?=
 =?iso-8859-1?Q?9csUGg7qqpCMi4jrTsKffwpRq5ms6I5WsmaDrTK3wl4GNqdmFtn5S1eU1e?=
 =?iso-8859-1?Q?z7LXTgys4sKI2vhAsMUvKrErcKpGdjqjiegvg8Yq8U9ivrtJc2hrMWwLcS?=
 =?iso-8859-1?Q?ED8OT2TPt0uuW8UH70k8/Bn4AZ2xmJw61KoO8+bUFqQ2mm1slCwirINbhQ?=
 =?iso-8859-1?Q?CuG1fB/1Fbq3eYz+Bbpe0AG3gQmi7hBX/ysbC3gsGpJfPwb7HkTo1rmnKr?=
 =?iso-8859-1?Q?pbgBEeryvJOn+UqzQOVO9wbTBvipNoIJA8+ky8iVTe/LH+7ABSjGDWuBy9?=
 =?iso-8859-1?Q?ygHuty6Y13S/BWvnqPL+FxgNUPJ9wyeDZAmasEihjqSomlHVjjCaA62Ptm?=
 =?iso-8859-1?Q?d1iNHyzk80txY46tbwlGdi4n/xtVDnaLFFrcQktcUly/CCzkltDNi8ufdP?=
 =?iso-8859-1?Q?5leQCt4+Li/3tl9KKmwTI43XX+09wMHLbysqcDGCzMAzBoqOD11mNNxhzD?=
 =?iso-8859-1?Q?8jWy6gMh8H5WZeipCja4c50yAQtuWiTgpZLBR1pVjpcuUIH6PrtXl/gaFK?=
 =?iso-8859-1?Q?nD91tj5qHHWWSSaJqEXdWt+T6mwMrfn6opRj7tgO5HoTmnEopXwrViQBJg?=
 =?iso-8859-1?Q?ENYnmlglsUxDT+TVHUK1o5HehX5pnnlq1oXnRGVK/gNfYI76jO1zh3KA7L?=
 =?iso-8859-1?Q?rC5hqpeisGER/zUAGTZWZGFczImX+x2o+pjOKaTeYQggzsyoG7jzcW5UFm?=
 =?iso-8859-1?Q?hZlD4tqkP8xgNVeHF9nhSLPY8MLmaPtmm1pJaWGE5blg+yBSTad8qq/F0r?=
 =?iso-8859-1?Q?j2U3gq5rqxrN0lXW/z3rtQ/G+8eWYBFszusgAx3lHr/M51e22elmdgxD9i?=
 =?iso-8859-1?Q?rDGtuF5d5vgaVq7HviIgku0tJg6x4qcFQv6zvECKaf7CeE10bVhI8oHOKf?=
 =?iso-8859-1?Q?cJWlD0il5tuspRScW0sXBuKlQ+YNZgalt1J0IYNpZXGaMJ5Lwhz2ohkajX?=
 =?iso-8859-1?Q?pkhRnG3zQidExeYk6788dKoBvJvEXpzxgNDaeJsFiq/8a2a2zhhBYabJUg?=
 =?iso-8859-1?Q?jm+5W50PWR7HdV8kxKyJJSVj8WCXDGXdRcxr1Ekx2sqiywCqVPQTqUcAn1?=
 =?iso-8859-1?Q?dPWt56BCNQuIW5JeBYIqIHfJO6xw5NKkM8q/RPOxAzjJdjohCy6TCOczhg?=
 =?iso-8859-1?Q?Hb4IZ14FFTlHpXSNT3eyquS6/RQIeeRCV1vz6+o+brQPLMyTScjiwtpwUR?=
 =?iso-8859-1?Q?BHUySU5eZUglNpmVclZ4aaua8/NDDhk/avIcLLJp72uqyYE03/oKERLWDy?=
 =?iso-8859-1?Q?AC3vYQRVhEO8u4mt6QwH3jXGL9+9JkuIwrWaKBsRvEXbIFoiEe/NfOYdg9?=
 =?iso-8859-1?Q?+A+eB3QYfi1stRwhHfHeOt/yJrN29T2pOwT8tkZEKYTH/CNIiynnjAMSI1?=
 =?iso-8859-1?Q?f8rhWuifecCHFuLbtb113kCYQaHRHL29p/VjKvGP39OCyezbqbUNjiJ3rf?=
 =?iso-8859-1?Q?W0TYqF53GuAUuDe/mZSEbPNus=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c612825-ed1d-4edd-1a81-08d9dcfb59c3
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jan 2022 16:30:34.9715
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Bkk4TSf5fic2/0gtBI64AxNMxj3BXIFjV3BhIFAZr7GmP8hLGCZKytf0eMxWIre2QpoIt5frVk1sQ3NB84fel+uqVLhmsUL8uGLSBntnnFQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR0P264MB3436
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Now that gettimeofday.S is unique, move cvdso_call macro
into that file which is the only user.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/include/asm/vdso/gettimeofday.h | 52 +-------------------
 arch/powerpc/kernel/vdso/gettimeofday.S      | 44 ++++++++++++++++-
 2 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/arch/powerpc/include/asm/vdso/gettimeofday.h b/arch/powerpc/include/asm/vdso/gettimeofday.h
index df00e91c9a90..f0a4cf01e85c 100644
--- a/arch/powerpc/include/asm/vdso/gettimeofday.h
+++ b/arch/powerpc/include/asm/vdso/gettimeofday.h
@@ -2,57 +2,9 @@
 #ifndef _ASM_POWERPC_VDSO_GETTIMEOFDAY_H
 #define _ASM_POWERPC_VDSO_GETTIMEOFDAY_H
 
-#include <asm/page.h>
-
-#ifdef __ASSEMBLY__
-
-#include <asm/ppc_asm.h>
-
-/*
- * The macro sets two stack frames, one for the caller and one for the callee
- * because there are no requirement for the caller to set a stack frame when
- * calling VDSO so it may have omitted to set one, especially on PPC64
- */
-
-.macro cvdso_call funct call_time=0
-  .cfi_startproc
-	PPC_STLU	r1, -PPC_MIN_STKFRM(r1)
-	mflr		r0
-  .cfi_register lr, r0
-	PPC_STLU	r1, -PPC_MIN_STKFRM(r1)
-	PPC_STL		r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)
-#ifdef __powerpc64__
-	PPC_STL		r2, PPC_MIN_STKFRM + STK_GOT(r1)
-#endif
-	get_datapage	r5
-	.ifeq	\call_time
-	addi		r5, r5, VDSO_DATA_OFFSET
-	.else
-	addi		r4, r5, VDSO_DATA_OFFSET
-	.endif
-	bl		DOTSYM(\funct)
-	PPC_LL		r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)
-#ifdef __powerpc64__
-	PPC_LL		r2, PPC_MIN_STKFRM + STK_GOT(r1)
-#endif
-	.ifeq	\call_time
-	cmpwi		r3, 0
-	.endif
-	mtlr		r0
-  .cfi_restore lr
-	addi		r1, r1, 2 * PPC_MIN_STKFRM
-	crclr		so
-	.ifeq	\call_time
-	beqlr+
-	crset		so
-	neg		r3, r3
-	.endif
-	blr
-  .cfi_endproc
-.endm
-
-#else
+#ifndef __ASSEMBLY__
 
+#include <asm/page.h>
 #include <asm/vdso/timebase.h>
 #include <asm/barrier.h>
 #include <asm/unistd.h>
diff --git a/arch/powerpc/kernel/vdso/gettimeofday.S b/arch/powerpc/kernel/vdso/gettimeofday.S
index 397f290015bc..eb9c81e1c218 100644
--- a/arch/powerpc/kernel/vdso/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso/gettimeofday.S
@@ -12,7 +12,49 @@
 #include <asm/vdso_datapage.h>
 #include <asm/asm-offsets.h>
 #include <asm/unistd.h>
-#include <asm/vdso/gettimeofday.h>
+
+/*
+ * The macro sets two stack frames, one for the caller and one for the callee
+ * because there are no requirement for the caller to set a stack frame when
+ * calling VDSO so it may have omitted to set one, especially on PPC64
+ */
+
+.macro cvdso_call funct call_time=0
+  .cfi_startproc
+	PPC_STLU	r1, -PPC_MIN_STKFRM(r1)
+	mflr		r0
+  .cfi_register lr, r0
+	PPC_STLU	r1, -PPC_MIN_STKFRM(r1)
+	PPC_STL		r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)
+#ifdef __powerpc64__
+	PPC_STL		r2, PPC_MIN_STKFRM + STK_GOT(r1)
+#endif
+	get_datapage	r5
+	.ifeq	\call_time
+	addi		r5, r5, VDSO_DATA_OFFSET
+	.else
+	addi		r4, r5, VDSO_DATA_OFFSET
+	.endif
+	bl		DOTSYM(\funct)
+	PPC_LL		r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)
+#ifdef __powerpc64__
+	PPC_LL		r2, PPC_MIN_STKFRM + STK_GOT(r1)
+#endif
+	.ifeq	\call_time
+	cmpwi		r3, 0
+	.endif
+	mtlr		r0
+  .cfi_restore lr
+	addi		r1, r1, 2 * PPC_MIN_STKFRM
+	crclr		so
+	.ifeq	\call_time
+	beqlr+
+	crset		so
+	neg		r3, r3
+	.endif
+	blr
+  .cfi_endproc
+.endm
 
 	.text
 /*
-- 
2.33.1