qed: Introduce DMA_REGPAIR_LE

[deliverable/linux.git] / drivers / net / ethernet / qlogic / qed / qed_sp_commands.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
index 6f787913663362f39efd707f136a12a967a894a4..1c06c37d4c3d75a1650dcb82cd6de9385589db8f 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
@@ -23,15 +23,13 @@
 
 int qed_sp_init_request(struct qed_hwfn *p_hwfn,
                        struct qed_spq_entry **pp_ent,
-                       u32 cid,
-                       u16 opaque_fid,
                        u8 cmd,
                        u8 protocol,
-                       struct qed_sp_init_request_params *p_params)
+                       struct qed_sp_init_data *p_data)
 {
-       int rc = -EINVAL;
+       u32 opaque_cid = p_data->opaque_fid << 16 | p_data->cid;
        struct qed_spq_entry *p_ent = NULL;
-       u32 opaque_cid = opaque_fid << 16 | cid;
+       int rc;
 
        if (!pp_ent)
                return -ENOMEM;
@@ -48,7 +46,7 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,
        p_ent->elem.hdr.protocol_id     = protocol;
 
        p_ent->priority         = QED_SPQ_PRIORITY_NORMAL;
-       p_ent->comp_mode        = p_params->comp_mode;
+       p_ent->comp_mode        = p_data->comp_mode;
        p_ent->comp_done.done   = 0;
 
        switch (p_ent->comp_mode) {
@@ -57,17 +55,17 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,
                break;
 
        case QED_SPQ_MODE_BLOCK:
-               if (!p_params->p_comp_data)
+               if (!p_data->p_comp_data)
                        return -EINVAL;
 
-               p_ent->comp_cb.cookie = p_params->p_comp_data->cookie;
+               p_ent->comp_cb.cookie = p_data->p_comp_data->cookie;
                break;
 
        case QED_SPQ_MODE_CB:
-               if (!p_params->p_comp_data)
+               if (!p_data->p_comp_data)
                        p_ent->comp_cb.function = NULL;
                else
-                       p_ent->comp_cb = *p_params->p_comp_data;
+                       p_ent->comp_cb = *p_data->p_comp_data;
                break;
 
        default:
@@ -83,37 +81,35 @@ int qed_sp_init_request(struct qed_hwfn *p_hwfn,
                   D_TRINE(p_ent->comp_mode, QED_SPQ_MODE_EBLOCK,
                           QED_SPQ_MODE_BLOCK, "MODE_EBLOCK", "MODE_BLOCK",
                           "MODE_CB"));
-       if (p_params->ramrod_data_size)
-               memset(&p_ent->ramrod, 0, p_params->ramrod_data_size);
+
+       memset(&p_ent->ramrod, 0, sizeof(p_ent->ramrod));
 
        return 0;
 }
 
 int qed_sp_pf_start(struct qed_hwfn *p_hwfn,
-                   enum mf_mode mode)
+                   enum qed_mf_mode mode)
 {
-       struct qed_sp_init_request_params params;
        struct pf_start_ramrod_data *p_ramrod = NULL;
        u16 sb = qed_int_get_sp_sb_id(p_hwfn);
        u8 sb_index = p_hwfn->p_eq->eq_sb_index;
        struct qed_spq_entry *p_ent = NULL;
+       struct qed_sp_init_data init_data;
        int rc = -EINVAL;
 
        /* update initial eq producer */
        qed_eq_prod_update(p_hwfn,
                           qed_chain_get_prod_idx(&p_hwfn->p_eq->chain));
 
-       memset(&params, 0, sizeof(params));
-       params.ramrod_data_size = sizeof(*p_ramrod);
-       params.comp_mode = QED_SPQ_MODE_EBLOCK;
+       memset(&init_data, 0, sizeof(init_data));
+       init_data.cid = qed_spq_get_cid(p_hwfn);
+       init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
+       init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
 
-       rc = qed_sp_init_request(p_hwfn,
-                                &p_ent,
-                                qed_spq_get_cid(p_hwfn),
-                                p_hwfn->hw_info.opaque_fid,
+       rc = qed_sp_init_request(p_hwfn, &p_ent,
                                 COMMON_RAMROD_PF_START,
                                 PROTOCOLID_COMMON,
-                                &params);
+                                &init_data);
        if (rc)
                return rc;
 
@@ -125,26 +121,33 @@ int qed_sp_pf_start(struct qed_hwfn *p_hwfn,
        p_ramrod->dont_log_ramrods      = 0;
        p_ramrod->log_type_mask         = cpu_to_le16(0xf);
        p_ramrod->mf_mode = mode;
+       switch (mode) {
+       case QED_MF_DEFAULT:
+       case QED_MF_NPAR:
+               p_ramrod->mf_mode = MF_NPAR;
+               break;
+       case QED_MF_OVLAN:
+               p_ramrod->mf_mode = MF_OVLAN;
+               break;
+       default:
+               DP_NOTICE(p_hwfn, "Unsupported MF mode, init as DEFAULT\n");
+               p_ramrod->mf_mode = MF_NPAR;
+       }
        p_ramrod->outer_tag = p_hwfn->hw_info.ovlan;
 
        /* Place EQ address in RAMROD */
-       p_ramrod->event_ring_pbl_addr.hi =
-                       DMA_HI_LE(p_hwfn->p_eq->chain.pbl.p_phys_table);
-       p_ramrod->event_ring_pbl_addr.lo =
-                       DMA_LO_LE(p_hwfn->p_eq->chain.pbl.p_phys_table);
+       DMA_REGPAIR_LE(p_ramrod->event_ring_pbl_addr,
+                      p_hwfn->p_eq->chain.pbl.p_phys_table);
        p_ramrod->event_ring_num_pages = (u8)p_hwfn->p_eq->chain.page_cnt;
 
-       p_ramrod->consolid_q_pbl_addr.hi =
-                       DMA_HI_LE(p_hwfn->p_consq->chain.pbl.p_phys_table);
-       p_ramrod->consolid_q_pbl_addr.lo =
-                       DMA_LO_LE(p_hwfn->p_consq->chain.pbl.p_phys_table);
+       DMA_REGPAIR_LE(p_ramrod->consolid_q_pbl_addr,
+                      p_hwfn->p_consq->chain.pbl.p_phys_table);
 
        p_hwfn->hw_info.personality = PERSONALITY_ETH;
 
        DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
-                  "Setting event_ring_sb [id %04x index %02x], mf [%s] outer_tag [%d]\n",
+                  "Setting event_ring_sb [id %04x index %02x], outer_tag [%d]\n",
                   sb, sb_index,
-                  (p_ramrod->mf_mode == SF) ? "SF" : "Multi-Pf",
                   p_ramrod->outer_tag);
 
        return qed_spq_post(p_hwfn, p_ent, NULL);
@@ -152,17 +155,19 @@ int qed_sp_pf_start(struct qed_hwfn *p_hwfn,
 
 int qed_sp_pf_stop(struct qed_hwfn *p_hwfn)
 {
-       struct qed_sp_init_request_params params;
        struct qed_spq_entry *p_ent = NULL;
+       struct qed_sp_init_data init_data;
        int rc = -EINVAL;
 
-       memset(&params, 0, sizeof(params));
-       params.comp_mode = QED_SPQ_MODE_EBLOCK;
+       /* Get SPQ entry */
+       memset(&init_data, 0, sizeof(init_data));
+       init_data.cid = qed_spq_get_cid(p_hwfn);
+       init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
+       init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
 
-       rc = qed_sp_init_request(p_hwfn, &p_ent, qed_spq_get_cid(p_hwfn),
-                                p_hwfn->hw_info.opaque_fid,
+       rc = qed_sp_init_request(p_hwfn, &p_ent,
                                 COMMON_RAMROD_PF_STOP, PROTOCOLID_COMMON,
-                                &params);
+                                &init_data);
        if (rc)
                return rc;