cxgb4vf: Support CPL_SGE_EGR_UPDATEs encapsulated in a CPL_FW4_MSG

Newer firmware can post CPL_SGE_EGR_UPDATE message encapsulated in a
CPL_FW4_MSG as follows

flit0 rss_header (if DropRSS == 0 in IQ context)
flit1 CPL_FW4_MSG cpl
flit2 rss_header w/opcode CPL_SGE_EGR_UPDATE
flit3 CPL_SGE_EGR_UPDATE cpl

So FW4_MSG CPLs with a newly created type of FW_TYPE_RSSCPL have the
CPL_SGE_EGR_UPDATE CPL message in flit 2 of the FW4_MSG. Firmware can still
post regular CPL_SGE_EGR_UPDATE messages, so the drivers need to handle
both.

This patch also writes a new parameter to firmware requesting encapsulated
EGR_UPDATE. This allows firmware with this support to not break older drivers.

Signed-off-by: Vipul Pandya <vipul@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
index 357e297df1ab937e740de77fa4a05508d7f4c62f..01d484441200d4675faff505338fb7b7a0789078 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
@@ -158,6 +158,7 @@ union opcode_tid {
 };
 
 #define CPL_OPCODE(x) ((x) << 24)
+#define G_CPL_OPCODE(x) (((x) >> 24) & 0xFF)
 #define MK_OPCODE_TID(opcode, tid) (CPL_OPCODE(opcode) | (tid))
 #define OPCODE_TID(cmd) ((cmd)->ot.opcode_tid)
 #define GET_TID(cmd) (ntohl(OPCODE_TID(cmd)) & 0xFFFFFF)

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 73aef76a526cc825b93703c2f7fc97359773b270..40c22e7de15c2be52482b990354274bbc1fc3175 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -409,6 +409,20 @@ static int fwevtq_handler(struct sge_rspq *rspq, const __be64 *rsp,
                break;
        }
 
+       case CPL_FW4_MSG: {
+               /* FW can send EGR_UPDATEs encapsulated in a CPL_FW4_MSG.
+                */
+               const struct cpl_sge_egr_update *p = (void *)(rsp + 3);
+               opcode = G_CPL_OPCODE(ntohl(p->opcode_qid));
+               if (opcode != CPL_SGE_EGR_UPDATE) {
+                       dev_err(adapter->pdev_dev, "unexpected FW4/CPL %#x on FW event queue\n"
+                               , opcode);
+                       break;
+               }
+               cpl = (void *)p;
+               /*FALLTHROUGH*/
+       }
+
        case CPL_SGE_EGR_UPDATE: {
                /*
                 * We've received an Egress Queue Status Update message.  We
@@ -2072,6 +2086,7 @@ static int adap_init0(struct adapter *adapter)
        struct sge *s = &adapter->sge;
        unsigned int ethqsets;
        int err;
+       u32 param, val = 0;
 
        /*
         * Wait for the device to become ready before proceeding ...
@@ -2153,6 +2168,16 @@ static int adap_init0(struct adapter *adapter)
                return err;
        }
 
+       /* If we're running on newer firmware, let it know that we're
+        * prepared to deal with encapsulated CPL messages.  Older
+        * firmware won't understand this and we'll just get
+        * unencapsulated messages ...
+        */
+       param = FW_PARAMS_MNEM(FW_PARAMS_MNEM_PFVF) |
+               FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_PFVF_CPLFW4MSG_ENCAP);
+       val = 1;
+       (void) t4vf_set_params(adapter, 1, &param, &val);
+
        /*
         * Retrieve our RX interrupt holdoff timer values and counter
         * threshold values from the SGE parameters.