From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 121351B4AF for ; Thu, 7 Feb 2019 13:18:15 +0100 (CET) X-Virus-Scanned: Proofpoint Essentials engine Received: from webmail.solarflare.com (webmail.solarflare.com [12.187.104.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us3.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id AF174600057 for ; Thu, 7 Feb 2019 12:18:13 +0000 (UTC) Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 7 Feb 2019 04:18:09 -0800 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Thu, 7 Feb 2019 04:18:09 -0800 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id x17CI8tb013217 for ; Thu, 7 Feb 2019 12:18:08 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 553321613ED for ; Thu, 7 Feb 2019 12:18:08 +0000 (GMT) From: Andrew Rybchenko To: Date: Thu, 7 Feb 2019 12:17:29 +0000 Message-ID: <1549541873-17403-7-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549541873-17403-1-git-send-email-arybchenko@solarflare.com> References: <1549541873-17403-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.5.1010-24412.006 X-TM-AS-Result: No-1.683300-4.000000-10 X-TMASE-MatchedRID: b602RmutDtHl45tYrNr2LUf49ONH0RaSSjyMfjCRfaPfUZT83lbkEK1r wNdVdYiphcnOL9mKiCalyH+LgJssgYbzTO6asfbjt1AhvyEKdj6vvh7pqacPxjFidTBRWb28OJo zVvs5N6Hi8zVgXoAltsIJ+4gwXrEtKsmEtKMlFWbE96C6spOjALc3aRtdAX970/RyN05C7T4SAL a9PJ21gMTRZw8hLeGKSCIhtrTD0pNy3hQOAmMb26EYlVDQzHYUWD4biWWzNyCqFrt9xUgp+uq+T 0IcdvQ1BtPt5WQTZkLauEQaIW46K4YinWuMIb+inqg/VrSZEiM= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10-1.683300-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24412.006 X-MDID: 1549541894-UAAjzLZ2KDku Subject: [dpdk-dev] [PATCH 06/30] net/sfc: remove wrappers around Rx descriptor count and done 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: Thu, 07 Feb 2019 12:18:15 -0000 These wrappers are used in single place and just complicate reading and understanding if these ops could be supported in secondary process. Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ethdev.c | 12 ++++++++++-- drivers/net/sfc/sfc_rx.c | 22 ---------------------- drivers/net/sfc/sfc_rx.h | 4 ---- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 87a2c9431..36dc580ae 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -1119,16 +1119,24 @@ static uint32_t sfc_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id) { struct sfc_adapter *sa = dev->data->dev_private; + struct sfc_rxq *rxq; + + SFC_ASSERT(rx_queue_id < sa->rxq_count); + rxq = sa->rxq_info[rx_queue_id].rxq; - return sfc_rx_qdesc_npending(sa, rx_queue_id); + if (rxq == NULL || (rxq->state & SFC_RXQ_STARTED) == 0) + return 0; + + return sa->dp_rx->qdesc_npending(rxq->dp); } static int sfc_rx_descriptor_done(void *queue, uint16_t offset) { struct sfc_dp_rxq *dp_rxq = queue; + struct sfc_rxq *rxq = sfc_rxq_by_dp_rxq(dp_rxq); - return sfc_rx_qdesc_done(dp_rxq, offset); + return offset < rxq->evq->sa->dp_rx->qdesc_npending(dp_rxq); } static int diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index dcccb96b1..44aee29e9 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -530,28 +530,6 @@ struct sfc_dp_rx sfc_efx_rx = { .pkt_burst = sfc_efx_recv_pkts, }; -unsigned int -sfc_rx_qdesc_npending(struct sfc_adapter *sa, unsigned int sw_index) -{ - struct sfc_rxq *rxq; - - SFC_ASSERT(sw_index < sa->rxq_count); - rxq = sa->rxq_info[sw_index].rxq; - - if (rxq == NULL || (rxq->state & SFC_RXQ_STARTED) == 0) - return 0; - - return sa->dp_rx->qdesc_npending(rxq->dp); -} - -int -sfc_rx_qdesc_done(struct sfc_dp_rxq *dp_rxq, unsigned int offset) -{ - struct sfc_rxq *rxq = sfc_rxq_by_dp_rxq(dp_rxq); - - return offset < rxq->evq->sa->dp_rx->qdesc_npending(dp_rxq); -} - static void sfc_rx_qflush(struct sfc_adapter *sa, unsigned int sw_index) { diff --git a/drivers/net/sfc/sfc_rx.h b/drivers/net/sfc/sfc_rx.h index 7231379a6..06e8eac8d 100644 --- a/drivers/net/sfc/sfc_rx.h +++ b/drivers/net/sfc/sfc_rx.h @@ -149,10 +149,6 @@ uint64_t sfc_rx_get_queue_offload_caps(struct sfc_adapter *sa); void sfc_rx_qflush_done(struct sfc_rxq *rxq); void sfc_rx_qflush_failed(struct sfc_rxq *rxq); -unsigned int sfc_rx_qdesc_npending(struct sfc_adapter *sa, - unsigned int sw_index); -int sfc_rx_qdesc_done(struct sfc_dp_rxq *dp_rxq, unsigned int offset); - int sfc_rx_hash_init(struct sfc_adapter *sa); void sfc_rx_hash_fini(struct sfc_adapter *sa); int sfc_rx_hf_rte_to_efx(struct sfc_adapter *sa, uint64_t rte, -- 2.17.1