Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'eth-fbnic-update-fbnic-driver'
Mohsin Bashir says:
====================
eth: fbnic: Update fbnic driver
This patchset makes following trivial changes to the fbnic driver:
1) Add coverage for PCIe CSRs in the ethtool register dump.
2) Consolidate the PUL_USER CSR section, update the end boundary,
and remove redundant definition of the end boundary.
3) Update the return value in kdoc for fbnic_netdev_alloc().
====================
Link: https://patch.msgid.link/20250221201813.2688052-1-mohsin.bashr@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+42
-39
+1
drivers/net/ethernet/meta/fbnic/fbnic_csr.c
+1
drivers/net/ethernet/meta/fbnic/fbnic_csr.c
+40
-38
drivers/net/ethernet/meta/fbnic/fbnic_csr.h
+40
-38
drivers/net/ethernet/meta/fbnic/fbnic_csr.h
···
788
788
#define FBNIC_MAC_STAT_TX_MULTICAST_H 0x11a4b /* 0x4692c */
789
789
#define FBNIC_MAC_STAT_TX_BROADCAST_L 0x11a4c /* 0x46930 */
790
790
#define FBNIC_MAC_STAT_TX_BROADCAST_H 0x11a4d /* 0x46934 */
791
+
792
+
/* PCIE Comphy Registers */
793
+
#define FBNIC_CSR_START_PCIE_SS_COMPHY 0x2442e /* CSR section delimiter */
794
+
#define FBNIC_CSR_END_PCIE_SS_COMPHY 0x279d7 /* CSR section delimiter */
795
+
791
796
/* PUL User Registers */
792
797
#define FBNIC_CSR_START_PUL_USER 0x31000 /* CSR section delimiter */
793
798
#define FBNIC_PUL_OB_TLP_HDR_AW_CFG 0x3103d /* 0xc40f4 */
794
799
#define FBNIC_PUL_OB_TLP_HDR_AW_CFG_BME CSR_BIT(18)
795
800
#define FBNIC_PUL_OB_TLP_HDR_AR_CFG 0x3103e /* 0xc40f8 */
796
801
#define FBNIC_PUL_OB_TLP_HDR_AR_CFG_BME CSR_BIT(18)
797
-
#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 */
798
837
799
838
/* Queue Registers
800
839
*
···
972
933
#define FBNIC_QUEUE_RIM_TIMER_MASK CSR_GENMASK(13, 0)
973
934
#define FBNIC_MAX_QUEUES 128
974
935
#define FBNIC_CSR_END_QUEUE (0x40000 + 0x400 * FBNIC_MAX_QUEUES - 1)
975
-
976
-
/* PUL User Registers*/
977
-
#define FBNIC_PUL_USER_OB_RD_TLP_CNT_31_0 \
978
-
0x3106e /* 0xc41b8 */
979
-
#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_31_0 \
980
-
0x31070 /* 0xc41c0 */
981
-
#define FBNIC_PUL_USER_OB_RD_DWORD_CNT_63_32 \
982
-
0x31071 /* 0xc41c4 */
983
-
#define FBNIC_PUL_USER_OB_WR_TLP_CNT_31_0 \
984
-
0x31072 /* 0xc41c8 */
985
-
#define FBNIC_PUL_USER_OB_WR_TLP_CNT_63_32 \
986
-
0x31073 /* 0xc41cc */
987
-
#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_31_0 \
988
-
0x31074 /* 0xc41d0 */
989
-
#define FBNIC_PUL_USER_OB_WR_DWORD_CNT_63_32 \
990
-
0x31075 /* 0xc41d4 */
991
-
#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_31_0 \
992
-
0x31076 /* 0xc41d8 */
993
-
#define FBNIC_PUL_USER_OB_CPL_TLP_CNT_63_32 \
994
-
0x31077 /* 0xc41dc */
995
-
#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_31_0 \
996
-
0x31078 /* 0xc41e0 */
997
-
#define FBNIC_PUL_USER_OB_CPL_DWORD_CNT_63_32 \
998
-
0x31079 /* 0xc41e4 */
999
-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_31_0 \
1000
-
0x3107a /* 0xc41e8 */
1001
-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_CPL_CRED_63_32 \
1002
-
0x3107b /* 0xc41ec */
1003
-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_31_0 \
1004
-
0x3107c /* 0xc41f0 */
1005
-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_TAG_63_32 \
1006
-
0x3107d /* 0xc41f4 */
1007
-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_31_0 \
1008
-
0x3107e /* 0xc41f8 */
1009
-
#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_63_32 \
1010
-
0x3107f /* 0xc41fc */
1011
-
#define FBNIC_CSR_END_PUL_USER 0x31080 /* CSR section delimiter */
1012
936
1013
937
/* BAR 4 CSRs */
1014
938
+1
-1
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
+1
-1
drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
···
611
611
* Allocate and initialize the netdev and netdev private structure. Bind
612
612
* together the hardware, netdev, and pci data structures.
613
613
*
614
-
* Return: 0 on success, negative on failure
614
+
* Return: Pointer to net_device on success, NULL on failure
615
615
**/
616
616
struct net_device *fbnic_netdev_alloc(struct fbnic_dev *fbd)
617
617
{