nfp: bpf: rename ALU_OP_NEG to ALU_OP_NOT
authorJiong Wang <jiong.wang@netronome.com>
Wed, 1 Nov 2017 17:38:24 +0000 (10:38 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Nov 2017 07:47:30 +0000 (16:47 +0900)
The current ALU_OP_NEG is Op encoding 0x4 for NPF ALU instruction. It is
actually performing "~B" operation which is bitwise NOT.

The using naming ALU_OP_NEG is misleading as NEG is -B which is not the
same as ~B.

Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/netronome/nfp/bpf/jit.c
drivers/net/ethernet/netronome/nfp/nfp_asm.h

index e7eeb7a07f81dd5c89f67cc451a5faa51e0fc6f1..369173100fcf409562df7bfb4d4d52d1f8d605b0 100644 (file)
@@ -944,7 +944,7 @@ wrp_alu_imm(struct nfp_prog *nfp_prog, u8 dst, enum alu_op alu_op, u32 imm)
        if (alu_op == ALU_OP_XOR) {
                if (!~imm)
                        emit_alu(nfp_prog, reg_both(dst), reg_none(),
-                                ALU_OP_NEG, reg_b(dst));
+                                ALU_OP_NOT, reg_b(dst));
                if (!imm || !~imm)
                        return;
        }
index f4d1df3a1925b3439b532f2f596ea3916c10ad5b..74d0c11ab2f908b285aea6f6c968e55fe6b0813e 100644 (file)
@@ -174,7 +174,7 @@ enum shf_sc {
 enum alu_op {
        ALU_OP_NONE     = 0x00,
        ALU_OP_ADD      = 0x01,
-       ALU_OP_NEG      = 0x04,
+       ALU_OP_NOT      = 0x04,
        ALU_OP_AND      = 0x08,
        ALU_OP_SUB_C    = 0x0d,
        ALU_OP_ADD_C    = 0x11,