be2net: get rid of be_ctrl_info struct/abstraction
Subsystems (2)
PATCH 1/5 be2net: get rid of be_ctrl_info struct/abstraction
Currently only the be_ctrl_info struct ptr (instead of adapter) is
passed to all the routines in be_cmds.c. Instead pass be_adapter
ptr to allow access to all its fields. Merge the contents of struct be_ctrl_info into be_adapter. The resulting code is simpler.
Signed-off-by Sathya Perla <[email protected]>
--- drivers/net/benet/be.h | 47 +++---- drivers/net/benet/be_cmds.c | 293 ++++++++++++++++++++-------------------- drivers/net/benet/be_cmds.h | 51 ++++---- drivers/net/benet/be_ethtool.c | 12 +- drivers/net/benet/be_main.c | 229 ++++++++++++++----------------- 5 files changed, 299 insertions(+), 333 deletions(-)
drivers/net/benet/be.h +18 -29
@@ -71,6 +71,8 @@ static inline char *nic_name(struct pci_dev *pdev)#define MAX_RX_POST BE_NAPI_WEIGHT/* Frags posted at a time */ #define RX_FRAGS_REFILL_WM (RX_Q_LEN - MAX_RX_POST) +#define FW_VER_LEN 32 +struct be_dma_mem {void *va;dma_addr_t dma;
@@ -123,7 +125,6 @@ static inline void queue_tail_inc(struct be_queue_info *q)index_inc (&q->tail, q->len); } -struct be_eq_obj {struct be_queue_info q;char desc[32 ];
@@ -142,31 +143,6 @@ struct be_mcc_obj {struct be_queue_info cq; }; -struct be_ctrl_info { -u8 __iomem *csr; -u8 __iomem *db;/* Door Bell */ -u8 __iomem *pcicfg;/* PCI config space */ -int pci_func; - -/* Mbox used for cmd request/response */ -spinlock_t mbox_lock;/* For serializing mbox cmds to BE card */ -struct be_dma_mem mbox_mem; -/* Mbox mem is adjusted to align to 16 bytes. The allocated addr -* is stored for freeing purpose */ -struct be_dma_mem mbox_mem_alloced; - -/* MCC Rings */ -struct be_mcc_obj mcc_obj; -spinlock_t mcc_lock;/* For serializing mcc cmds to BE card */ -spinlock_t mcc_cq_lock; - -/* MCC Async callback */ -void (*async_cb)(void *adapter,bool link_up); -void *adapter_ctxt; -}; - -#include "be_cmds.h" -struct be_drvr_stats {u32 be_tx_reqs;/* number of TX requests initiated */ u32 be_tx_stops;/* number of times TX Q was stopped */
@@ -234,8 +210,20 @@ struct be_adapter {struct pci_dev *pdev;struct net_device *netdev; -/* Mbox, pci config, csr address information */ -struct be_ctrl_info ctrl; +u8 __iomem *csr; +u8 __iomem *db;/* Door Bell */ +u8 __iomem *pcicfg;/* PCI config space */ +int pci_func; + +spinlock_t mbox_lock;/* For serializing mbox cmds to BE card */ +struct be_dma_mem mbox_mem; +/* Mbox mem is adjusted to align to 16 bytes. The allocated addr +* is stored for freeing purpose */ +struct be_dma_mem mbox_mem_alloced; + +struct be_mcc_obj mcc_obj; +spinlock_t mcc_lock;/* For serializing mcc cmds to BE card */ +spinlock_t mcc_cq_lock;struct msix_entry msix_entries[BE_NUM_MSIX_VECTORS ];bool msix_enabled;
@@ -366,6 +354,7 @@ static inline u8 is_udp_pkt(struct sk_buff *skb) return val; } -extern void be_cq_notify (struct be_ctrl_info *ctrl,u16 qid,bool arm, +extern void be_cq_notify (struct be_adapter *adapter,u16 qid,bool arm,u16 num_popped); +extern void be_link_status_update (struct be_adapter *adapter,bool link_up);#endif /* BE_H */
drivers/net/benet/be_cmds.c +147 -146
832 lines not on this page · raw message
drivers/net/benet/be_cmds.h +25 -26
84 lines not on this page · raw message
drivers/net/benet/be_ethtool.c +6 -6
@@ -16,6 +16,7 @@*/ #include "be.h" +#include "be_cmds.h" #include <linux/ethtool.h> struct be_ethtool_stat {
@@ -148,7 +149,6 @@ static int be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce) { struct be_adapter *adapter = netdev_priv(netdev); -struct be_ctrl_info *ctrl = &adapter->ctrl;struct be_eq_obj *rx_eq = &adapter->rx_eq;struct be_eq_obj *tx_eq = &adapter->tx_eq;u32 tx_max, tx_min, tx_cur;
@@ -176,7 +176,7 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)if (tx_cur >BE_MAX_EQD ) tx_cur =BE_MAX_EQD ;if (tx_eq->cur_eqd != tx_cur) { - status =be_cmd_modify_eqd (ctrl, tx_eq->q.id, tx_cur); + status =be_cmd_modify_eqd (adapter, tx_eq->q.id, tx_cur);if (!status) tx_eq->cur_eqd = tx_cur; }
@@ -196,7 +196,8 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)if (rx_cur >BE_MAX_EQD ) rx_cur =BE_MAX_EQD ;if (rx_eq->cur_eqd != rx_cur) { - status =be_cmd_modify_eqd (ctrl, rx_eq->q.id, rx_cur); + status =be_cmd_modify_eqd (adapter, rx_eq->q.id, + rx_cur);if (!status) rx_eq->cur_eqd = rx_cur; }
@@ -310,8 +311,7 @@ be_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd) {struct be_adapter *adapter =netdev_priv (netdev); -be_cmd_get_flow_control (&adapter->ctrl, &ecmd->tx_pause, - &ecmd->rx_pause); +be_cmd_get_flow_control (adapter, &ecmd->tx_pause, &ecmd->rx_pause); ecmd->autoneg =0 ; }
@@ -324,7 +324,7 @@ be_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *ecmd)if (ecmd->autoneg !=0 )return -EINVAL ; - status =be_cmd_set_flow_control (&adapter->ctrl, ecmd->tx_pause, + status =be_cmd_set_flow_control (adapter, ecmd->tx_pause, ecmd->rx_pause);if (!status)dev_warn (&adapter->pdev->dev,"Pause param set failed.\n" );
drivers/net/benet/be_main.c +103 -126
689 lines not on this page · raw message
Signature · 1 line
1.6.0.4