1 files changed, 42 insertions, 20 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 32eec15fe4c2..22f3af5166bf 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -109,7 +109,7 @@ void t4_set_reg_field(struct adapter *adapter, unsigned int addr, u32 mask,
  *      Reads registers that are accessed indirectly through an address/data
  *      register pair.
  */
-static void t4_read_indirect(struct adapter *adap, unsigned int addr_reg,
+void t4_read_indirect(struct adapter *adap, unsigned int addr_reg,
                              unsigned int data_reg, u32 *vals,
                              unsigned int nregs, unsigned int start_idx)
 {
@@ -648,12 +648,12 @@ static int sf1_read(struct adapter *adapter, unsigned int byte_cnt, int cont,
 
         if (!byte_cnt || byte_cnt > 4)
                 return -EINVAL;
-        if (t4_read_reg(adapter, SF_OP) & BUSY)
+        if (t4_read_reg(adapter, SF_OP) & SF_BUSY)
                 return -EBUSY;
         cont = cont ? SF_CONT : 0;
         lock = lock ? SF_LOCK : 0;
         t4_write_reg(adapter, SF_OP, lock | cont | BYTECNT(byte_cnt - 1));
-        ret = t4_wait_op_done(adapter, SF_OP, BUSY, 0, SF_ATTEMPTS, 5);
+        ret = t4_wait_op_done(adapter, SF_OP, SF_BUSY, 0, SF_ATTEMPTS, 5);
         if (!ret)
                 *valp = t4_read_reg(adapter, SF_DATA);
         return ret;
@@ -676,14 +676,14 @@ static int sf1_write(struct adapter *adapter, unsigned int byte_cnt, int cont,
 {
         if (!byte_cnt || byte_cnt > 4)
                 return -EINVAL;
-        if (t4_read_reg(adapter, SF_OP) & BUSY)
+        if (t4_read_reg(adapter, SF_OP) & SF_BUSY)
                 return -EBUSY;
         cont = cont ? SF_CONT : 0;
         lock = lock ? SF_LOCK : 0;
         t4_write_reg(adapter, SF_DATA, val);
         t4_write_reg(adapter, SF_OP, lock |
                      cont | BYTECNT(byte_cnt - 1) | OP_WR);
-        return t4_wait_op_done(adapter, SF_OP, BUSY, 0, SF_ATTEMPTS, 5);
+        return t4_wait_op_done(adapter, SF_OP, SF_BUSY, 0, SF_ATTEMPTS, 5);
 }
 
 /**
@@ -2003,7 +2003,7 @@ void t4_tp_wr_bits_indirect(struct adapter *adap, unsigned int addr,
  *
  *      Initialize the congestion control parameters.
  */
-static void __devinit init_cong_ctrl(unsigned short *a, unsigned short *b)
+static void init_cong_ctrl(unsigned short *a, unsigned short *b)
 {
         a[0] = a[1] = a[2] = a[3] = a[4] = a[5] = a[6] = a[7] = a[8] = 1;
         a[9] = 2;
@@ -2252,14 +2252,14 @@ int t4_wol_pat_enable(struct adapter *adap, unsigned int port, unsigned int map,
                 t4_write_reg(adap, EPIO_REG(DATA0), mask0);
                 t4_write_reg(adap, EPIO_REG(OP), ADDRESS(i) | EPIOWR);
                 t4_read_reg(adap, EPIO_REG(OP));                /* flush */
-                if (t4_read_reg(adap, EPIO_REG(OP)) & BUSY)
+                if (t4_read_reg(adap, EPIO_REG(OP)) & SF_BUSY)
                         return -ETIMEDOUT;
 
                 /* write CRC */
                 t4_write_reg(adap, EPIO_REG(DATA0), crc);
                 t4_write_reg(adap, EPIO_REG(OP), ADDRESS(i + 32) | EPIOWR);
                 t4_read_reg(adap, EPIO_REG(OP));                /* flush */
-                if (t4_read_reg(adap, EPIO_REG(OP)) & BUSY)
+                if (t4_read_reg(adap, EPIO_REG(OP)) & SF_BUSY)
                         return -ETIMEDOUT;
         }
 #undef EPIO_REG
@@ -2268,6 +2268,26 @@ int t4_wol_pat_enable(struct adapter *adap, unsigned int port, unsigned int map,
         return 0;
 }
 
+/*     t4_mk_filtdelwr - create a delete filter WR
+ *     @ftid: the filter ID
+ *     @wr: the filter work request to populate
+ *     @qid: ingress queue to receive the delete notification
+ *
+ *     Creates a filter work request to delete the supplied filter.  If @qid is
+ *     negative the delete notification is suppressed.
+ */
+void t4_mk_filtdelwr(unsigned int ftid, struct fw_filter_wr *wr, int qid)
+{
+        memset(wr, 0, sizeof(*wr));
+        wr->op_pkd = htonl(FW_WR_OP(FW_FILTER_WR));
+        wr->len16_pkd = htonl(FW_WR_LEN16(sizeof(*wr) / 16));
+        wr->tid_to_iq = htonl(V_FW_FILTER_WR_TID(ftid) |
+                        V_FW_FILTER_WR_NOREPLY(qid < 0));
+        wr->del_filter_to_l2tix = htonl(F_FW_FILTER_WR_DEL_FILTER);
+        if (qid >= 0)
+                wr->rx_chan_rx_rpl_iq = htons(V_FW_FILTER_WR_RX_RPL_IQ(qid));
+}
+
 #define INIT_CMD(var, cmd, rd_wr) do { \
         (var).op_to_write = htonl(FW_CMD_OP(FW_##cmd##_CMD) | \
                                   FW_CMD_REQUEST | FW_CMD_##rd_wr); \
@@ -2405,7 +2425,7 @@ int t4_fw_hello(struct adapter *adap, unsigned int mbox, unsigned int evt_mbox,
 retry:
         memset(&c, 0, sizeof(c));
         INIT_CMD(c, HELLO, WRITE);
-        c.err_to_mbasyncnot = htonl(
+        c.err_to_clearinit = htonl(
                 FW_HELLO_CMD_MASTERDIS(master == MASTER_CANT) |
                 FW_HELLO_CMD_MASTERFORCE(master == MASTER_MUST) |
                 FW_HELLO_CMD_MBMASTER(master == MASTER_MUST ? mbox :
@@ -2426,7 +2446,7 @@ retry:
                 return ret;
         }
 
-        v = ntohl(c.err_to_mbasyncnot);
+        v = ntohl(c.err_to_clearinit);
         master_mbox = FW_HELLO_CMD_MBMASTER_GET(v);
         if (state) {
                 if (v & FW_HELLO_CMD_ERR)
@@ -2519,6 +2539,7 @@ int t4_fw_bye(struct adapter *adap, unsigned int mbox)
 {
         struct fw_bye_cmd c;
 
+        memset(&c, 0, sizeof(c));
         INIT_CMD(c, BYE, WRITE);
         return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
@@ -2535,6 +2556,7 @@ int t4_early_init(struct adapter *adap, unsigned int mbox)
 {
         struct fw_initialize_cmd c;
 
+        memset(&c, 0, sizeof(c));
         INIT_CMD(c, INITIALIZE, WRITE);
         return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
@@ -2551,6 +2573,7 @@ int t4_fw_reset(struct adapter *adap, unsigned int mbox, int reset)
 {
         struct fw_reset_cmd c;
 
+        memset(&c, 0, sizeof(c));
         INIT_CMD(c, RESET, WRITE);
         c.val = htonl(reset);
         return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
@@ -2771,7 +2794,7 @@ int t4_fw_config_file(struct adapter *adap, unsigned int mbox,
                 htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
                       FW_CMD_REQUEST |
                       FW_CMD_READ);
-        caps_cmd.retval_len16 =
+        caps_cmd.cfvalid_to_len16 =
                 htonl(FW_CAPS_CONFIG_CMD_CFVALID |
                       FW_CAPS_CONFIG_CMD_MEMTYPE_CF(mtype) |
                       FW_CAPS_CONFIG_CMD_MEMADDR64K_CF(maddr >> 16) |
@@ -2794,7 +2817,7 @@ int t4_fw_config_file(struct adapter *adap, unsigned int mbox,
                 htonl(FW_CMD_OP(FW_CAPS_CONFIG_CMD) |
                       FW_CMD_REQUEST |
                       FW_CMD_WRITE);
-        caps_cmd.retval_len16 = htonl(FW_LEN16(caps_cmd));
+        caps_cmd.cfvalid_to_len16 = htonl(FW_LEN16(caps_cmd));
         return t4_wr_mbox(adap, mbox, &caps_cmd, sizeof(caps_cmd), NULL);
 }
 
@@ -2828,7 +2851,7 @@ int t4_fixup_host_params(struct adapter *adap, unsigned int page_size,
                      HOSTPAGESIZEPF7(sge_hps));
 
         t4_set_reg_field(adap, SGE_CONTROL,
-                         INGPADBOUNDARY(INGPADBOUNDARY_MASK) |
+                         INGPADBOUNDARY_MASK |
                          EGRSTATUSPAGESIZE_MASK,
                          INGPADBOUNDARY(fl_align_log - 5) |
                          EGRSTATUSPAGESIZE(stat_len != 64));
@@ -3278,6 +3301,7 @@ int t4_identify_port(struct adapter *adap, unsigned int mbox, unsigned int viid,
 {
         struct fw_vi_enable_cmd c;
 
+        memset(&c, 0, sizeof(c));
         c.op_to_viid = htonl(FW_CMD_OP(FW_VI_ENABLE_CMD) | FW_CMD_REQUEST |
                              FW_CMD_EXEC | FW_VI_ENABLE_CMD_VIID(viid));
         c.ien_to_len16 = htonl(FW_VI_ENABLE_CMD_LED | FW_LEN16(c));
@@ -3436,8 +3460,7 @@ int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl)
         return 0;
 }
 
-static void __devinit get_pci_mode(struct adapter *adapter,
-                                   struct pci_params *p)
+static void get_pci_mode(struct adapter *adapter, struct pci_params *p)
 {
         u16 val;
 
@@ -3456,8 +3479,7 @@ static void __devinit get_pci_mode(struct adapter *adapter,
  *      Initializes the SW state maintained for each link, including the link's
  *      capabilities and default speed/flow-control/autonegotiation settings.
  */
-static void __devinit init_link_config(struct link_config *lc,
-                                       unsigned int caps)
+static void init_link_config(struct link_config *lc, unsigned int caps)
 {
         lc->supported = caps;
         lc->requested_speed = 0;
@@ -3481,7 +3503,7 @@ int t4_wait_dev_ready(struct adapter *adap)
         return t4_read_reg(adap, PL_WHOAMI) != 0xffffffff ? 0 : -EIO;
 }
 
-static int __devinit get_flash_params(struct adapter *adap)
+static int get_flash_params(struct adapter *adap)
 {
         int ret;
         u32 info;
@@ -3517,7 +3539,7 @@ static int __devinit get_flash_params(struct adapter *adap)
  *      values for some adapter tunables, take PHYs out of reset, and
  *      initialize the MDIO interface.
  */
-int __devinit t4_prep_adapter(struct adapter *adapter)
+int t4_prep_adapter(struct adapter *adapter)
 {
         int ret;
 
@@ -3545,7 +3567,7 @@ int __devinit t4_prep_adapter(struct adapter *adapter)
         return 0;
 }
 
-int __devinit t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
+int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
 {
         u8 addr[6];
         int ret, i, j = 0;