Skip to content

Commit 731efc9

Browse files
author
Vasily Gorbik
committed
s390: convert ".insn" encoding to instruction names
With z10 as minimum supported machine generation many ".insn" encodings could be now converted to instruction names. There are couple of exceptions - stfle is used from the als code built for z900 and cannot be converted - few ".insn" directives encode unsupported instruction formats The generated code is identical before/after this change. Acked-by: Ilya Leoshkevich <iii@linux.ibm.com> Reviewed-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 10bc15b commit 731efc9

10 files changed

Lines changed: 37 additions & 40 deletions

File tree

‎arch/s390/crypto/chacha-s390.S‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ ENTRY(chacha20_vx_4x)
312312
VPERM XC0,XC0,XC0,BEPERM
313313
VPERM XD0,XD0,XD0,BEPERM
314314

315-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
315+
clgfi LEN,0x40
316316
jl .Ltail_4x
317317

318318
VLM XT0,XT3,0,INP,0
@@ -339,7 +339,7 @@ ENTRY(chacha20_vx_4x)
339339
VPERM XC0,XC0,XC0,BEPERM
340340
VPERM XD0,XD0,XD0,BEPERM
341341

342-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
342+
clgfi LEN,0x40
343343
jl .Ltail_4x
344344

345345
VLM XT0,XT3,0,INP,0
@@ -366,7 +366,7 @@ ENTRY(chacha20_vx_4x)
366366
VPERM XC0,XC0,XC0,BEPERM
367367
VPERM XD0,XD0,XD0,BEPERM
368368

369-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
369+
clgfi LEN,0x40
370370
jl .Ltail_4x
371371

372372
VLM XT0,XT3,0,INP,0
@@ -472,7 +472,7 @@ ENDPROC(chacha20_vx_4x)
472472
#define T3 %v30
473473

474474
ENTRY(chacha20_vx)
475-
.insn rilu,0xc20e00000000,LEN,256 # clgfi LEN,256
475+
clgfi LEN,256
476476
jle chacha20_vx_4x
477477
stmg %r6,%r7,6*8(SP)
478478

@@ -725,7 +725,7 @@ ENTRY(chacha20_vx)
725725
VPERM C0,C0,C0,BEPERM
726726
VPERM D0,D0,D0,BEPERM
727727

728-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
728+
clgfi LEN,0x40
729729
jl .Ltail_vx
730730

731731
VAF D2,D2,T2 # +K[3]+2
@@ -754,7 +754,7 @@ ENTRY(chacha20_vx)
754754
VPERM C0,C1,C1,BEPERM
755755
VPERM D0,D1,D1,BEPERM
756756

757-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
757+
clgfi LEN,0x40
758758
jl .Ltail_vx
759759

760760
VLM A1,D1,0,INP,0
@@ -780,7 +780,7 @@ ENTRY(chacha20_vx)
780780
VPERM C0,C2,C2,BEPERM
781781
VPERM D0,D2,D2,BEPERM
782782

783-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
783+
clgfi LEN,0x40
784784
jl .Ltail_vx
785785

786786
VLM A1,D1,0,INP,0
@@ -807,7 +807,7 @@ ENTRY(chacha20_vx)
807807
VPERM C0,C3,C3,BEPERM
808808
VPERM D0,D3,D3,BEPERM
809809

810-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
810+
clgfi LEN,0x40
811811
jl .Ltail_vx
812812

813813
VAF D3,D2,T1 # K[3]+4
@@ -837,7 +837,7 @@ ENTRY(chacha20_vx)
837837
VPERM C0,C4,C4,BEPERM
838838
VPERM D0,D4,D4,BEPERM
839839

840-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
840+
clgfi LEN,0x40
841841
jl .Ltail_vx
842842

843843
VLM A1,D1,0,INP,0
@@ -864,7 +864,7 @@ ENTRY(chacha20_vx)
864864
VPERM C0,C5,C5,BEPERM
865865
VPERM D0,D5,D5,BEPERM
866866

867-
.insn rilu,0xc20e00000000,LEN,0x40 # clgfi LEN,0x40
867+
clgfi LEN,0x40
868868
jl .Ltail_vx
869869

870870
VLM A1,D1,0,INP,0

