From:   Peter Lafreniere <peter@n8pjl.ca>
To:     linux-crypto@vger.kernel.org
Cc:     Peter Lafreniere <peter@n8pjl.ca>, x86@kernel.org,
        jussi.kivilinna@mbnet.fi
Subject: [PATCH v2 3/3] crypto: x86/blowfish - Eliminate use of
 SYM_TYPED_FUNC_START in asm
Date:   Mon, 30 Jan 2023 20:28:40 -0500
Message-id: <20230131012840.6451-2-peter@n8pjl.ca>
MIME-version: 1.0
Content-transfer-encoding: 8bit
Reporting-Meta: AAGWioRAdVITWWhzPlJd+pmQusV4E1h1Ox0YFOuh4JDzZd3NCVgm54FD6KjHqxWx
 4ovx3py0K1m1k+JO0U646uFmDxD5p811aq5Nd8GRk1zQVSEv/M3UjTkOh4c/2hxx
 NF96VOa9iH7qtGzy/zVKjM8X777vVlPkgOv5lQR1oAlR0cRM9Jsq802VbkdK45sL
 QnSc0DkeIRZDZc0MthYJrnIx1t5hUQJhul3xyfwH3wxpVT2d/ygw5k4Pw0uRVuh9
 yJHOKyvZhhRt+VKtAFltBv9A+GHl/RMr5AaEuII94jt0tukz7C4nRtJD1dzdHFYI
 VRNLRlomHIq6hEXdzajH3lE0fDnuI46hFZUHhTYdZvqE/y1XFlx+G+7fzi2hEyse
 XqWC9ZVvPd0A8dSy/+/82lGF0CWHdo31+ZqL+noXmLIMesqSWgGqSg/Ytry8X3A=
Precedence: bulk

Now that we use the ECB/CBC macros, none of the asm functions in
blowfish-x86_64 are called indirectly. So we can safely use
SYM_FUNC_START instead of SYM_TYPED_FUNC_START with no effect, allowing
us to remove an include.

Signed-off-by: Peter Lafreniere <peter@n8pjl.ca>
---
v1 -> v2:
 - Fixed typo that caused an assembler failure
 - Added note about performance to cover letter

 arch/x86/crypto/blowfish-x86_64-asm_64.S | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
index 767a209ca989..fda2f9a3d83c 100644
--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
@@ -6,7 +6,6 @@
  */
 
 #include <linux/linkage.h>
-#include <linux/cfi_types.h>
 
 .file "blowfish-x86_64-asm.S"
 .text
@@ -100,7 +99,7 @@
 	bswapq 			RX0; \
 	movq RX0, 		(RIO);
 
-SYM_TYPED_FUNC_START(blowfish_enc_blk)
+SYM_FUNC_START(blowfish_enc_blk)
 	/* input:
 	 *	%rdi: ctx
 	 *	%rsi: dst
@@ -131,7 +130,7 @@ SYM_TYPED_FUNC_START(blowfish_enc_blk)
 	RET;
 SYM_FUNC_END(blowfish_enc_blk)
 
-SYM_TYPED_FUNC_START(blowfish_dec_blk)
+SYM_FUNC_START(blowfish_dec_blk)
 	/* input:
 	 *	%rdi: ctx
 	 *	%rsi: dst
@@ -273,7 +272,7 @@ SYM_FUNC_END(blowfish_dec_blk)
 	bswapq			RT3; \
 	xorq RT3,		RX3;
 
-SYM_TYPED_FUNC_START(blowfish_enc_blk_4way)
+SYM_FUNC_START(blowfish_enc_blk_4way)
 	/* input:
 	 *	%rdi: ctx
 	 *	%rsi: dst
@@ -308,7 +307,7 @@ SYM_TYPED_FUNC_START(blowfish_enc_blk_4way)
 	RET;
 SYM_FUNC_END(blowfish_enc_blk_4way)
 
-SYM_TYPED_FUNC_START(__blowfish_dec_blk_4way)
+SYM_FUNC_START(__blowfish_dec_blk_4way)
 	/* input:
 	 *	%rdi: ctx
 	 *	%rsi: dst
-- 
2.39.1