eth: fbnic: trivial code tweaks
Subsystems (3)
Jakub Kicinski
maintainercover eth: fbnic: trivial code tweaks
A handful of code cleanups. No functional changes.
Jakub Kicinski (5):
eth: fbnic: remove duplicate FBNIC_MAX_.XQS macros
eth: fbnic: fix stampinn typo in a comment
eth: fbnic: realign whitespace
eth: fbnic: sort includes
eth: fbnic: rename fbnic_fw_clear_cmpl to fbnic_mbx_clear_cmpl
drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 22 ++---- drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 8 +- .../net/ethernet/meta/fbnic/fbnic_netdev.h | 5 +- drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 3 - .../net/ethernet/meta/fbnic/fbnic_devlink.c | 4 +- .../net/ethernet/meta/fbnic/fbnic_ethtool.c | 73 +++++++++---------- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 30 ++++---- drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 2 +- 8 files changed, 69 insertions(+), 78 deletions(-)
Signature · 1 line
2.49.0
Jakub Kicinski
maintainerPATCH 1/5 eth: fbnic: remove duplicate FBNIC_MAX_.XQS macros
Somehow we ended up with two copies of FBNIC_MAX_[TR]XQS in fbnic_txrx.h. Remove the one mixed with the struct declarations.
--- drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/meta/fbnic/fbnic_txrx.h +0 -3
@@ -141,9 +141,6 @@ struct fbnic_napi_vector {struct fbnic_q_triad qt[]; }; -#define FBNIC_MAX_TXQS 128u -#define FBNIC_MAX_RXQS 128u -netdev_tx_t fbnic_xmit_frame (struct sk_buff *skb,struct net_device *dev); netdev_features_t fbnic_features_check(struct sk_buff *skb, struct net_device *dev,
Signature · 1 line
2.49.0
Re: [PATCH net-next 1/5] eth: fbnic: remove duplicate FBNIC_MAX_.XQS macros
Quoted 4 lines · Jakub Kicinski
Somehow we ended up with two copies of FBNIC_MAX_[TR]XQS in
fbnic_txrx.h. Remove the one mixed with the struct declarations.Signed-off-by Jakub Kicinski <[email protected]>
Jakub Kicinski
maintainerPATCH 2/5 eth: fbnic: fix stampinn typo in a comment
In reply to Jakub KicinskiFix a typo:
stampinn -> stamping
--- drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/meta/fbnic/fbnic_netdev.h +1 -1
@@ -66,7 +66,7 @@ struct fbnic_net {struct fbnic_queue_stats rx_stats;u64 link_down_events; -/* Time stampinn filter config */ +/* Time stamping filter config */ struct kernel_hwtstamp_config hwtstamp_config; };
Signature · 1 line
2.49.0
Re: [PATCH net-next 2/5] eth: fbnic: fix stampinn typo in a comment
Quoted 13 lines · Jakub Kicinski
Fix a typo:
stampinn -> stampingSigned-off-by Jakub Kicinski <[email protected]>--- drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/ethernet/meta/fbnic/fbnic_netdev.h +0
-0
drivers/net/ethernet/meta/fbnic/fbnic_netdev.h struct fbnic_net { · line 72
Quoted 8 lines
drivers/net/ethernet/meta/fbnic/fbnic_netdev.h +1
-1@@ -66,7 +66,7 @@ struct fbnic_net {struct fbnic_queue_stats rx_stats;u64 link_down_events; -/* Time stampinn filter config */ +/* Time stamping filter config */ struct kernel_hwtstamp_config hwtstamp_config; };
Jakub Kicinski
maintainerPATCH 3/5 eth: fbnic: realign whitespace
In reply to Jakub KicinskiRelign various whitespace things. Some of it is spaces which should be tabs and some is making sure the values are actually correctly aligned to "columns" with 8 space tabs. Whitespace changes only.
--- drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 22 ++---- drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 4 +- .../net/ethernet/meta/fbnic/fbnic_netdev.h | 1 + .../net/ethernet/meta/fbnic/fbnic_ethtool.c | 73 +++++++++---------- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 10 +-- 5 files changed, 52 insertions(+), 58 deletions(-)
drivers/net/ethernet/meta/fbnic/fbnic_csr.h +8 -14
@@ -493,7 +493,7 @@ enum {#define FBNIC_PTP_ADD_VAL_NS 0x04806/* 0x12018 */ #define FBNIC_PTP_ADD_VAL_NS_MASK CSR_GENMASK(15, 0) -#define FBNIC_PTP_ADD_VAL_SUBNS 0x04807/* 0x1201c */ +#define FBNIC_PTP_ADD_VAL_SUBNS 0x04807/* 0x1201c */ #define FBNIC_PTP_CTR_VAL_HI 0x04808/* 0x12020 */ #define FBNIC_PTP_CTR_VAL_LO 0x04809/* 0x12024 */
@@ -816,16 +816,12 @@ enum {#define FBNIC_CSR_START_MAC_STAT 0x11a00#define FBNIC_MAC_STAT_RX_BYTE_COUNT_L 0x11a08/* 0x46820 */ #define FBNIC_MAC_STAT_RX_BYTE_COUNT_H 0x11a09/* 0x46824 */ -#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_L \ - 0x11a0a/* 0x46828 */ -#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_H \ - 0x11a0b/* 0x4682c */ +#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_L 0x11a0a/* 0x46828 */ +#define FBNIC_MAC_STAT_RX_ALIGN_ERROR_H 0x11a0b/* 0x4682c */ #define FBNIC_MAC_STAT_RX_TOOLONG_L 0x11a0e/* 0x46838 */ #define FBNIC_MAC_STAT_RX_TOOLONG_H 0x11a0f/* 0x4683c */ -#define FBNIC_MAC_STAT_RX_RECEIVED_OK_L \ - 0x11a12/* 0x46848 */ -#define FBNIC_MAC_STAT_RX_RECEIVED_OK_H \ - 0x11a13/* 0x4684c */ +#define FBNIC_MAC_STAT_RX_RECEIVED_OK_L 0x11a12/* 0x46848 */ +#define FBNIC_MAC_STAT_RX_RECEIVED_OK_H 0x11a13/* 0x4684c */ #define FBNIC_MAC_STAT_RX_PACKET_BAD_FCS_L \ 0x11a14/* 0x46850 */ #define FBNIC_MAC_STAT_RX_PACKET_BAD_FCS_H \
@@ -882,10 +878,8 @@ enum { 0x11a42 /* 0x46908 */#define FBNIC_MAC_STAT_TX_TRANSMITTED_OK_H \ 0x11a43/* 0x4690c */ -#define FBNIC_MAC_STAT_TX_IFOUTERRORS_L \ - 0x11a46/* 0x46918 */ -#define FBNIC_MAC_STAT_TX_IFOUTERRORS_H \ - 0x11a47/* 0x4691c */ +#define FBNIC_MAC_STAT_TX_IFOUTERRORS_L 0x11a46/* 0x46918 */ +#define FBNIC_MAC_STAT_TX_IFOUTERRORS_H 0x11a47/* 0x4691c */ #define FBNIC_MAC_STAT_TX_MULTICAST_L 0x11a4a/* 0x46928 */ #define FBNIC_MAC_STAT_TX_MULTICAST_H 0x11a4b/* 0x4692c */ #define FBNIC_MAC_STAT_TX_BROADCAST_L 0x11a4c/* 0x46930 */
@@ -969,7 +963,7 @@ enum { 0x3107e /* 0xc41f8 */#define FBNIC_PUL_USER_OB_RD_DBG_CNT_NP_CRED_63_32 \ 0x3107f/* 0xc41fc */ -#define FBNIC_CSR_END_PUL_USER 0x310ea/* CSR section delimiter */ +#define FBNIC_CSR_END_PUL_USER 0x310ea/* CSR section delimiter */ /* Queue Registers *
drivers/net/ethernet/meta/fbnic/fbnic_fw.h +2 -2
@@ -19,10 +19,10 @@ struct fbnic_fw_mbx { };// FW_VER_MAX_SIZE must match ETHTOOL_FWVERS_LEN -#define FBNIC_FW_VER_MAX_SIZE 32 +#define FBNIC_FW_VER_MAX_SIZE 32// Formatted version is in the format XX.YY.ZZ_RRR_COMMIT #define FBNIC_FW_CAP_RESP_COMMIT_MAX_SIZE (FBNIC_FW_VER_MAX_SIZE - 13) -#define FBNIC_FW_LOG_MAX_SIZE 256 +#define FBNIC_FW_LOG_MAX_SIZE 256struct fbnic_fw_ver {u32 version;
drivers/net/ethernet/meta/fbnic/fbnic_netdev.h +1 -0
@@ -81,6 +81,7 @@ int fbnic_netdev_register(struct net_device *netdev);void fbnic_netdev_unregister (struct net_device *netdev);void fbnic_reset_queues (struct fbnic_net *fbn,unsigned int tx,unsigned int rx); +void fbnic_set_ethtool_ops (struct net_device *dev);int fbnic_ptp_setup (struct fbnic_dev *fbd);
drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c +36 -37
79 lines not on this page · raw message
drivers/net/ethernet/meta/fbnic/fbnic_fw.c +5 -5
@@ -376,11 +376,11 @@ fbnic_fw_get_cmpl_by_type(struct fbnic_dev *fbd, u32 msg_type)* * Return: * One the following values: -* -EOPNOTSUPP: Is not ASIC so mailbox is not supported -* -ENODEV: Device I/O error -* -ENOMEM: Failed to allocate message -* -EBUSY: No space in mailbox -* -ENOSPC: DMA mapping failed +* -EOPNOTSUPP: Is not ASIC so mailbox is not supported +* -ENODEV: Device I/O error +* -ENOMEM: Failed to allocate message +* -EBUSY: No space in mailbox +* -ENOSPC: DMA mapping failed * * This function sends a single TLV header indicating the host wants to take * some action. However there are no other side effects which means that any
Signature · 1 line
2.49.0
Re: [PATCH net-next 3/5] eth: fbnic: realign whitespace
Quoted 5 lines · Jakub Kicinski
Relign various whitespace things. Some of it is spaces which should be tabs and some is making sure the values are actually correctly aligned to "columns" with 8 space tabs. Whitespace changes only.
Signed-off-by Jakub Kicinski <[email protected]>
Jakub Kicinski
maintainerPATCH 4/5 eth: fbnic: sort includes
In reply to Jakub KicinskiMake sure includes are in alphabetical order.
--- drivers/net/ethernet/meta/fbnic/fbnic_netdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/meta/fbnic/fbnic_netdev.h +1 -1
@@ -4,8 +4,8 @@#ifndef _FBNIC_NETDEV_H_#define _FBNIC_NETDEV_H_ -#include <linux/types.h> #include <linux/phylink.h> +#include <linux/types.h> #include "fbnic_csr.h" #include "fbnic_rpc.h"
Signature · 1 line
2.49.0
Re: [PATCH net-next 4/5] eth: fbnic: sort includes
Quoted 1 line · Jakub Kicinski
Make sure includes are in alphabetical order.
\o/
Quoted 1 line
Signed-off-by Jakub Kicinski <[email protected]>
Jakub Kicinski
maintainerPATCH 5/5 eth: fbnic: rename fbnic_fw_clear_cmpl to fbnic_mbx_clear_cmpl
In reply to Jakub Kicinskifbnic_fw_clear_cmpl() does the inverse of fbnic_mbx_set_cmpl(). It removes the completion from the mailbox table.
It also calls fbnic_mbx_set_cmpl_slot() internally. It should have fbnic_mbx prefix, not fbnic_fw.
I'm not very clear on what the distinction is between the two prefixes but the matching "set" and "clear" functions should use the same prefix.
While at it move the "clear" function closer to the "set".
--- drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 4 ++-- .../net/ethernet/meta/fbnic/fbnic_devlink.c | 4 ++-- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 20 +++++++++---------- drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-)
drivers/net/ethernet/meta/fbnic/fbnic_fw.h +2 -2
@@ -66,6 +66,8 @@ void fbnic_mbx_init(struct fbnic_dev *fbd);void fbnic_mbx_clean (struct fbnic_dev *fbd);int fbnic_mbx_set_cmpl (struct fbnic_dev *fbd,struct fbnic_fw_completion *cmpl_data); +void fbnic_mbx_clear_cmpl (struct fbnic_dev *fbd, +struct fbnic_fw_completion *cmpl_data);void fbnic_mbx_poll (struct fbnic_dev *fbd);int fbnic_mbx_poll_tx_ready (struct fbnic_dev *fbd);void fbnic_mbx_flush_tx (struct fbnic_dev *fbd);
@@ -81,8 +83,6 @@ int fbnic_fw_xmit_fw_write_chunk(struct fbnic_dev *fbd,int fbnic_fw_xmit_tsene_read_msg (struct fbnic_dev *fbd,struct fbnic_fw_completion *cmpl_data);struct fbnic_fw_completion *fbnic_fw_alloc_cmpl (u32 msg_type); -void fbnic_fw_clear_cmpl (struct fbnic_dev *fbd, -struct fbnic_fw_completion *cmpl_data);void fbnic_fw_put_cmpl (struct fbnic_fw_completion *cmpl_data);#define fbnic_mk_full_fw_ver_str (_rev_id, _delim, _commit, _str, _str_sz) \
drivers/net/ethernet/meta/fbnic/fbnic_devlink.c +2 -2
@@ -182,7 +182,7 @@ fbnic_flash_start(struct fbnic_dev *fbd, struct pldmfw_component *component)else err = -ETIMEDOUT ; -fbnic_fw_clear_cmpl (fbd, cmpl); +fbnic_mbx_clear_cmpl (fbd, cmpl); cmpl_free:fbnic_fw_put_cmpl (cmpl);
@@ -300,7 +300,7 @@ fbnic_flash_component(struct pldmfw *context, component_name, 0, 0); } -fbnic_fw_clear_cmpl (fbd, cmpl); +fbnic_mbx_clear_cmpl (fbd, cmpl); cmpl_free:fbnic_fw_put_cmpl (cmpl);
drivers/net/ethernet/meta/fbnic/fbnic_fw.c +10 -10
@@ -338,6 +338,16 @@ static int fbnic_mbx_map_req_w_cmpl(struct fbnic_dev *fbd,return err; } +void fbnic_mbx_clear_cmpl (struct fbnic_dev *fbd, +struct fbnic_fw_completion *fw_cmpl) +{ +unsigned long flags; + +spin_lock_irqsave (&fbd->fw_tx_lock, flags); +fbnic_mbx_clear_cmpl_slot (fbd, fw_cmpl); +spin_unlock_irqrestore (&fbd->fw_tx_lock, flags); +} +static void fbnic_fw_release_cmpl_data (struct kref *kref) {struct fbnic_fw_completion *cmpl_data;
@@ -1263,16 +1273,6 @@ struct fbnic_fw_completion *fbnic_fw_alloc_cmpl(u32 msg_type)return cmpl; } -void fbnic_fw_clear_cmpl (struct fbnic_dev *fbd, -struct fbnic_fw_completion *fw_cmpl) -{ -unsigned long flags; - -spin_lock_irqsave (&fbd->fw_tx_lock, flags); -fbnic_mbx_clear_cmpl_slot (fbd, fw_cmpl); -spin_unlock_irqrestore (&fbd->fw_tx_lock, flags); -} -void fbnic_fw_put_cmpl (struct fbnic_fw_completion *fw_cmpl) {kref_put (&fw_cmpl->ref_count, fbnic_fw_release_cmpl_data);
drivers/net/ethernet/meta/fbnic/fbnic_mac.c +1 -1
@@ -796,7 +796,7 @@ static int fbnic_mac_get_sensor_asic(struct fbnic_dev *fbd, int id, *val = *sensor; exit_cleanup: -fbnic_fw_clear_cmpl (fbd, fw_cmpl); +fbnic_mbx_clear_cmpl (fbd, fw_cmpl); exit_free:fbnic_fw_put_cmpl (fw_cmpl);
Signature · 1 line
2.49.0
Re: [PATCH net-next 5/5] eth: fbnic: rename fbnic_fw_clear_cmpl to fbnic_mbx_clear_cmpl
Quoted 11 lines · Jakub Kicinski
fbnic_fw_clear_cmpl()does the inverse offbnic_mbx_set_cmpl(). It removes the completion from the mailbox table.
It also callsfbnic_mbx_set_cmpl_slot()internally. It should havefbnic_mbxprefix, notfbnic_fw.
I'm not very clear on what the distinction is between the two prefixes but the matching "set" and "clear" functions should use the same prefix.While at it move the "clear" function closer to the "set".
Signed-off-by Jakub Kicinski <[email protected]>
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:
Quoted 10 lines · On Tue, 24 Jun 2025 07:28:29 -0700 you wrote:
A handful of code cleanups. No functional changes.
Jakub Kicinski (5):
eth: fbnic: remove duplicate FBNIC_MAX_.XQS macros
eth: fbnic: fix stampinn typo in a comment
eth: fbnic: realign whitespace
eth: fbnic: sort includes
eth: fbnic: renamefbnic_fw_clear_cmpltofbnic_mbx_clear_cmpl[...]
Here is the summary with links:
- [net-next,1/5] eth: fbnic: remove duplicate FBNIC_MAX_.XQS macros
https://git.kernel.org/netdev/net-next/c/f2657cfb4586 - [net-next,2/5] eth: fbnic: fix stampinn typo in a comment https://git.kernel.org/netdev/net-next/c/461bc4030dc9 - [net-next,3/5] eth: fbnic: realign whitespace https://git.kernel.org/netdev/net-next/c/f7d4c21667cc - [net-next,4/5] eth: fbnic: sort includes https://git.kernel.org/netdev/net-next/c/536bc9b2d8e8 - [net-next,5/5] eth: fbnic: rename fbnic_fw_clear_cmpl to fbnic_mbx_clear_cmpl https://git.kernel.org/netdev/net-next/c/d42e5248c9fa
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html