‎arch/s390/include/asm/cpu_mf.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ struct hws_trailer_entry {
160160
/* Load program parameter */
161161
static inline void lpp(void *pp)
162162
{
163-
asm volatile(".insn s,0xb2800000,0(%0)\n":: "a" (pp) : "memory");
163+
asm volatile("lpp 0(%0)\n" :: "a" (pp) : "memory");
164164
}
165165

166166
/* Query counter information */
@@ -169,7 +169,7 @@ static inline int qctri(struct cpumf_ctr_info *info)
169169
int rc = -EINVAL;
170170

171171
asm volatile (
172-
"0: .insn s,0xb28e0000,%1\n"
172+
"0: qctri %1\n"
173173
"1: lhi %0,0\n"
174174
"2:\n"
175175
EX_TABLE(1b, 2b)
@@ -183,7 +183,7 @@ static inline int lcctl(u64 ctl)
183183
int cc;
184184

185185
asm volatile (
186-
" .insn s,0xb2840000,%1\n"
186+
" lcctl %1\n"
187187
" ipm %0\n"
188188
" srl %0,28\n"
189189
: "=d" (cc) : "Q" (ctl) : "cc");
@@ -197,7 +197,7 @@ static inline int __ecctr(u64 ctr, u64 *content)
197197
int cc;
198198

199199
asm volatile (
200-
" .insn rre,0xb2e40000,%0,%2\n"
200+
" ecctr %0,%2\n"
201201
" ipm %1\n"
202202
" srl %1,28\n"
203203
: "=d" (_content), "=d" (cc) : "d" (ctr) : "cc");
@@ -247,7 +247,7 @@ static inline int qsi(struct hws_qsi_info_block *info)
247247
int cc = 1;
248248

249249
asm volatile(
250-
"0: .insn s,0xb2860000,%1\n"
250+
"0: qsi %1\n"
251251
"1: lhi %0,0\n"
252252
"2:\n"
253253
EX_TABLE(0b, 2b) EX_TABLE(1b, 2b)
@@ -262,7 +262,7 @@ static inline int lsctl(struct hws_lsctl_request_block *req)
262262

263263
cc = 1;
264264
asm volatile(
265-
"0: .insn s,0xb2870000,0(%1)\n"
265+
"0: lsctl 0(%1)\n"
266266
"1: ipm %0\n"
267267
" srl %0,28\n"
268268
"2:\n"

‎arch/s390/include/asm/pgtable.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ static inline void cspg(unsigned long *ptr, unsigned long old, unsigned long new
600600
unsigned long address = (unsigned long)ptr | 1;
601601

602602
asm volatile(
603-
" .insn rre,0xb98a0000,%[r1],%[address]"
603+
" cspg %[r1],%[address]"
604604
: [r1] "+&d" (r1.pair), "+m" (*ptr)
605605
: [address] "d" (address)
606606
: "cc");
@@ -1052,7 +1052,7 @@ static __always_inline void __ptep_ipte(unsigned long address, pte_t *ptep,
10521052
if (__builtin_constant_p(opt) && opt == 0) {
10531053
/* Invalidation + TLB flush for the pte */
10541054
asm volatile(
1055-
" .insn rrf,0xb2210000,%[r1],%[r2],0,%[m4]"
1055+
" ipte %[r1],%[r2],0,%[m4]"
10561056
: "+m" (*ptep) : [r1] "a" (pto), [r2] "a" (address),
10571057
[m4] "i" (local));
10581058
return;
@@ -1061,7 +1061,7 @@ static __always_inline void __ptep_ipte(unsigned long address, pte_t *ptep,
10611061
/* Invalidate ptes with options + TLB flush of the ptes */
10621062
opt = opt | (asce & _ASCE_ORIGIN);
10631063
asm volatile(
1064-
" .insn rrf,0xb2210000,%[r1],%[r2],%[r3],%[m4]"
1064+
" ipte %[r1],%[r2],%[r3],%[m4]"
10651065
: [r2] "+a" (address), [r3] "+a" (opt)
10661066
: [r1] "a" (pto), [m4] "i" (local) : "memory");
10671067
}
@@ -1074,7 +1074,7 @@ static __always_inline void __ptep_ipte_range(unsigned long address, int nr,
10741074
/* Invalidate a range of ptes + TLB flush of the ptes */
10751075
do {
10761076
asm volatile(
1077-
" .insn rrf,0xb2210000,%[r1],%[r2],%[r3],%[m4]"
1077+
" ipte %[r1],%[r2],%[r3],%[m4]"
10781078
: [r2] "+a" (address), [r3] "+a" (nr)
10791079
: [r1] "a" (pto), [m4] "i" (local) : "memory");
10801080
} while (nr != 255);
@@ -1535,15 +1535,15 @@ static __always_inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,
15351535
if (__builtin_constant_p(opt) && opt == 0) {
15361536
/* flush without guest asce */
15371537
asm volatile(
1538-
" .insn rrf,0xb98e0000,%[r1],%[r2],0,%[m4]"
1538+
" idte %[r1],0,%[r2],%[m4]"
15391539
: "+m" (*pmdp)
15401540
: [r1] "a" (sto), [r2] "a" ((addr & HPAGE_MASK)),
15411541
[m4] "i" (local)
15421542
: "cc" );
15431543
} else {
15441544
/* flush with guest asce */
15451545
asm volatile(
1546-
" .insn rrf,0xb98e0000,%[r1],%[r2],%[r3],%[m4]"
1546+
" idte %[r1],%[r3],%[r2],%[m4]"
15471547
: "+m" (*pmdp)
15481548
: [r1] "a" (sto), [r2] "a" ((addr & HPAGE_MASK) | opt),
15491549
[r3] "a" (asce), [m4] "i" (local)
@@ -1562,15 +1562,15 @@ static __always_inline void __pudp_idte(unsigned long addr, pud_t *pudp,
15621562
if (__builtin_constant_p(opt) && opt == 0) {
15631563
/* flush without guest asce */
15641564
asm volatile(
1565-
" .insn rrf,0xb98e0000,%[r1],%[r2],0,%[m4]"
1565+
" idte %[r1],0,%[r2],%[m4]"
15661566
: "+m" (*pudp)
15671567
: [r1] "a" (r3o), [r2] "a" ((addr & PUD_MASK)),
15681568
[m4] "i" (local)
15691569
: "cc");
15701570
} else {
15711571
/* flush with guest asce */
15721572
asm volatile(
1573-
" .insn rrf,0xb98e0000,%[r1],%[r2],%[r3],%[m4]"
1573+
" idte %[r1],%[r3],%[r2],%[m4]"
15741574
: "+m" (*pudp)
15751575
: [r1] "a" (r3o), [r2] "a" ((addr & PUD_MASK) | opt),
15761576
[r3] "a" (asce), [m4] "i" (local)

‎arch/s390/include/asm/processor.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ static inline unsigned long __ecag(unsigned int asi, unsigned char parm)
225225
{
226226
unsigned long val;
227227

228-
asm volatile(".insn rsy,0xeb000000004c,%0,0,0(%1)" /* ecag */
229-
: "=d" (val) : "a" (asi << 8 | parm));
228+
asm volatile("ecag %0,0,0(%1)" : "=d" (val) : "a" (asi << 8 | parm));
230229
return val;
231230
}
232231

‎arch/s390/include/asm/timex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ struct ptff_qui {
148148
asm volatile( \
149149
" lgr 0,%[reg0]\n" \
150150
" lgr 1,%[reg1]\n" \
151-
" .insn e,0x0104\n" \
151+
" ptff\n" \
152152
" ipm %[rc]\n" \
153153
" srl %[rc],28\n" \
154154
: [rc] "=&d" (rc), "+m" (*(struct addrtype *)reg1) \

‎arch/s390/include/asm/tlbflush.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ static inline void __tlb_flush_idte(unsigned long asce)
2525
if (MACHINE_HAS_TLB_GUEST)
2626
opt |= IDTE_GUEST_ASCE;
2727
/* Global TLB flush for the mm */
28-
asm volatile(
29-
" .insn rrf,0xb98e0000,0,%0,%1,0"
30-
: : "a" (opt), "a" (asce) : "cc");
28+
asm volatile("idte 0,%1,%0" : : "a" (opt), "a" (asce) : "cc");
3129
}
3230

3331
/*

‎arch/s390/kernel/entry.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ ENTRY(__switch_to)
226226
aghi %r3,__TASK_pid
227227
mvc __LC_CURRENT_PID(4,%r0),0(%r3) # store pid of next
228228
lmg %r6,%r15,__SF_GPRS(%r15) # load gprs of next task
229-
ALTERNATIVE "", ".insn s,0xb2800000,_LPP_OFFSET", 40
229+
ALTERNATIVE "", "lpp _LPP_OFFSET", 40
230230
BR_EX %r14
231231
ENDPROC(__switch_to)
232232

@@ -648,7 +648,7 @@ ENTRY(mcck_int_handler)
648648
ENDPROC(mcck_int_handler)
649649

650650
ENTRY(restart_int_handler)
651-
ALTERNATIVE "", ".insn s,0xb2800000,_LPP_OFFSET", 40
651+
ALTERNATIVE "", "lpp _LPP_OFFSET", 40
652652
stg %r15,__LC_SAVE_AREA_RESTART
653653
TSTMSK __LC_RESTART_FLAGS,RESTART_FLAG_CTLREGS,4
654654
jz 0f

‎arch/s390/kernel/ftrace.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ asm(
6262
" .align 16\n"
6363
"ftrace_shared_hotpatch_trampoline_exrl:\n"
6464
" lmg %r0,%r1,2(%r1)\n"
65-
" .insn ril,0xc60000000000,%r0,0f\n" /* exrl */
65+
" exrl %r0,0f\n"
6666
" j .\n"
6767
"0: br %r1\n"
6868
"ftrace_shared_hotpatch_trampoline_exrl_end:\n"

‎arch/s390/lib/uaccess.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ static unsigned long raw_copy_from_user_key(void *to, const void __user *from,
4545
tmp1 = -4096UL;
4646
asm volatile(
4747
" lr 0,%[spec]\n"
48-
"0: .insn ss,0xc80000000000,0(%0,%2),0(%1),0\n"
48+
"0: mvcos 0(%2),0(%1),%0\n"
4949
"6: jz 4f\n"
5050
"1: algr %0,%3\n"
5151
" slgr %1,%3\n"
@@ -56,7 +56,7 @@ static unsigned long raw_copy_from_user_key(void *to, const void __user *from,
5656
" slgr %4,%1\n"
5757
" clgr %0,%4\n" /* copy crosses next page boundary? */
5858
" jnh 5f\n"
59-
"3: .insn ss,0xc80000000000,0(%4,%2),0(%1),0\n"
59+
"3: mvcos 0(%2),0(%1),%4\n"
6060
"7: slgr %0,%4\n"
6161
" j 5f\n"
6262
"4: slgr %0,%0\n"
@@ -104,7 +104,7 @@ static unsigned long raw_copy_to_user_key(void __user *to, const void *from,
104104
tmp1 = -4096UL;
105105
asm volatile(
106106
" lr 0,%[spec]\n"
107-
"0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n"
107+
"0: mvcos 0(%1),0(%2),%0\n"
108108
"6: jz 4f\n"
109109
"1: algr %0,%3\n"
110110
" slgr %1,%3\n"
@@ -115,7 +115,7 @@ static unsigned long raw_copy_to_user_key(void __user *to, const void *from,
115115
" slgr %4,%1\n"
116116
" clgr %0,%4\n" /* copy crosses next page boundary? */
117117
" jnh 5f\n"
118-
"3: .insn ss,0xc80000000000,0(%4,%1),0(%2),0\n"
118+
"3: mvcos 0(%1),0(%2),%4\n"
119119
"7: slgr %0,%4\n"
120120
" j 5f\n"
121121
"4: slgr %0,%0\n"
@@ -155,7 +155,7 @@ unsigned long __clear_user(void __user *to, unsigned long size)
155155
tmp1 = -4096UL;
156156
asm volatile(
157157
" lr 0,%[spec]\n"
158-
"0: .insn ss,0xc80000000000,0(%0,%1),0(%4),0\n"
158+
"0: mvcos 0(%1),0(%4),%0\n"
159159
" jz 4f\n"
160160
"1: algr %0,%2\n"
161161
" slgr %1,%2\n"
@@ -165,7 +165,7 @@ unsigned long __clear_user(void __user *to, unsigned long size)
165165
" slgr %3,%1\n"
166166
" clgr %0,%3\n" /* copy crosses next page boundary? */
167167
" jnh 5f\n"
168-
"3: .insn ss,0xc80000000000,0(%3,%1),0(%4),0\n"
168+
"3: mvcos 0(%1),0(%4),%3\n"
169169
" slgr %0,%3\n"
170170
" j 5f\n"
171171
"4: slgr %0,%0\n"

‎arch/s390/mm/gmap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ static int gmap_protect_rmap(struct gmap *sg, unsigned long raddr,
12781278
static inline void gmap_idte_one(unsigned long asce, unsigned long vaddr)
12791279
{
12801280
asm volatile(
1281-
" .insn rrf,0xb98e0000,%0,%1,0,0"
1281+
" idte %0,0,%1"
12821282
: : "a" (asce), "a" (vaddr) : "cc", "memory");
12831283
}
12841284

0 commit comments

Comments
 (0)