| Message ID | 20161019203332.7972-1-henry.orosco@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Wed, 2016-10-19 at 15:33 -0500, Henry Orosco wrote: > Pre-production silicon incorrectly truncates 4 bytes of the MPA > packet in UDP loopback case. Remove the workaround as it is no > longer necessary. > > Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> > Signed-off-by: Henry Orosco <henry.orosco@intel.com> Thanks, applied. And, in order to save time, I also applied these other patches: [PATCH] i40iw: Set MAX IRD, MAX ORD size to max supported value [PATCH] i40iw: Fix for LAN handler removal [PATCH] i40iw: Optimize inline data copy [PATCH] i40iw: Query device accounts for internal rsrc [PATCH] i40iw: Remove checks for more than 48 bytes inline data [PATCH] i40iw: Remove NULL check for cm_node->iwdev [PATCH] i40iw: Use actual page size [PATCH] i40iw: Use runtime check for IS_ENABLED(CONFIG_IPV6) [PATCH] i40iw: Use vector when creating CQs [PATCH] i40iw: Remove check on return from device_init_pestat() This one had some patch issues I fixed up, you might want to double check it [PATCH] i40iw: Remove variable flush_code and check to set qp->sq_flush [PATCH] i40iw: Correct values for max_recv_sge, max_send_sge [PATCH V2] i40iw: Convert page_size to encoded value [PATCH] i40iw: Fix incorrect assignment of SQ head [PATCH] i40iw: Utilize physically mapped memory regions [PATCH] i40iw: Add 2MB page support [PATCH] i40iw: Add missing cleanup on device close [PATCH] i40iw: Add IP addr handling on netdev events [PATCH] i40iw: Replace list_for_each_entry macro with safe version [PATCH] i40iw: Add NULL check for ibqp event handler [PATCH] i40iw: Fill in IRD value when on connect request [PATCH] i40iw: Correctly fail loopback connection if no listener [PATCH] i40iw: Code cleanup, remove check of PBLE pages [PATCH] i40iw: Add request for reset on CQP timeout [PATCH] i40iw: Set TOS field in IP header For future release, please batch your patches up and send them as a series. Tracking down and dealing with singleton patches when you have an entire truckload that needs processed greatly increases the processing time required.
diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.c b/drivers/infiniband/hw/i40iw/i40iw_cm.c index 460a367..e202ff0 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_cm.c +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.c @@ -361,15 +361,6 @@ static void i40iw_cleanup_retrans_entry(struct i40iw_cm_node *cm_node) spin_unlock_irqrestore(&cm_node->retrans_list_lock, flags); } -static bool is_remote_ne020_or_chelsio(struct i40iw_cm_node *cm_node) -{ - if ((cm_node->rem_mac[0] == 0x0) && - (((cm_node->rem_mac[1] == 0x12) && (cm_node->rem_mac[2] == 0x55)) || - ((cm_node->rem_mac[1] == 0x07 && (cm_node->rem_mac[2] == 0x43))))) - return true; - return false; -} - /** * i40iw_form_cm_frame - get a free packet and build frame * @cm_node: connection's node ionfo to use in frame @@ -410,11 +401,8 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node, if (hdr) hdr_len = hdr->size; - if (pdata) { + if (pdata) pd_len = pdata->size; - if (!is_remote_ne020_or_chelsio(cm_node)) - pd_len += MPA_ZERO_PAD_LEN; - } if (cm_node->vlan_id < VLAN_TAG_PRESENT) eth_hlen += 4; @@ -3604,7 +3592,7 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) iwqp->cm_node = (void *)cm_node; cm_node->iwqp = iwqp; - buf_len = conn_param->private_data_len + I40IW_MAX_IETF_SIZE + MPA_ZERO_PAD_LEN; + buf_len = conn_param->private_data_len + I40IW_MAX_IETF_SIZE; status = i40iw_allocate_dma_mem(dev->hw, &iwqp->ietf_mem, buf_len, 1); @@ -3638,18 +3626,10 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) iwqp->lsmm_mr = ibmr; if (iwqp->page) iwqp->sc_qp.qp_uk.sq_base = kmap(iwqp->page); - if (is_remote_ne020_or_chelsio(cm_node)) - dev->iw_priv_qp_ops->qp_send_lsmm( - &iwqp->sc_qp, + dev->iw_priv_qp_ops->qp_send_lsmm(&iwqp->sc_qp, iwqp->ietf_mem.va, (accept.size + conn_param->private_data_len), ibmr->lkey); - else - dev->iw_priv_qp_ops->qp_send_lsmm( - &iwqp->sc_qp, - iwqp->ietf_mem.va, - (accept.size + conn_param->private_data_len + MPA_ZERO_PAD_LEN), - ibmr->lkey); } else { if (iwqp->page) diff --git a/drivers/infiniband/hw/i40iw/i40iw_cm.h b/drivers/infiniband/hw/i40iw/i40iw_cm.h index 945ed26..24615c2 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_cm.h +++ b/drivers/infiniband/hw/i40iw/i40iw_cm.h @@ -56,8 +56,6 @@ #define I40IW_MAX_IETF_SIZE 32 -#define MPA_ZERO_PAD_LEN 4 - /* IETF RTR MSG Fields */ #define IETF_PEER_TO_PEER 0x8000 #define IETF_FLPDU_ZERO_LEN 0x4000 diff --git a/drivers/infiniband/hw/i40iw/i40iw_utils.c b/drivers/infiniband/hw/i40iw/i40iw_utils.c index 218e9fd..805603b 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_utils.c +++ b/drivers/infiniband/hw/i40iw/i40iw_utils.c @@ -1250,7 +1250,7 @@ enum i40iw_status_code i40iw_puda_get_tcpip_info(struct i40iw_puda_completion_in buf->totallen = pkt_len + buf->maclen; - if (info->payload_len < buf->totallen - 4) { + if (info->payload_len < buf->totallen) { i40iw_pr_err("payload_len = 0x%x totallen expected0x%x\n", info->payload_len, buf->totallen); return I40IW_ERR_INVALID_SIZE;