qed: Register light L2 queues with doorbell overflow recovery mechanism

Light L2 queues are doorbelling entities. Modify the implementation
to keep the doorbell data necessary for doorbelling in well known
location instead of recomputing every time. Register the LL2 queue
with doorbell recovery mechanism.

Signed-off-by: Ariel Elior <Ariel.Elior@cavium.com>
Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: Tomer Tayar <Tomer.Tayar@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
index aa633381aa47ea3bc13de4829bde316448ee0d6b..504c8f71b61d8bb9df7ed702f1bd8fd0992dc11a 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c
@@ -1085,7 +1085,14 @@ static int qed_sp_ll2_tx_queue_start(struct qed_hwfn *p_hwfn,
 
        p_ramrod->gsi_offload_flag = p_ll2_conn->input.gsi_enable;
 
-       return qed_spq_post(p_hwfn, p_ent, NULL);
+       rc = qed_spq_post(p_hwfn, p_ent, NULL);
+       if (rc)
+               return rc;
+
+       rc = qed_db_recovery_add(p_hwfn->cdev, p_tx->doorbell_addr,
+                                &p_tx->db_msg, DB_REC_WIDTH_32B,
+                                DB_REC_KERNEL);
+       return rc;
 }
 
 static int qed_sp_ll2_rx_queue_stop(struct qed_hwfn *p_hwfn,
@@ -1119,9 +1126,11 @@ static int qed_sp_ll2_rx_queue_stop(struct qed_hwfn *p_hwfn,
 static int qed_sp_ll2_tx_queue_stop(struct qed_hwfn *p_hwfn,
                                    struct qed_ll2_info *p_ll2_conn)
 {
+       struct qed_ll2_tx_queue *p_tx = &p_ll2_conn->tx_queue;
        struct qed_spq_entry *p_ent = NULL;
        struct qed_sp_init_data init_data;
        int rc = -EINVAL;
+       qed_db_recovery_del(p_hwfn->cdev, p_tx->doorbell_addr, &p_tx->db_msg);
 
        /* Get SPQ entry */
        memset(&init_data, 0, sizeof(init_data));
@@ -1542,6 +1551,13 @@ int qed_ll2_establish_connection(void *cxt, u8 connection_handle)
        p_tx->doorbell_addr = (u8 __iomem *)p_hwfn->doorbells +
                                            qed_db_addr(p_ll2_conn->cid,
                                                        DQ_DEMS_LEGACY);
+       /* prepare db data */
+       SET_FIELD(p_tx->db_msg.params, CORE_DB_DATA_DEST, DB_DEST_XCM);
+       SET_FIELD(p_tx->db_msg.params, CORE_DB_DATA_AGG_CMD, DB_AGG_CMD_SET);
+       SET_FIELD(p_tx->db_msg.params, CORE_DB_DATA_AGG_VAL_SEL,
+                 DQ_XCM_CORE_TX_BD_PROD_CMD);
+       p_tx->db_msg.agg_flags = DQ_XCM_CORE_DQ_CF_CMD;
+
 
        rc = qed_ll2_establish_connection_rx(p_hwfn, p_ll2_conn);
        if (rc)
@@ -1780,7 +1796,6 @@ static void qed_ll2_tx_packet_notify(struct qed_hwfn *p_hwfn,
        bool b_notify = p_ll2_conn->tx_queue.cur_send_packet->notify_fw;
        struct qed_ll2_tx_queue *p_tx = &p_ll2_conn->tx_queue;
        struct qed_ll2_tx_packet *p_pkt = NULL;
-       struct core_db_data db_msg = { 0, 0, 0 };
        u16 bd_prod;
 
        /* If there are missing BDs, don't do anything now */
@@ -1809,24 +1824,19 @@ static void qed_ll2_tx_packet_notify(struct qed_hwfn *p_hwfn,
                list_move_tail(&p_pkt->list_entry, &p_tx->active_descq);
        }
 
-       SET_FIELD(db_msg.params, CORE_DB_DATA_DEST, DB_DEST_XCM);
-       SET_FIELD(db_msg.params, CORE_DB_DATA_AGG_CMD, DB_AGG_CMD_SET);
-       SET_FIELD(db_msg.params, CORE_DB_DATA_AGG_VAL_SEL,
-                 DQ_XCM_CORE_TX_BD_PROD_CMD);
-       db_msg.agg_flags = DQ_XCM_CORE_DQ_CF_CMD;
-       db_msg.spq_prod = cpu_to_le16(bd_prod);
+       p_tx->db_msg.spq_prod = cpu_to_le16(bd_prod);
 
        /* Make sure the BDs data is updated before ringing the doorbell */
        wmb();
 
-       DIRECT_REG_WR(p_tx->doorbell_addr, *((u32 *)&db_msg));
+       DIRECT_REG_WR(p_tx->doorbell_addr, *((u32 *)&p_tx->db_msg));
 
        DP_VERBOSE(p_hwfn,
                   (NETIF_MSG_TX_QUEUED | QED_MSG_LL2),
                   "LL2 [q 0x%02x cid 0x%08x type 0x%08x] Doorbelled [producer 0x%04x]\n",
                   p_ll2_conn->queue_id,
                   p_ll2_conn->cid,
-                  p_ll2_conn->input.conn_type, db_msg.spq_prod);
+                  p_ll2_conn->input.conn_type, p_tx->db_msg.spq_prod);
 }
 
 int qed_ll2_prepare_tx_packet(void *cxt,

diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.h b/drivers/net/ethernet/qlogic/qed/qed_ll2.h
index 1a5c1ae014745d2f3f8619007c90edaf2fe08a68..5f01fbd3c0735a53b7575fb0a7ae0b22665417f8 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_ll2.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.h
@@ -103,6 +103,7 @@ struct qed_ll2_tx_queue {
        struct qed_ll2_tx_packet cur_completing_packet;
        u16 cur_completing_bd_idx;
        void __iomem *doorbell_addr;
+       struct core_db_data db_msg;
        u16 bds_idx;
        u16 cur_send_frag_num;
        u16 cur_completing_frag_num;