From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 6C7961B578 for ; Thu, 7 Feb 2019 17:30:38 +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-us4.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with ESMTPS id EED5CB40123; Thu, 7 Feb 2019 16:30:36 +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 08:30:31 -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 08:30:31 -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 x17GUUxg015346; Thu, 7 Feb 2019 16:30:30 GMT Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 4DAC61613E4; Thu, 7 Feb 2019 16:30:30 +0000 (GMT) From: Andrew Rybchenko To: CC: Igor Romanov Date: Thu, 7 Feb 2019 16:29:29 +0000 Message-ID: <1549556983-10896-25-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549556983-10896-1-git-send-email-arybchenko@solarflare.com> References: <1549556983-10896-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-0.404200-4.000000-10 X-TMASE-MatchedRID: Z4bnI9qGcPy39BLh6Bkc7p7tR0mnRAg1h+w9Wz/xXDrFJnEpmt9OEwef 5FoKtUGz1NYwF0giYx26oOKV8cM+m1zqgN5jy7Yb5O5PclyYqqp9LQinZ4QefPcjNeVeWlqY+gt Hj7OwNO0gaYxOEBYkhJZWFUFacVrFQ8bq1KGu19/91WXdPo/FZ4KcBSTFFMoTqEAsFMSeRM1fL9 NAp/ws+RM1loVMaBEKZnU+QIa/iGfmN5y1nsUrXNpAu0sLxpSoQ8G+yYJYYdZRZDsGiXQioL4jx KnHJRLc7ndUHUMmXu5+3BndfXUhXQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10-0.404200-4.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.5.1010-24412.006 X-MDID: 1549557037-PRCSiTC-NGJU Subject: [dpdk-dev] [PATCH 24/38] net/sfc: use NIC event descritor size instead of common 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 16:30:38 -0000 From: Igor Romanov Use of the macro for calculating a Rx queue size is deprecated. Replace it with a call to a function that uses descriptor size specified for every NIC. Signed-off-by: Igor Romanov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc_ev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c index 939766dc2..59928332a 100644 --- a/drivers/net/sfc/sfc_ev.c +++ b/drivers/net/sfc/sfc_ev.c @@ -599,7 +599,8 @@ sfc_ev_qstart(struct sfc_evq *evq, unsigned int hw_index) evq->evq_index = hw_index; /* Clear all events */ - (void)memset((void *)esmp->esm_base, 0xff, EFX_EVQ_SIZE(evq->entries)); + (void)memset((void *)esmp->esm_base, 0xff, + efx_evq_size(sa->nic, evq->entries)); if (sa->intr.lsc_intr && hw_index == sa->mgmt_evq_index) evq_flags |= EFX_EVQ_FLAGS_NOTIFY_INTERRUPT; @@ -823,7 +824,8 @@ sfc_ev_qinit(struct sfc_adapter *sa, /* Allocate DMA space */ rc = sfc_dma_alloc(sa, sfc_evq_type2str(type), type_index, - EFX_EVQ_SIZE(evq->entries), socket_id, &evq->mem); + efx_evq_size(sa->nic, evq->entries), socket_id, + &evq->mem); if (rc != 0) goto fail_dma_alloc; -- 2.17.1