Skip to content

L
linux
Commit 8afd9c96 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files
Options

nfp: add more white space to the instruction defines 

We need to add longer OP_* defines, move the values away.
Purely whitespace commit.
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 509144e2
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 78 deletions
drivers/net/ethernet/netronome/nfp/nfp_asm.h
View file @ 8afd9c96
...@@ -53,14 +53,14 @@ ...@@ -53,14 +53,14 @@
#define UR_REG_IMM_encode(x) (UR_REG_IMM | (x)) #define UR_REG_IMM_encode(x) (UR_REG_IMM | (x))
#define UR_REG_IMM_MAX 0x0ffULL #define UR_REG_IMM_MAX 0x0ffULL
#define OP_BR_BASE 0x0d800000020ULL #define OP_BR_BASE 0x0d800000020ULL
#define OP_BR_BASE_MASK 0x0f8000c3ce0ULL #define OP_BR_BASE_MASK 0x0f8000c3ce0ULL
#define OP_BR_MASK 0x0000000001fULL #define OP_BR_MASK 0x0000000001fULL
#define OP_BR_EV_PIP 0x00000000300ULL #define OP_BR_EV_PIP 0x00000000300ULL
#define OP_BR_CSS 0x0000003c000ULL #define OP_BR_CSS 0x0000003c000ULL
#define OP_BR_DEFBR 0x00000300000ULL #define OP_BR_DEFBR 0x00000300000ULL
#define OP_BR_ADDR_LO 0x007ffc00000ULL #define OP_BR_ADDR_LO 0x007ffc00000ULL
#define OP_BR_ADDR_HI 0x10000000000ULL #define OP_BR_ADDR_HI 0x10000000000ULL
#define nfp_is_br(_insn) \ #define nfp_is_br(_insn) \
(((_insn) & OP_BR_BASE_MASK) == OP_BR_BASE) (((_insn) & OP_BR_BASE_MASK) == OP_BR_BASE)
...@@ -83,30 +83,30 @@ enum br_ctx_signal_state { ...@@ -83,30 +83,30 @@ enum br_ctx_signal_state {
BR_CSS_NONE = 2, BR_CSS_NONE = 2,
}; };
#define OP_BBYTE_BASE 0x0c800000000ULL #define OP_BBYTE_BASE 0x0c800000000ULL
#define OP_BB_A_SRC 0x000000000ffULL #define OP_BB_A_SRC 0x000000000ffULL
#define OP_BB_BYTE 0x00000000300ULL #define OP_BB_BYTE 0x00000000300ULL
#define OP_BB_B_SRC 0x0000003fc00ULL #define OP_BB_B_SRC 0x0000003fc00ULL
#define OP_BB_I8 0x00000040000ULL #define OP_BB_I8 0x00000040000ULL
#define OP_BB_EQ 0x00000080000ULL #define OP_BB_EQ 0x00000080000ULL
#define OP_BB_DEFBR 0x00000300000ULL #define OP_BB_DEFBR 0x00000300000ULL
#define OP_BB_ADDR_LO 0x007ffc00000ULL #define OP_BB_ADDR_LO 0x007ffc00000ULL
#define OP_BB_ADDR_HI 0x10000000000ULL #define OP_BB_ADDR_HI 0x10000000000ULL
#define OP_BALU_BASE 0x0e800000000ULL #define OP_BALU_BASE 0x0e800000000ULL
#define OP_BA_A_SRC 0x000000003ffULL #define OP_BA_A_SRC 0x000000003ffULL
#define OP_BA_B_SRC 0x000000ffc00ULL #define OP_BA_B_SRC 0x000000ffc00ULL
#define OP_BA_DEFBR 0x00000300000ULL #define OP_BA_DEFBR 0x00000300000ULL
#define OP_BA_ADDR_HI 0x0007fc00000ULL #define OP_BA_ADDR_HI 0x0007fc00000ULL
#define OP_IMMED_A_SRC 0x000000003ffULL #define OP_IMMED_A_SRC 0x000000003ffULL
#define OP_IMMED_B_SRC 0x000000ffc00ULL #define OP_IMMED_B_SRC 0x000000ffc00ULL
#define OP_IMMED_IMM 0x0000ff00000ULL #define OP_IMMED_IMM 0x0000ff00000ULL
#define OP_IMMED_WIDTH 0x00060000000ULL #define OP_IMMED_WIDTH 0x00060000000ULL
#define OP_IMMED_INV 0x00080000000ULL #define OP_IMMED_INV 0x00080000000ULL
#define OP_IMMED_SHIFT 0x00600000000ULL #define OP_IMMED_SHIFT 0x00600000000ULL
#define OP_IMMED_BASE 0x0f000000000ULL #define OP_IMMED_BASE 0x0f000000000ULL
#define OP_IMMED_WR_AB 0x20000000000ULL #define OP_IMMED_WR_AB 0x20000000000ULL
enum immed_width { enum immed_width {
IMMED_WIDTH_ALL = 0, IMMED_WIDTH_ALL = 0,
...@@ -120,17 +120,17 @@ enum immed_shift { ...@@ -120,17 +120,17 @@ enum immed_shift {
IMMED_SHIFT_2B = 2, IMMED_SHIFT_2B = 2,
}; };
#define OP_SHF_BASE 0x08000000000ULL #define OP_SHF_BASE 0x08000000000ULL
#define OP_SHF_A_SRC 0x000000000ffULL #define OP_SHF_A_SRC 0x000000000ffULL
#define OP_SHF_SC 0x00000000300ULL #define OP_SHF_SC 0x00000000300ULL
#define OP_SHF_B_SRC 0x0000003fc00ULL #define OP_SHF_B_SRC 0x0000003fc00ULL
#define OP_SHF_I8 0x00000040000ULL #define OP_SHF_I8 0x00000040000ULL
#define OP_SHF_SW 0x00000080000ULL #define OP_SHF_SW 0x00000080000ULL
#define OP_SHF_DST 0x0000ff00000ULL #define OP_SHF_DST 0x0000ff00000ULL
#define OP_SHF_SHIFT 0x001f0000000ULL #define OP_SHF_SHIFT 0x001f0000000ULL
#define OP_SHF_OP 0x00e00000000ULL #define OP_SHF_OP 0x00e00000000ULL
#define OP_SHF_DST_AB 0x01000000000ULL #define OP_SHF_DST_AB 0x01000000000ULL
#define OP_SHF_WR_AB 0x20000000000ULL #define OP_SHF_WR_AB 0x20000000000ULL
enum shf_op { enum shf_op {
SHF_OP_NONE = 0, SHF_OP_NONE = 0,
...@@ -145,14 +145,14 @@ enum shf_sc { ...@@ -145,14 +145,14 @@ enum shf_sc {
SHF_SC_R_DSHF = 3, SHF_SC_R_DSHF = 3,
}; };
#define OP_ALU_A_SRC 0x000000003ffULL #define OP_ALU_A_SRC 0x000000003ffULL
#define OP_ALU_B_SRC 0x000000ffc00ULL #define OP_ALU_B_SRC 0x000000ffc00ULL
#define OP_ALU_DST 0x0003ff00000ULL #define OP_ALU_DST 0x0003ff00000ULL
#define OP_ALU_SW 0x00040000000ULL #define OP_ALU_SW 0x00040000000ULL
#define OP_ALU_OP 0x00f80000000ULL #define OP_ALU_OP 0x00f80000000ULL
#define OP_ALU_DST_AB 0x01000000000ULL #define OP_ALU_DST_AB 0x01000000000ULL
#define OP_ALU_BASE 0x0a000000000ULL #define OP_ALU_BASE 0x0a000000000ULL
#define OP_ALU_WR_AB 0x20000000000ULL #define OP_ALU_WR_AB 0x20000000000ULL
enum alu_op { enum alu_op {
ALU_OP_NONE = 0x00, ALU_OP_NONE = 0x00,
...@@ -171,26 +171,26 @@ enum alu_dst_ab { ...@@ -171,26 +171,26 @@ enum alu_dst_ab {
ALU_DST_B = 1, ALU_DST_B = 1,
}; };
#define OP_LDF_BASE 0x0c000000000ULL #define OP_LDF_BASE 0x0c000000000ULL
#define OP_LDF_A_SRC 0x000000000ffULL #define OP_LDF_A_SRC 0x000000000ffULL
#define OP_LDF_SC 0x00000000300ULL #define OP_LDF_SC 0x00000000300ULL
#define OP_LDF_B_SRC 0x0000003fc00ULL #define OP_LDF_B_SRC 0x0000003fc00ULL
#define OP_LDF_I8 0x00000040000ULL #define OP_LDF_I8 0x00000040000ULL
#define OP_LDF_SW 0x00000080000ULL #define OP_LDF_SW 0x00000080000ULL
#define OP_LDF_ZF 0x00000100000ULL #define OP_LDF_ZF 0x00000100000ULL
#define OP_LDF_BMASK 0x0000f000000ULL #define OP_LDF_BMASK 0x0000f000000ULL
#define OP_LDF_SHF 0x001f0000000ULL #define OP_LDF_SHF 0x001f0000000ULL
#define OP_LDF_WR_AB 0x20000000000ULL #define OP_LDF_WR_AB 0x20000000000ULL
#define OP_CMD_A_SRC 0x000000000ffULL #define OP_CMD_A_SRC 0x000000000ffULL
#define OP_CMD_CTX 0x00000000300ULL #define OP_CMD_CTX 0x00000000300ULL
#define OP_CMD_B_SRC 0x0000003fc00ULL #define OP_CMD_B_SRC 0x0000003fc00ULL
#define OP_CMD_TOKEN 0x000000c0000ULL #define OP_CMD_TOKEN 0x000000c0000ULL
#define OP_CMD_XFER 0x00001f00000ULL #define OP_CMD_XFER 0x00001f00000ULL
#define OP_CMD_CNT 0x0000e000000ULL #define OP_CMD_CNT 0x0000e000000ULL
#define OP_CMD_SIG 0x000f0000000ULL #define OP_CMD_SIG 0x000f0000000ULL
#define OP_CMD_TGT_CMD 0x07f00000000ULL #define OP_CMD_TGT_CMD 0x07f00000000ULL
#define OP_CMD_MODE 0x1c0000000000ULL #define OP_CMD_MODE 0x1c0000000000ULL
struct cmd_tgt_act { struct cmd_tgt_act {
u8 token; u8 token;
...@@ -218,11 +218,11 @@ enum cmd_ctx_swap { ...@@ -218,11 +218,11 @@ enum cmd_ctx_swap {
CMD_CTX_NO_SWAP = 3, CMD_CTX_NO_SWAP = 3,
}; };
#define OP_LCSR_BASE 0x0fc00000000ULL #define OP_LCSR_BASE 0x0fc00000000ULL
#define OP_LCSR_A_SRC 0x000000003ffULL #define OP_LCSR_A_SRC 0x000000003ffULL
#define OP_LCSR_B_SRC 0x000000ffc00ULL #define OP_LCSR_B_SRC 0x000000ffc00ULL
#define OP_LCSR_WRITE 0x00000200000ULL #define OP_LCSR_WRITE 0x00000200000ULL
#define OP_LCSR_ADDR 0x001ffc00000ULL #define OP_LCSR_ADDR 0x001ffc00000ULL
enum lcsr_wr_src { enum lcsr_wr_src {
LCSR_WR_AREG, LCSR_WR_AREG,
...@@ -230,8 +230,8 @@ enum lcsr_wr_src { ...@@ -230,8 +230,8 @@ enum lcsr_wr_src {
LCSR_WR_IMM, LCSR_WR_IMM,
}; };
#define OP_CARB_BASE 0x0e000000000ULL #define OP_CARB_BASE 0x0e000000000ULL
#define OP_CARB_OR 0x00000010000ULL #define OP_CARB_OR 0x00000010000ULL
/* Software register representation, independent of operand type */ /* Software register representation, independent of operand type */
#define NN_REG_TYPE GENMASK(31, 24) #define NN_REG_TYPE GENMASK(31, 24)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7