From patchwork Wed Jan 10 09:17:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John Daley (johndale)" X-Patchwork-Id: 33394 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 49FD61B24B; Wed, 10 Jan 2018 10:18:05 +0100 (CET) Received: from rcdn-iport-3.cisco.com (rcdn-iport-3.cisco.com [173.37.86.74]) by dpdk.org (Postfix) with ESMTP id BED0A1B21B for ; Wed, 10 Jan 2018 10:17:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=4161; q=dns/txt; s=iport; t=1515575879; x=1516785479; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Sc/0yd+9zN7702PA5ZYmAhU1P5LOTy3ZyI91cUHVJ6U=; b=kkA3xZiTmBAbGnFMfb8OKVWtEnktxR6DToNuy/mupzER4lkL4nGS6Ch6 wiKTKzRrz9V8hsP9Fzx1qArvZJg8P1hIVjrOwhsLY7Qf3R5dmpzWBoUKj /yy0tdZ7F4Ym5RG+qAicE6+qDv2f4+YPYsoUtOpgL6L24S3bA180YLp9A s=; X-IronPort-AV: E=Sophos;i="5.46,339,1511827200"; d="scan'208";a="331018210" Received: from alln-core-7.cisco.com ([173.36.13.140]) by rcdn-iport-3.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jan 2018 09:17:58 +0000 Received: from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48]) by alln-core-7.cisco.com (8.14.5/8.14.5) with ESMTP id w0A9HwoL028057; Wed, 10 Jan 2018 09:17:58 GMT Received: by cisco.com (Postfix, from userid 392789) id 898C820F2001; Wed, 10 Jan 2018 01:17:58 -0800 (PST) From: John Daley To: ferruh.yigit@intel.com Cc: dev@dpdk.org, Hyong Youb Kim Date: Wed, 10 Jan 2018 01:17:06 -0800 Message-Id: <20180110091712.32198-6-johndale@cisco.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20180110091712.32198-1-johndale@cisco.com> References: <20180110091712.32198-1-johndale@cisco.com> Subject: [dpdk-dev] [PATCH] net/enic: remove remaining header-split code X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Hyong Youb Kim Header splitting has been disabled at least since the following commit. Remove the remaining code to avoid confusion. commit 947d860c821f ("enic: improve Rx performance") Signed-off-by: Hyong Youb Kim Reviewed-by: John Daley --- drivers/net/enic/base/vnic_dev.c | 11 ----------- drivers/net/enic/base/vnic_dev.h | 2 -- drivers/net/enic/enic.h | 1 - drivers/net/enic/enic_ethdev.c | 8 -------- drivers/net/enic/enic_main.c | 5 ----- 5 files changed, 27 deletions(-) diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c index 9b25d219c..75388423b 100644 --- a/drivers/net/enic/base/vnic_dev.c +++ b/drivers/net/enic/base/vnic_dev.c @@ -78,7 +78,6 @@ struct vnic_dev { enum vnic_proxy_type proxy; u32 proxy_index; u64 args[VNIC_DEVCMD_NARGS]; - u16 split_hdr_size; int in_reset; struct vnic_intr_coal_timer_info intr_coal_timer_info; void *(*alloc_consistent)(void *priv, size_t size, @@ -251,16 +250,6 @@ unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring, return ring->size_unaligned; } -void vnic_set_hdr_split_size(struct vnic_dev *vdev, u16 size) -{ - vdev->split_hdr_size = size; -} - -u16 vnic_get_hdr_split_size(struct vnic_dev *vdev) -{ - return vdev->split_hdr_size; -} - void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring) { memset(ring->descs, 0, ring->size); diff --git a/drivers/net/enic/base/vnic_dev.h b/drivers/net/enic/base/vnic_dev.h index c9ca25b35..2e07a8535 100644 --- a/drivers/net/enic/base/vnic_dev.h +++ b/drivers/net/enic/base/vnic_dev.h @@ -120,8 +120,6 @@ unsigned long vnic_dev_get_res_type_len(struct vnic_dev *vdev, unsigned int vnic_dev_desc_ring_size(struct vnic_dev_ring *ring, unsigned int desc_count, unsigned int desc_size); void vnic_dev_clear_desc_ring(struct vnic_dev_ring *ring); -void vnic_set_hdr_split_size(struct vnic_dev *vdev, u16 size); -u16 vnic_get_hdr_split_size(struct vnic_dev *vdev); int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring, unsigned int desc_count, unsigned int desc_size, unsigned int socket_id, char *z_name); diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index e36ec385c..b8336ea4b 100644 --- a/drivers/net/enic/enic.h +++ b/drivers/net/enic/enic.h @@ -277,7 +277,6 @@ extern int enic_alloc_rq(struct enic *enic, uint16_t queue_idx, uint16_t nb_desc, uint16_t free_thresh); extern int enic_set_rss_nic_cfg(struct enic *enic); extern int enic_set_vnic_res(struct enic *enic); -extern void enic_set_hdr_split_size(struct enic *enic, u16 split_hdr_size); extern int enic_enable(struct enic *enic); extern int enic_disable(struct enic *enic); extern void enic_remove(struct enic *enic); diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 59834f3c8..24916312f 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -407,14 +407,6 @@ static int enicpmd_dev_configure(struct rte_eth_dev *eth_dev) return ret; } - if (eth_dev->data->dev_conf.rxmode.split_hdr_size && - (eth_dev->data->dev_conf.rxmode.offloads & - DEV_RX_OFFLOAD_HEADER_SPLIT)) { - /* Enable header-data-split */ - enic_set_hdr_split_size(enic, - eth_dev->data->dev_conf.rxmode.split_hdr_size); - } - enic->hw_ip_checksum = !!(eth_dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_CHECKSUM); ret = enicpmd_vlan_offload_set(eth_dev, ETH_VLAN_STRIP_MASK); diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index bd85f344f..ac0c4a19f 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -98,11 +98,6 @@ enic_rxmbuf_queue_release(__rte_unused struct enic *enic, struct vnic_rq *rq) } } -void enic_set_hdr_split_size(struct enic *enic, u16 split_hdr_size) -{ - vnic_set_hdr_split_size(enic->vdev, split_hdr_size); -} - static void enic_free_wq_buf(struct vnic_wq_buf *buf) { struct rte_mbuf *mbuf = (struct rte_mbuf *)buf->mb;