qed: Add VF->PF channel infrastructure

[linux-2.6-microblaze.git] / drivers / net / ethernet / qlogic / qed / qed_hw.c

diff --git a/drivers/net/ethernet/qlogic/qed/qed_hw.c b/drivers/net/ethernet/qlogic/qed/qed_hw.c
index a95a3e4..a9be5a4 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_hw.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_hw.c
@@ -338,14 +338,25 @@ void qed_port_unpretend(struct qed_hwfn *p_hwfn,
               *(u32 *)&p_ptt->pxp.pretend);
 }
 
+u32 qed_vfid_to_concrete(struct qed_hwfn *p_hwfn, u8 vfid)
+{
+       u32 concrete_fid = 0;
+
+       SET_FIELD(concrete_fid, PXP_CONCRETE_FID_PFID, p_hwfn->rel_pf_id);
+       SET_FIELD(concrete_fid, PXP_CONCRETE_FID_VFID, vfid);
+       SET_FIELD(concrete_fid, PXP_CONCRETE_FID_VFVALID, 1);
+
+       return concrete_fid;
+}
+
 /* DMAE */
 static void qed_dmae_opcode(struct qed_hwfn *p_hwfn,
                            const u8 is_src_type_grc,
                            const u8 is_dst_type_grc,
                            struct qed_dmae_params *p_params)
 {
+       u16 opcode_b = 0;
        u32 opcode = 0;
-       u16 opcodeB = 0;
 
        /* Whether the source is the PCIe or the GRC.
         * 0- The source is the PCIe
@@ -387,14 +398,24 @@ static void qed_dmae_opcode(struct qed_hwfn *p_hwfn,
        opcode |= (DMAE_CMD_DST_ADDR_RESET_MASK <<
                   DMAE_CMD_DST_ADDR_RESET_SHIFT);
 
-       opcodeB |= (DMAE_CMD_SRC_VF_ID_MASK <<
-                   DMAE_CMD_SRC_VF_ID_SHIFT);
+       /* SRC/DST VFID: all 1's - pf, otherwise VF id */
+       if (p_params->flags & QED_DMAE_FLAG_VF_SRC) {
+               opcode |= 1 << DMAE_CMD_SRC_VF_ID_VALID_SHIFT;
+               opcode_b |= p_params->src_vfid << DMAE_CMD_SRC_VF_ID_SHIFT;
+       } else {
+               opcode_b |= DMAE_CMD_SRC_VF_ID_MASK <<
+                           DMAE_CMD_SRC_VF_ID_SHIFT;
+       }
 
-       opcodeB |= (DMAE_CMD_DST_VF_ID_MASK <<
-                   DMAE_CMD_DST_VF_ID_SHIFT);
+       if (p_params->flags & QED_DMAE_FLAG_VF_DST) {
+               opcode |= 1 << DMAE_CMD_DST_VF_ID_VALID_SHIFT;
+               opcode_b |= p_params->dst_vfid << DMAE_CMD_DST_VF_ID_SHIFT;
+       } else {
+               opcode_b |= DMAE_CMD_DST_VF_ID_MASK << DMAE_CMD_DST_VF_ID_SHIFT;
+       }
 
        p_hwfn->dmae_info.p_dmae_cmd->opcode = cpu_to_le32(opcode);
-       p_hwfn->dmae_info.p_dmae_cmd->opcode_b = cpu_to_le16(opcodeB);
+       p_hwfn->dmae_info.p_dmae_cmd->opcode_b = cpu_to_le16(opcode_b);
 }
 
 u32 qed_dmae_idx_to_go_cmd(u8 idx)
@@ -742,6 +763,28 @@ int qed_dmae_host2grc(struct qed_hwfn *p_hwfn,
        return rc;
 }
 
+int
+qed_dmae_host2host(struct qed_hwfn *p_hwfn,
+                  struct qed_ptt *p_ptt,
+                  dma_addr_t source_addr,
+                  dma_addr_t dest_addr,
+                  u32 size_in_dwords, struct qed_dmae_params *p_params)
+{
+       int rc;
+
+       mutex_lock(&(p_hwfn->dmae_info.mutex));
+
+       rc = qed_dmae_execute_command(p_hwfn, p_ptt, source_addr,
+                                     dest_addr,
+                                     QED_DMAE_ADDRESS_HOST_PHYS,
+                                     QED_DMAE_ADDRESS_HOST_PHYS,
+                                     size_in_dwords, p_params);
+
+       mutex_unlock(&(p_hwfn->dmae_info.mutex));
+
+       return rc;
+}
+
 u16 qed_get_qm_pq(struct qed_hwfn *p_hwfn,
                  enum protocol_type proto,
                  union qed_qm_pq_params *p_params)