From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rcdn-iport-2.cisco.com (rcdn-iport-2.cisco.com [173.37.86.73]) by dpdk.org (Postfix) with ESMTP id 530A11B2F4 for ; Tue, 10 Oct 2017 19:31:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=9916; q=dns/txt; s=iport; t=1507656706; x=1508866306; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=eKfoBnCJ6x0yWXk8kBAd6GACeHwXedgxuCrkdkS2DHM=; b=d0+p/yMF4e0a4hPVDewHIjVFFnoWZm/6zXVc3foIbPcfKiKHsS0sm7Tk tPXxpnMArLQHgJY3RRPAzJsQEsumkTsb0TmPBSDtzSf+E1aVyGHZ52iVm v+gkqI5J94a9XwE9Leq6qdIWCBQZRN5WwL6ARDr1+Nh2bb+9ia66tiNyu I=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A0CdAAB0A91Z/4gNJK1dGQEBAQEBAQEBA?= =?us-ascii?q?QEBBwEBAQEBg1uBUicHjhKPdIF2li+CEgqFOwKETj8YAQIBAQEBAQEBayiFHQE?= =?us-ascii?q?BAQEDJxNLBAIBCA4DBAEBHwkHMhQJCAIEARIIihyqGzqLMQEBAQEBAQEBAQEBA?= =?us-ascii?q?QEBAQEBAQEBAR2DLYICgVGBaoMpingFigwHiRmOEAKUXpMYlTQCERkBgTgBHzi?= =?us-ascii?q?BDngVhWMcgWd2iTKBEAEBAQ?= X-IronPort-AV: E=Sophos;i="5.43,359,1503360000"; d="scan'208";a="309048265" Received: from alln-core-3.cisco.com ([173.36.13.136]) by rcdn-iport-2.cisco.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 10 Oct 2017 17:31:44 +0000 Received: from XCH-ALN-007.cisco.com (xch-aln-007.cisco.com [173.36.7.17]) by alln-core-3.cisco.com (8.14.5/8.14.5) with ESMTP id v9AHVili018786 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=FAIL); Tue, 10 Oct 2017 17:31:44 GMT Received: from xch-rcd-007.cisco.com (173.37.102.17) by XCH-ALN-007.cisco.com (173.36.7.17) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Tue, 10 Oct 2017 12:31:43 -0500 Received: from xch-rcd-007.cisco.com ([173.37.102.17]) by XCH-RCD-007.cisco.com ([173.37.102.17]) with mapi id 15.00.1320.000; Tue, 10 Oct 2017 12:31:43 -0500 From: "John Daley (johndale)" To: Aaron Conole , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [RFC 3/4] enic: remove unused code Thread-Index: AQHTNvjdzKF2EhgOE0mt+OvBsv1W5qLdbBKQ Date: Tue, 10 Oct 2017 17:31:43 +0000 Message-ID: <716274c750084c92a91b11da87acd390@XCH-RCD-007.cisco.com> References: <20170926185329.2776-1-aconole@redhat.com> <20170926185329.2776-4-aconole@redhat.com> In-Reply-To: <20170926185329.2776-4-aconole@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.19.145.149] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [RFC 3/4] enic: remove unused 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: , X-List-Received-Date: Tue, 10 Oct 2017 17:31:46 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Aaron Conole > Sent: Tuesday, September 26, 2017 11:53 AM > To: dev@dpdk.org > Subject: [dpdk-dev] [RFC 3/4] enic: remove unused code >=20 > The functions here aren't called anywhere in code, at least according to = both > the compiler, and some greps. >=20 > Signed-off-by: Aaron Conole > --- > drivers/net/enic/base/vnic_cq.c | 10 ---- drivers/net/enic/base/vnic_= dev.c > | 102 --------------------------------------- > drivers/net/enic/base/vnic_rq.c | 5 -- > drivers/net/enic/base/vnic_rss.c | 32 ------------ > drivers/net/enic/base/vnic_wq.c | 5 -- > drivers/net/enic/enic.h | 5 -- > drivers/net/enic/enic_compat.h | 20 -------- > 7 files changed, 179 deletions(-) >=20 > diff --git a/drivers/net/enic/base/vnic_cq.c > b/drivers/net/enic/base/vnic_cq.c index 33db10f..3549fec 100644 > --- a/drivers/net/enic/base/vnic_cq.c > +++ b/drivers/net/enic/base/vnic_cq.c > @@ -35,16 +35,6 @@ > #include "vnic_dev.h" > #include "vnic_cq.h" >=20 > -int vnic_cq_mem_size(struct vnic_cq *cq, unsigned int desc_count, > - unsigned int desc_size) > -{ > - int mem_size; > - > - mem_size =3D vnic_dev_desc_ring_size(&cq->ring, desc_count, > desc_size); > - > - return mem_size; > -} > - > void vnic_cq_free(struct vnic_cq *cq) > { > vnic_dev_free_desc_ring(cq->vdev, &cq->ring); diff --git > a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c > index 808f95b..a4b7f4b 100644 > --- a/drivers/net/enic/base/vnic_dev.c > +++ b/drivers/net/enic/base/vnic_dev.c > @@ -443,24 +443,6 @@ static int vnic_dev_cmd_no_proxy(struct vnic_dev > *vdev, > return err; > } >=20 > -void vnic_dev_cmd_proxy_by_index_start(struct vnic_dev *vdev, u16 > index) -{ > - vdev->proxy =3D PROXY_BY_INDEX; > - vdev->proxy_index =3D index; > -} > - > -void vnic_dev_cmd_proxy_by_bdf_start(struct vnic_dev *vdev, u16 bdf) -{ > - vdev->proxy =3D PROXY_BY_BDF; > - vdev->proxy_index =3D bdf; > -} > - > -void vnic_dev_cmd_proxy_end(struct vnic_dev *vdev) -{ > - vdev->proxy =3D PROXY_NONE; > - vdev->proxy_index =3D 0; > -} > - > int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, > u64 *a0, u64 *a1, int wait) > { > @@ -672,15 +654,6 @@ int vnic_dev_close(struct vnic_dev *vdev) > return vnic_dev_cmd(vdev, CMD_CLOSE, &a0, &a1, wait); } >=20 > -/** Deprecated. @see vnic_dev_enable_wait */ -int > vnic_dev_enable(struct vnic_dev *vdev) -{ > - u64 a0 =3D 0, a1 =3D 0; > - int wait =3D 1000; > - > - return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait); > -} > - > int vnic_dev_enable_wait(struct vnic_dev *vdev) { > u64 a0 =3D 0, a1 =3D 0; > @@ -725,31 +698,6 @@ int vnic_dev_open_done(struct vnic_dev *vdev, int > *done) > return 0; > } >=20 > -int vnic_dev_soft_reset(struct vnic_dev *vdev, int arg) -{ > - u64 a0 =3D (u32)arg, a1 =3D 0; > - int wait =3D 1000; > - > - return vnic_dev_cmd(vdev, CMD_SOFT_RESET, &a0, &a1, wait); > -} > - > -int vnic_dev_soft_reset_done(struct vnic_dev *vdev, int *done) -{ > - u64 a0 =3D 0, a1 =3D 0; > - int wait =3D 1000; > - int err; > - > - *done =3D 0; > - > - err =3D vnic_dev_cmd(vdev, CMD_SOFT_RESET_STATUS, &a0, &a1, > wait); > - if (err) > - return err; > - > - *done =3D (a0 =3D=3D 0); > - > - return 0; > -} > - > int vnic_dev_get_mac_addr(struct vnic_dev *vdev, u8 *mac_addr) { > u64 a0 =3D 0, a1 =3D 0; > @@ -840,19 +788,6 @@ int vnic_dev_set_ig_vlan_rewrite_mode(struct > vnic_dev *vdev, > return 0; > } >=20 > -int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr) -{ > - u64 a0 =3D intr, a1 =3D 0; > - int wait =3D 1000; > - int err; > - > - err =3D vnic_dev_cmd(vdev, CMD_IAR, &a0, &a1, wait); > - if (err) > - pr_err("Failed to raise INTR[%d], err %d\n", intr, err); > - > - return err; > -} > - > void vnic_dev_set_reset_flag(struct vnic_dev *vdev, int state) { > vdev->in_reset =3D state; > @@ -985,14 +920,6 @@ int vnic_dev_init(struct vnic_dev *vdev, int arg) > return r; > } >=20 > -int vnic_dev_deinit(struct vnic_dev *vdev) -{ > - u64 a0 =3D 0, a1 =3D 0; > - int wait =3D 1000; > - > - return vnic_dev_cmd(vdev, CMD_DEINIT, &a0, &a1, wait); > -} > - > void vnic_dev_intr_coal_timer_info_default(struct vnic_dev *vdev) { > /* Default: hardware intr coal timer is in units of 1.5 usecs */ @@ - > 1018,18 +945,6 @@ u32 vnic_dev_port_speed(struct vnic_dev *vdev) > return vdev->notify_copy.port_speed; > } >=20 > -void vnic_dev_set_intr_mode(struct vnic_dev *vdev, > - enum vnic_dev_intr_mode intr_mode) > -{ > - vdev->intr_mode =3D intr_mode; > -} > - > -enum vnic_dev_intr_mode vnic_dev_get_intr_mode( > - struct vnic_dev *vdev) > -{ > - return vdev->intr_mode; > -} > - > u32 vnic_dev_intr_coal_timer_usec_to_hw(struct vnic_dev *vdev, u32 > usec) { > return (usec * vdev->intr_coal_timer_info.mul) / @@ -1094,23 > +1009,6 @@ struct vnic_dev *vnic_dev_register(struct vnic_dev *vdev, > return NULL; > } >=20 > -struct rte_pci_device *vnic_dev_get_pdev(struct vnic_dev *vdev) -{ > - return vdev->pdev; > -} > - > -int vnic_dev_set_mac_addr(struct vnic_dev *vdev, u8 *mac_addr) -{ > - u64 a0, a1 =3D 0; > - int wait =3D 1000; > - int i; > - > - for (i =3D 0; i < ETH_ALEN; i++) > - ((u8 *)&a0)[i] =3D mac_addr[i]; > - > - return vnic_dev_cmd(vdev, CMD_SET_MAC_ADDR, &a0, &a1, wait); > -} > - > /* > * vnic_dev_classifier: Add/Delete classifier entries > * @vdev: vdev of the device > diff --git a/drivers/net/enic/base/vnic_rq.c > b/drivers/net/enic/base/vnic_rq.c index 776a6f7..ea297ee 100644 > --- a/drivers/net/enic/base/vnic_rq.c > +++ b/drivers/net/enic/base/vnic_rq.c > @@ -118,11 +118,6 @@ void vnic_rq_init(struct vnic_rq *rq, unsigned int > cq_index, > rq->pkt_last_seg =3D NULL; > } >=20 > -void vnic_rq_error_out(struct vnic_rq *rq, unsigned int error) -{ > - iowrite32(error, &rq->ctrl->error_status); > -} > - > unsigned int vnic_rq_error_status(struct vnic_rq *rq) { > return ioread32(&rq->ctrl->error_status); > diff --git a/drivers/net/enic/base/vnic_rss.c > b/drivers/net/enic/base/vnic_rss.c > index 1cf055b..87d40c0 100644 > --- a/drivers/net/enic/base/vnic_rss.c > +++ b/drivers/net/enic/base/vnic_rss.c > @@ -50,35 +50,3 @@ void vnic_set_rss_key(union vnic_rss_key *rss_key, > u8 *key) > } > } >=20 > -void vnic_set_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu) -{ > - u32 i; > - u32 *p =3D (u32 *)cpu; > - > - for (i =3D 0; i < 32; ++i) > - iowrite32(*p++, &rss_cpu->cpu[i].b[0]); > -} > - > -void vnic_get_rss_key(union vnic_rss_key *rss_key, u8 *key) -{ > - u32 i; > - u32 *p; > - u16 *q; > - > - for (i =3D 0; i < 4; ++i) { > - p =3D (u32 *)(key + (10 * i)); > - *p++ =3D ioread32(&rss_key->key[i].b[0]); > - *p++ =3D ioread32(&rss_key->key[i].b[4]); > - q =3D (u16 *)p; > - *q =3D (u16)ioread32(&rss_key->key[i].b[8]); > - } > -} > - > -void vnic_get_rss_cpu(union vnic_rss_cpu *rss_cpu, u8 *cpu) -{ > - u32 i; > - u32 *p =3D (u32 *)cpu; > - > - for (i =3D 0; i < 32; ++i) > - *p++ =3D ioread32(&rss_cpu->cpu[i].b[0]); > -} > diff --git a/drivers/net/enic/base/vnic_wq.c > b/drivers/net/enic/base/vnic_wq.c index 273e3db..0a1247f 100644 > --- a/drivers/net/enic/base/vnic_wq.c > +++ b/drivers/net/enic/base/vnic_wq.c > @@ -145,11 +145,6 @@ void vnic_wq_init(struct vnic_wq *wq, unsigned int > cq_index, > wq->last_completed_index =3D 0; > } >=20 > -void vnic_wq_error_out(struct vnic_wq *wq, unsigned int error) -{ > - iowrite32(error, &wq->ctrl->error_status); > -} > - > unsigned int vnic_wq_error_status(struct vnic_wq *wq) { > return ioread32(&wq->ctrl->error_status); > diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h index > e28f223..9dc86df 100644 > --- a/drivers/net/enic/enic.h > +++ b/drivers/net/enic/enic.h > @@ -227,11 +227,6 @@ static inline unsigned int enic_cq_wq(struct enic > *enic, unsigned int wq) > return enic->rq_count + wq; > } >=20 > -static inline unsigned int enic_msix_err_intr(__rte_unused struct enic *= enic) > -{ > - return 0; > -} > - > static inline struct enic *pmd_priv(struct rte_eth_dev *eth_dev) { > return (struct enic *)eth_dev->data->dev_private; diff --git > a/drivers/net/enic/enic_compat.h b/drivers/net/enic/enic_compat.h index > fc58bb4..1cb5686 100644 > --- a/drivers/net/enic/enic_compat.h > +++ b/drivers/net/enic/enic_compat.h > @@ -99,11 +99,6 @@ static inline uint32_t ioread32(volatile void *addr) > return rte_read32(addr); > } >=20 > -static inline uint16_t ioread16(volatile void *addr) -{ > - return rte_read16(addr); > -} > - > static inline uint8_t ioread8(volatile void *addr) { > return rte_read8(addr); > @@ -119,26 +114,11 @@ static inline void iowrite32_relaxed(uint32_t val, > volatile void *addr) > rte_write32_relaxed(val, addr); > } >=20 > -static inline void iowrite16(uint16_t val, volatile void *addr) -{ > - rte_write16(val, addr); > -} > - > -static inline void iowrite8(uint8_t val, volatile void *addr) -{ > - rte_write8(val, addr); > -} > - > static inline unsigned int readl(volatile void __iomem *addr) { > return rte_read32(addr); > } >=20 > -static inline unsigned int readl_relaxed(volatile void __iomem *addr) -{ > - return rte_read32_relaxed(addr); > -} > - > static inline void writel(unsigned int val, volatile void __iomem *addr)= { > rte_write32(val, addr); > -- > 2.9.5 The files in enic/base were initially common with other Cisco VIC drivers, = but have since diverged and are maintained separately for DPDK, so I don't = have any problem with removing unused functions at this point.=20 Reviewed-by: John Daley Thanks! Johnd