diff mbox series

[26/37] net/sfc/base: fix ID retrival in v3 licensing

Message ID	1536572016-18134-27-git-send-email-arybchenko@solarflare.com (mailing list archive)
State	Accepted, archived
Delegated to:	Ferruh Yigit
Headers	From: Andrew Rybchenko <arybchenko@solarflare.com> To: <dev@dpdk.org> CC: Andy Moreton <amoreton@solarflare.com>, <stable@dpdk.org> Date: Mon, 10 Sep 2018 10:33:25 +0100 Message-ID: <1536572016-18134-27-git-send-email-arybchenko@solarflare.com> In-Reply-To: <1536572016-18134-1-git-send-email-arybchenko@solarflare.com> References: <1536572016-18134-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [dpdk-dev] [PATCH 26/37] net/sfc/base: fix ID retrival in v3 licensing Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	net/sfc: update base driver \| [00/37] net/sfc: update base driver [01/37] net/sfc/base: fix PreFAST warnings because of unused return [02/37] net/sfc/base: fix invalid order of memset arguments [03/37] net/sfc/base: fix output buffer SAL annotation [04/37] net/sfc/base: highlight that image layout header generated [05/37] net/sfc/base: fix erroneous SAL annotation for input buffers [06/37] net/sfc/base: properly align on line continuation [07/37] net/sfc/base: add space after sizeof [08/37] net/sfc/base: fix build failure because of no declaration [09/37] net/sfc/base: add more definitions of partitions [10/37] net/sfc/base: fix outer IPID field in TSO option descriptors [11/37] net/sfc/base: move empty efsys definitions to EFX headers [12/37] net/sfc/base: add check for TUNNEL module in NIC reset API [13/37] net/sfc/base: refactor monitors support [14/37] net/sfc/base: remove probes when a Tx queue is too full [15/37] net/sfc/base: add generated description of sensors [16/37] net/sfc/base: check size of memory to read sensors data to [17/37] net/sfc/base: add API to retrieve sensor limits [18/37] net/sfc/base: add buffer editing functions to boot config [19/37] net/sfc/base: add accessor for default port mode [20/37] net/sfc/base: generalise EF10 NVRAM buffer interface [21/37] net/sfc/base: avoid usage of too big arrays on stack [22/37] net/sfc/base: add information if TSO workaround is required [23/37] net/sfc/base: fix out of bounds read when dereferencing sdup [24/37] net/sfc/base: add routine to check for hardware presence [25/37] net/sfc/base: add API to inform libefx of hardware removal [26/37] net/sfc/base: fix ID retrival in v3 licensing [27/37] net/sfc/base: prevent access to the NIC config before probe [28/37] net/sfc/base: fix name of the argument to store RSS flags [29/37] net/sfc/base: fix a typo in unicast filter insertion comment [30/37] net/sfc/base: add support to get active FEC type [31/37] net/sfc/base: use simpler code to check hash algorithm type [32/37] net/sfc/base: check buffer size for hash flags [33/37] net/sfc/base: simplify the code to parse RSS hash type [34/37] net/sfc/base: improve handling of legacy RSS hash flags [35/37] net/sfc/base: modify phy caps to indicate FEC request [36/37] net/sfc/base: fix MAC Tx stats for less or equal to 64 bytes [37/37] net/sfc/base: add helper API to make Geneve filter spec

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK
ci/Intel-compilation	success	Compilation OK

Commit Message

Andrew Rybchenko Sept. 10, 2018, 9:33 a.m. UTC

  From: Andy Moreton <amoreton@solarflare.com>

Fixes: 05fce2ce8451 ("net/sfc/base: import libefx licensing")
Fixes: f67e4719147d ("net/sfc/base: fix coding style")
Cc: stable@dpdk.org

Signed-off-by: Andy Moreton <amoreton@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/base/efx_lic.c | 39 ++++++++--------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/sfc/base/efx_lic.c b/drivers/net/sfc/base/efx_lic.c
index 2a6da2647..4081aef1b 100644
--- a/drivers/net/sfc/base/efx_lic.c
+++ b/drivers/net/sfc/base/efx_lic.c
@@ -983,26 +983,14 @@  efx_mcdi_licensing_v3_get_id(
 {
 	efx_mcdi_req_t req;
 	EFX_MCDI_DECLARE_BUF(payload, MC_CMD_LICENSING_GET_ID_V3_IN_LEN,
-		MC_CMD_LICENSING_GET_ID_V3_OUT_LENMIN);
+		MC_CMD_LICENSING_GET_ID_V3_OUT_LENMAX);
 	efx_rc_t rc;
 
 	req.emr_cmd = MC_CMD_LICENSING_GET_ID_V3;
-
-	if (bufferp == NULL) {
-		/* Request id type and length only */
-		req.emr_in_buf = bufferp;
-		req.emr_in_length = MC_CMD_LICENSING_GET_ID_V3_IN_LEN;
-		req.emr_out_buf = bufferp;
-		req.emr_out_length = MC_CMD_LICENSING_GET_ID_V3_OUT_LENMIN;
-	} else {
-		/* Request full buffer */
-		req.emr_in_buf = bufferp;
-		req.emr_in_length = MC_CMD_LICENSING_GET_ID_V3_IN_LEN;
-		req.emr_out_buf = bufferp;
-		req.emr_out_length =
-		    MIN(buffer_size, MC_CMD_LICENSING_GET_ID_V3_OUT_LENMAX);
-		(void) memset(bufferp, 0, req.emr_out_length);
-	}
+	req.emr_in_buf = payload;
+	req.emr_in_length = MC_CMD_LICENSING_GET_ID_V3_IN_LEN;
+	req.emr_out_buf = payload;
+	req.emr_out_length = MC_CMD_LICENSING_GET_ID_V3_OUT_LENMAX;
 
 	efx_mcdi_execute_quiet(enp, &req);
 
@@ -1020,19 +1008,10 @@  efx_mcdi_licensing_v3_get_id(
 	*lengthp =
 	    MCDI_OUT_DWORD(req, LICENSING_GET_ID_V3_OUT_LICENSE_ID_LENGTH);
 
-	if (bufferp == NULL) {
-		/*
-		 * Modify length requirements to indicate to caller the extra
-		 * buffering needed to read the complete output.
-		 */
-		*lengthp += MC_CMD_LICENSING_GET_ID_V3_OUT_LENMIN;
-	} else {
-		/* Shift ID down to start of buffer */
-		memmove(bufferp,
-		    bufferp + MC_CMD_LICENSING_GET_ID_V3_OUT_LICENSE_ID_OFST,
-		    *lengthp);
-		memset(bufferp + (*lengthp), 0,
-		    MC_CMD_LICENSING_GET_ID_V3_OUT_LICENSE_ID_OFST);
+	if (bufferp != NULL) {
+		memcpy(bufferp,
+		    payload + MC_CMD_LICENSING_GET_ID_V3_OUT_LICENSE_ID_OFST,
+		    MIN(buffer_size, *lengthp));
 	}
 
 	return (0);