[S390] Inline assembly cleanup.
Major cleanup of all s390 inline assemblies. They now have a common coding style. Quite a few have been shortened, mainly by using register asm variables. Use of the EX_TABLE macro helps as well. The atomic ops, bit ops and locking inlines new use the Q-constraint if a newer gcc is used. That results in slightly better code. Thanks to Christian Borntraeger for proof reading the changes. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky
@@ -104,63 +104,6 @@ struct crypt_s390_query_status {
|
||||
u64 low;
|
||||
};
|
||||
|
||||
/*
|
||||
* Standard fixup and ex_table sections for crypt_s390 inline functions.
|
||||
* label 0: the s390 crypto operation
|
||||
* label 1: just after 1 to catch illegal operation exception
|
||||
* (unsupported model)
|
||||
* label 6: the return point after fixup
|
||||
* label 7: set error value if exception _in_ crypto operation
|
||||
* label 8: set error value if illegal operation exception
|
||||
* [ret] is the variable to receive the error code
|
||||
* [ERR] is the error code value
|
||||
*/
|
||||
#ifndef CONFIG_64BIT
|
||||
#define __crypt_s390_fixup \
|
||||
".section .fixup,\"ax\" \n" \
|
||||
"7: lhi %0,%h[e1] \n" \
|
||||
" bras 1,9f \n" \
|
||||
" .long 6b \n" \
|
||||
"8: lhi %0,%h[e2] \n" \
|
||||
" bras 1,9f \n" \
|
||||
" .long 6b \n" \
|
||||
"9: l 1,0(1) \n" \
|
||||
" br 1 \n" \
|
||||
".previous \n" \
|
||||
".section __ex_table,\"a\" \n" \
|
||||
" .align 4 \n" \
|
||||
" .long 0b,7b \n" \
|
||||
" .long 1b,8b \n" \
|
||||
".previous"
|
||||
#else /* CONFIG_64BIT */
|
||||
#define __crypt_s390_fixup \
|
||||
".section .fixup,\"ax\" \n" \
|
||||
"7: lhi %0,%h[e1] \n" \
|
||||
" jg 6b \n" \
|
||||
"8: lhi %0,%h[e2] \n" \
|
||||
" jg 6b \n" \
|
||||
".previous\n" \
|
||||
".section __ex_table,\"a\" \n" \
|
||||
" .align 8 \n" \
|
||||
" .quad 0b,7b \n" \
|
||||
" .quad 1b,8b \n" \
|
||||
".previous"
|
||||
#endif /* CONFIG_64BIT */
|
||||
|
||||
/*
|
||||
* Standard code for setting the result of s390 crypto instructions.
|
||||
* %0: the register which will receive the result
|
||||
* [result]: the register containing the result (e.g. second operand length
|
||||
* to compute number of processed bytes].
|
||||
*/
|
||||
#ifndef CONFIG_64BIT
|
||||
#define __crypt_s390_set_result \
|
||||
" lr %0,%[result] \n"
|
||||
#else /* CONFIG_64BIT */
|
||||
#define __crypt_s390_set_result \
|
||||
" lgr %0,%[result] \n"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Executes the KM (CIPHER MESSAGE) operation of the CPU.
|
||||
* @param func: the function code passed to KM; see crypt_s390_km_func
|
||||
@@ -176,28 +119,24 @@ crypt_s390_km(long func, void* param, u8* dest, const u8* src, long src_len)
|
||||
{
|
||||
register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
|
||||
register void* __param asm("1") = param;
|
||||
register u8* __dest asm("4") = dest;
|
||||
register const u8* __src asm("2") = src;
|
||||
register long __src_len asm("3") = src_len;
|
||||
register u8* __dest asm("4") = dest;
|
||||
int ret;
|
||||
|
||||
ret = 0;
|
||||
__asm__ __volatile__ (
|
||||
"0: .insn rre,0xB92E0000,%1,%2 \n" /* KM opcode */
|
||||
asm volatile(
|
||||
"0: .insn rre,0xb92e0000,%3,%1 \n" /* KM opcode */
|
||||
"1: brc 1,0b \n" /* handle partial completion */
|
||||
__crypt_s390_set_result
|
||||
"6: \n"
|
||||
__crypt_s390_fixup
|
||||
: "+d" (ret), "+a" (__dest), "+a" (__src),
|
||||
[result] "+d" (__src_len)
|
||||
: [e1] "K" (-EFAULT), [e2] "K" (-ENOSYS), "d" (__func),
|
||||
"a" (__param)
|
||||
: "cc", "memory"
|
||||
);
|
||||
if (ret >= 0 && func & CRYPT_S390_FUNC_MASK){
|
||||
ret = src_len - ret;
|
||||
}
|
||||
return ret;
|
||||
" ahi %0,%h7\n"
|
||||
"2: ahi %0,%h8\n"
|
||||
"3:\n"
|
||||
EX_TABLE(0b,3b) EX_TABLE(1b,2b)
|
||||
: "=d" (ret), "+a" (__src), "+d" (__src_len), "+a" (__dest)
|
||||
: "d" (__func), "a" (__param), "0" (-EFAULT),
|
||||
"K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -215,28 +154,24 @@ crypt_s390_kmc(long func, void* param, u8* dest, const u8* src, long src_len)
|
||||
{
|
||||
register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
|
||||
register void* __param asm("1") = param;
|
||||
register u8* __dest asm("4") = dest;
|
||||
register const u8* __src asm("2") = src;
|
||||
register long __src_len asm("3") = src_len;
|
||||
register u8* __dest asm("4") = dest;
|
||||
int ret;
|
||||
|
||||
ret = 0;
|
||||
__asm__ __volatile__ (
|
||||
"0: .insn rre,0xB92F0000,%1,%2 \n" /* KMC opcode */
|
||||
asm volatile(
|
||||
"0: .insn rre,0xb92f0000,%3,%1 \n" /* KMC opcode */
|
||||
"1: brc 1,0b \n" /* handle partial completion */
|
||||
__crypt_s390_set_result
|
||||
"6: \n"
|
||||
__crypt_s390_fixup
|
||||
: "+d" (ret), "+a" (__dest), "+a" (__src),
|
||||
[result] "+d" (__src_len)
|
||||
: [e1] "K" (-EFAULT), [e2] "K" (-ENOSYS), "d" (__func),
|
||||
"a" (__param)
|
||||
: "cc", "memory"
|
||||
);
|
||||
if (ret >= 0 && func & CRYPT_S390_FUNC_MASK){
|
||||
ret = src_len - ret;
|
||||
}
|
||||
return ret;
|
||||
" ahi %0,%h7\n"
|
||||
"2: ahi %0,%h8\n"
|
||||
"3:\n"
|
||||
EX_TABLE(0b,3b) EX_TABLE(1b,2b)
|
||||
: "=d" (ret), "+a" (__src), "+d" (__src_len), "+a" (__dest)
|
||||
: "d" (__func), "a" (__param), "0" (-EFAULT),
|
||||
"K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -258,22 +193,19 @@ crypt_s390_kimd(long func, void* param, const u8* src, long src_len)
|
||||
register long __src_len asm("3") = src_len;
|
||||
int ret;
|
||||
|
||||
ret = 0;
|
||||
__asm__ __volatile__ (
|
||||
"0: .insn rre,0xB93E0000,%1,%1 \n" /* KIMD opcode */
|
||||
"1: brc 1,0b \n" /* handle partical completion */
|
||||
__crypt_s390_set_result
|
||||
"6: \n"
|
||||
__crypt_s390_fixup
|
||||
: "+d" (ret), "+a" (__src), [result] "+d" (__src_len)
|
||||
: [e1] "K" (-EFAULT), [e2] "K" (-ENOSYS), "d" (__func),
|
||||
"a" (__param)
|
||||
: "cc", "memory"
|
||||
);
|
||||
if (ret >= 0 && (func & CRYPT_S390_FUNC_MASK)){
|
||||
ret = src_len - ret;
|
||||
}
|
||||
return ret;
|
||||
asm volatile(
|
||||
"0: .insn rre,0xb93e0000,%1,%1 \n" /* KIMD opcode */
|
||||
"1: brc 1,0b \n" /* handle partial completion */
|
||||
" ahi %0,%h6\n"
|
||||
"2: ahi %0,%h7\n"
|
||||
"3:\n"
|
||||
EX_TABLE(0b,3b) EX_TABLE(1b,2b)
|
||||
: "=d" (ret), "+a" (__src), "+d" (__src_len)
|
||||
: "d" (__func), "a" (__param), "0" (-EFAULT),
|
||||
"K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -294,22 +226,19 @@ crypt_s390_klmd(long func, void* param, const u8* src, long src_len)
|
||||
register long __src_len asm("3") = src_len;
|
||||
int ret;
|
||||
|
||||
ret = 0;
|
||||
__asm__ __volatile__ (
|
||||
"0: .insn rre,0xB93F0000,%1,%1 \n" /* KLMD opcode */
|
||||
"1: brc 1,0b \n" /* handle partical completion */
|
||||
__crypt_s390_set_result
|
||||
"6: \n"
|
||||
__crypt_s390_fixup
|
||||
: "+d" (ret), "+a" (__src), [result] "+d" (__src_len)
|
||||
: [e1] "K" (-EFAULT), [e2] "K" (-ENOSYS), "d" (__func),
|
||||
"a" (__param)
|
||||
: "cc", "memory"
|
||||
);
|
||||
if (ret >= 0 && func & CRYPT_S390_FUNC_MASK){
|
||||
ret = src_len - ret;
|
||||
}
|
||||
return ret;
|
||||
asm volatile(
|
||||
"0: .insn rre,0xb93f0000,%1,%1 \n" /* KLMD opcode */
|
||||
"1: brc 1,0b \n" /* handle partial completion */
|
||||
" ahi %0,%h6\n"
|
||||
"2: ahi %0,%h7\n"
|
||||
"3:\n"
|
||||
EX_TABLE(0b,3b) EX_TABLE(1b,2b)
|
||||
: "=d" (ret), "+a" (__src), "+d" (__src_len)
|
||||
: "d" (__func), "a" (__param), "0" (-EFAULT),
|
||||
"K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -331,22 +260,19 @@ crypt_s390_kmac(long func, void* param, const u8* src, long src_len)
|
||||
register long __src_len asm("3") = src_len;
|
||||
int ret;
|
||||
|
||||
ret = 0;
|
||||
__asm__ __volatile__ (
|
||||
"0: .insn rre,0xB91E0000,%5,%5 \n" /* KMAC opcode */
|
||||
"1: brc 1,0b \n" /* handle partical completion */
|
||||
__crypt_s390_set_result
|
||||
"6: \n"
|
||||
__crypt_s390_fixup
|
||||
: "+d" (ret), "+a" (__src), [result] "+d" (__src_len)
|
||||
: [e1] "K" (-EFAULT), [e2] "K" (-ENOSYS), "d" (__func),
|
||||
"a" (__param)
|
||||
: "cc", "memory"
|
||||
);
|
||||
if (ret >= 0 && func & CRYPT_S390_FUNC_MASK){
|
||||
ret = src_len - ret;
|
||||
}
|
||||
return ret;
|
||||
asm volatile(
|
||||
"0: .insn rre,0xb91e0000,%1,%1 \n" /* KLAC opcode */
|
||||
"1: brc 1,0b \n" /* handle partial completion */
|
||||
" ahi %0,%h6\n"
|
||||
"2: ahi %0,%h7\n"
|
||||
"3:\n"
|
||||
EX_TABLE(0b,3b) EX_TABLE(1b,2b)
|
||||
: "=d" (ret), "+a" (__src), "+d" (__src_len)
|
||||
: "d" (__func), "a" (__param), "0" (-EFAULT),
|
||||
"K" (ENOSYS), "K" (-ENOSYS + EFAULT) : "cc", "memory");
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user