Skip to content

Commit 5d8da90

Browse files
Mohsin BashirNipaLocal
authored andcommitted
eth: fbnic: Consolidate PUL_USER CSR section
Move PUL_USER CSRs in the relevant section, update the end boundary address, and remove the redundant definition of end boundary. Signed-off-by: Mohsin Bashir <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent ce978dc commit 5d8da90

File tree

1 file changed

+35
-38
lines changed

1 file changed

+35
-38
lines changed

drivers/net/ethernet/meta/fbnic/fbnic_csr.h

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -799,7 +799,41 @@ enum {
799799
#define FBNIC_PUL_OB_TLP_HDR_AW_CFG_BME CSR_BIT(18)
800800
#define FBNIC_PUL_OB_TLP_HDR_AR_CFG 0x3103e /* 0xc40f8 */
801801
#define FBNIC_PUL_OB_TLP_HDR_AR_CFG_BME CSR_BIT(18)
802-
#define FBNIC_CSR_END_PUL_USER 0x31080 /* CSR section delimiter */
802+
#define FBNIC_PUL_USER_OB_RD_TLP_CNT_31_0 \
803+
0x3106e /* 0xc41b8 */
804+
#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_31_0 \
805+
0x31070 /* 0xc41c0 */
806+
#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_63_32 \
807+
0x31071 /* 0xc41c4 */
808+
#define FBNIC_PUL_USER_OB_WR_TLP_CNT_31_0 \
809+
0x31072 /* 0xc41c8 */
810+
#define FBNIC_PUL_USER_OB_WR_TLP_CNT_63_32 \
811+
0x31073 /* 0xc41cc */
812+
#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_31_0 \
813+
0x31074 /* 0xc41d0 */
814+
#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_63_32 \
815+
0x31075 /* 0xc41d4 */
816+
#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_31_0 \
817+
0x31076 /* 0xc41d8 */
818+
#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_63_32 \
819+
0x31077 /* 0xc41dc */
820+
#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_31_0 \
821+
0x31078 /* 0xc41e0 */
822+
#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_63_32 \
823+
0x31079 /* 0xc41e4 */
824+
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_31_0 \
825+
0x3107a /* 0xc41e8 */
826+
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_63_32 \
827+
0x3107b /* 0xc41ec */
828+
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_31_0 \
829+
0x3107c /* 0xc41f0 */
830+
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_63_32 \
831+
0x3107d /* 0xc41f4 */
832+
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_31_0 \
833+
0x3107e /* 0xc41f8 */
834+
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_63_32 \
835+
0x3107f /* 0xc41fc */
836+
#define FBNIC_CSR_END_PUL_USER 0x310ea /* CSR section delimiter */
803837

804838
/* Queue Registers
805839
*
@@ -939,43 +973,6 @@ enum {
939973
#define FBNIC_MAX_QUEUES 128
940974
#define FBNIC_CSR_END_QUEUE (0x40000 + 0x400 * FBNIC_MAX_QUEUES - 1)
941975

942-
/* PUL User Registers*/
943-
#define FBNIC_PUL_USER_OB_RD_TLP_CNT_31_0 \
944-
0x3106e /* 0xc41b8 */
945-
#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_31_0 \
946-
0x31070 /* 0xc41c0 */
947-
#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_63_32 \
948-
0x31071 /* 0xc41c4 */
949-
#define FBNIC_PUL_USER_OB_WR_TLP_CNT_31_0 \
950-
0x31072 /* 0xc41c8 */
951-
#define FBNIC_PUL_USER_OB_WR_TLP_CNT_63_32 \
952-
0x31073 /* 0xc41cc */
953-
#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_31_0 \
954-
0x31074 /* 0xc41d0 */
955-
#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_63_32 \
956-
0x31075 /* 0xc41d4 */
957-
#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_31_0 \
958-
0x31076 /* 0xc41d8 */
959-
#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_63_32 \
960-
0x31077 /* 0xc41dc */
961-
#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_31_0 \
962-
0x31078 /* 0xc41e0 */
963-
#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_63_32 \
964-
0x31079 /* 0xc41e4 */
965-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_31_0 \
966-
0x3107a /* 0xc41e8 */
967-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_63_32 \
968-
0x3107b /* 0xc41ec */
969-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_31_0 \
970-
0x3107c /* 0xc41f0 */
971-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_63_32 \
972-
0x3107d /* 0xc41f4 */
973-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_31_0 \
974-
0x3107e /* 0xc41f8 */
975-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_63_32 \
976-
0x3107f /* 0xc41fc */
977-
#define FBNIC_CSR_END_PUL_USER 0x31080 /* CSR section delimiter */
978-
979976
/* BAR 4 CSRs */
980977

981978
/* The IPC mailbox consists of 32 mailboxes, with each mailbox consisting

0 commit comments

Comments
 (0)