mips: bpf: fix encoding bug for mm_srlv32_op
authorJiong Wang <jiong.wang@netronome.com>
Mon, 3 Dec 2018 22:27:54 +0000 (17:27 -0500)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 7 Dec 2018 21:29:48 +0000 (13:29 -0800)
For micro-mips, srlv inside POOL32A encoding space should use 0x50
sub-opcode, NOT 0x90.

Some early version ISA doc describes the encoding as 0x90 for both srlv and
srav, this looks to me was a typo. I checked Binutils libopcode
implementation which is using 0x50 for srlv and 0x90 for srav.

v1->v2:
  - Keep mm_srlv32_op sorted by value.

Fixes: f31318fdf324 ("MIPS: uasm: Add srlv uasm instruction")
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
arch/mips/include/uapi/asm/inst.h

index c05dcf5ab414e98eddd1839bb9afcd8d079f3ca8..273ef58f4d435e34baaae732269840be63503d93 100644 (file)
@@ -369,8 +369,8 @@ enum mm_32a_minor_op {
        mm_ext_op = 0x02c,
        mm_pool32axf_op = 0x03c,
        mm_srl32_op = 0x040,
+       mm_srlv32_op = 0x050,
        mm_sra_op = 0x080,
-       mm_srlv32_op = 0x090,
        mm_rotr_op = 0x0c0,
        mm_lwxs_op = 0x118,
        mm_addu32_op = 0x150,