be2net: Add MCC queue mechanism for BE cmds
Subsystems (2)
PATCH 1/4 be2net: Add MCC queue mechanism for BE cmds
Currenlty all cmds use the blocking MCC mbox to post cmds. An mbox cmd is protected via a spin_lock(cmd_lock) and not spin_lock_bh() as it is undesirable to disable BHs while a blocking mbox cmd is in progress (and take long to finish.) This can lockup a cmd in progress in process context. Instead cmds that may be called in BH context must use the MCC queue to post cmds. The cmd completions are rcvd in a separate completion queue and the events are placed in the tx-event queue.
Signed-off-by Sathya Perla <[email protected]>
--- drivers/net/benet/be.h | 95 +++++++++++----- drivers/net/benet/be_cmds.c | 258 +++++++++++++++++++++++++++++++++---------- drivers/net/benet/be_cmds.h | 40 +++++++- drivers/net/benet/be_hw.h | 8 +- drivers/net/benet/be_main.c | 215 ++++++++++++++++++++++++------------ 5 files changed, 455 insertions(+), 161 deletions(-)
drivers/net/benet/be.h +64 -31
@@ -65,7 +65,7 @@ static inline char *nic_name(struct pci_dev *pdev)#define TX_CQ_LEN 1024#define RX_Q_LEN 1024/* Does not support any other value */ #define RX_CQ_LEN 1024 -#define MCC_Q_LEN 64/* total size not to exceed 8 pages */ +#define MCC_Q_LEN 128/* total size not to exceed 8 pages */ #define MCC_CQ_LEN 256#define BE_NAPI_WEIGHT 64
@@ -91,6 +91,61 @@ struct be_queue_info {atomic_t used;/* Number of valid elements in the queue */ }; +static inline u32 MODULO (u16 val,u16 limit) +{ +BUG_ON (limit & (limit -1 )); +return val & (limit -1 ); +} + +static inline void index_adv (u16 *index,u16 val,u16 limit) +{ + *index =MODULO ((*index + val), limit); +} + +static inline void index_inc (u16 *index,u16 limit) +{ + *index =MODULO ((*index +1 ), limit); +} + +static inline void *queue_head_node (struct be_queue_info *q) +{ +return q->dma_mem.va + q->head * q->entry_size; +} + +static inline void *queue_tail_node (struct be_queue_info *q) +{ +return q->dma_mem.va + q->tail * q->entry_size; +} + +static inline void queue_head_inc (struct be_queue_info *q) +{ +index_inc (&q->head, q->len); +} + +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 ]; + +/* Adaptive interrupt coalescing (AIC) info */ +bool enable_aic; +u16 min_eqd;/* in usecs */ +u16 max_eqd;/* in usecs */ +u16 cur_eqd;/* in usecs */ + +struct napi_struct napi; +}; + +struct be_mcc_obj { +struct be_queue_info q; +struct be_queue_info cq; +}; +struct be_ctrl_info {u8 __iomem *csr;u8 __iomem *db;/* Door Bell */
@@ -98,11 +153,16 @@ struct be_ctrl_info {int pci_func;/* Mbox used for cmd request/response */ -spinlock_t cmd_lock;/* For serializing cmds to BE card */ +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; };#include "be_cmds.h"
@@ -150,19 +210,6 @@ struct be_stats_obj {struct be_dma_mem cmd; }; -struct be_eq_obj { -struct be_queue_info q; -char desc[32 ]; - -/* Adaptive interrupt coalescing (AIC) info */ -bool enable_aic; -u16 min_eqd;/* in usecs */ -u16 max_eqd;/* in usecs */ -u16 cur_eqd;/* in usecs */ - -struct napi_struct napi; -}; -struct be_tx_obj {struct be_queue_info q;struct be_queue_info cq;
@@ -235,22 +282,6 @@ extern struct ethtool_ops be_ethtool_ops;#define BE_SET_NETDEV_OPS (netdev, ops) (netdev->netdev_ops = ops) -static inline u32 MODULO (u16 val,u16 limit) -{ -BUG_ON (limit & (limit -1 )); -return val & (limit -1 ); -} - -static inline void index_adv (u16 *index,u16 val,u16 limit) -{ - *index =MODULO ((*index + val), limit); -} - -static inline void index_inc (u16 *index,u16 limit) -{ - *index =MODULO ((*index +1 ), limit); -} -#define PAGE_SHIFT_4K 12#define PAGE_SIZE_4K (1 << PAGE_SHIFT_4K)
@@ -339,4 +370,6 @@ 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, +u16 num_popped);#endif /* BE_H */
drivers/net/benet/be_cmds.c +200 -58
539 lines not on this page · raw message
drivers/net/benet/be_cmds.h +39 -1
@@ -101,6 +101,7 @@ struct be_mcc_mailbox {#define OPCODE_COMMON_FIRMWARE_CONFIG 42#define OPCODE_COMMON_NTWK_INTERFACE_CREATE 50#define OPCODE_COMMON_NTWK_INTERFACE_DESTROY 51 +#define OPCODE_COMMON_MCC_DESTROY 53#define OPCODE_COMMON_CQ_DESTROY 54#define OPCODE_COMMON_EQ_DESTROY 55#define OPCODE_COMMON_QUERY_FIRMWARE_CONFIG 58
@@ -269,6 +270,38 @@ struct be_cmd_resp_cq_create {u16 rsvd0; } __packed; +/******************** Create MCCQ ***************************/ +/* Pseudo amap definition in which each bit of the actual structure is defined +* as a byte: used to calculate offset/shift/mask of each field */ +struct amap_mcc_context { +u8 con_index[14 ]; +u8 rsvd0[2 ]; +u8 ring_size[4 ]; +u8 fetch_wrb; +u8 fetch_r2t; +u8 cq_id[10 ]; +u8 prod_index[14 ]; +u8 fid[8 ]; +u8 pdid[9 ]; +u8 valid; +u8 rsvd1[32 ]; +u8 rsvd2[32 ]; +} __packed; + +struct be_cmd_req_mcc_create { +struct be_cmd_req_hdr hdr; +u16 num_pages; +u16 rsvd0; +u8 context[sizeof (struct amap_mcc_context ) /8 ]; +struct phys_addr pages[8 ]; +} __packed; + +struct be_cmd_resp_mcc_create { +struct be_cmd_resp_hdr hdr; +u16 id; +u16 rsvd0; +} __packed; +/******************** Create TxQ ***************************/ #define BE_ETH_TX_RING_TYPE_STANDARD 2#define BE_ULP1_NUM 1
@@ -341,7 +374,8 @@ enum {QTYPE_EQ =1 ,QTYPE_CQ ,QTYPE_TXQ , -QTYPE_RXQ +QTYPE_RXQ , +QTYPE_MCCQ }; struct be_cmd_req_q_destroy {
@@ -657,6 +691,9 @@ extern int be_cmd_cq_create(struct be_ctrl_info *ctrl, struct be_queue_info *cq, struct be_queue_info *eq, bool sol_evts, bool no_delay, int num_cqe_dma_coalesce); +extern int be_cmd_mccq_create (struct be_ctrl_info *ctrl, +struct be_queue_info *mccq, +struct be_queue_info *cq);extern int be_cmd_txq_create (struct be_ctrl_info *ctrl,struct be_queue_info *txq,struct be_queue_info *cq);
@@ -686,3 +723,4 @@ extern int be_cmd_set_flow_control(struct be_ctrl_info *ctrl,extern int be_cmd_get_flow_control (struct be_ctrl_info *ctrl,u32 *tx_fc,u32 *rx_fc);extern int be_cmd_query_fw_cfg (struct be_ctrl_info *ctrl,u32 *port_num); +extern void be_process_mcc (struct be_ctrl_info *ctrl);
drivers/net/benet/be_hw.h +7 -1
@@ -61,7 +61,7 @@/* Clear the interrupt for this eq */ #define DB_EQ_CLR_SHIFT (9)/* bit 9 */ /* Must be 1 */ -#define DB_EQ_EVNT_SHIFT (10)/* bit 10 */ +#define DB_EQ_EVNT_SHIFT (10)/* bit 10 */ /* Number of event entries processed */ #define DB_EQ_NUM_POPPED_SHIFT (16)/* bits 16 - 28 */ /* Rearm bit */
@@ -88,6 +88,12 @@/* Number of rx frags posted */ #define DB_RQ_NUM_POSTED_SHIFT (24)/* bits 24 - 31 */ +/********** MCC door bell ************/ +#define DB_MCCQ_OFFSET 0x140 +#define DB_MCCQ_RING_ID_MASK 0x7FF/* bits 0 - 10 */ +/* Number of entries posted */ +#define DB_MCCQ_NUM_POSTED_SHIFT (16)/* bits 16 - 29 */ +/* * BE descriptors: host memory data structures whose formats * are hardwired in BE silicon.
drivers/net/benet/be_main.c +145 -70
344 lines not on this page · raw message
Signature · 1 line
1.6.0.4