From: Rasesh Mody <rasesh.mody@cavium.com>
Date: Sat, 18 Mar 2017 06:50:17 +0000 (-0700)
Subject: net/qede/base: fix forcing driver default resc allocation
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=e0d26cd273caa2624b43370f9ac6a243c2d30b1b;p=dpdk.git

net/qede/base: fix forcing driver default resc allocation

Remove the forcing of the driver's default resource allocation.

Fixes: 77f7222124de ("net/qede: add PCI ids for new chip variant")

Signed-off-by: Rasesh Mody <rasesh.mody@cavium.com>
---

diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c
index 426ff46f88..8663d7a01c 100644
--- a/drivers/net/qede/base/ecore_dev.c
+++ b/drivers/net/qede/base/ecore_dev.c
@@ -2298,12 +2298,11 @@ static enum _ecore_status_t ecore_hw_set_resc_info(struct ecore_hwfn *p_hwfn,
 	*p_resc_start = resc_info.offset;
 
 	if (*p_resc_num != dflt_resc_num || *p_resc_start != dflt_resc_start) {
-		DP_NOTICE(p_hwfn, false,
-			  "Resource %d [%s]: MFW allocation [num %d, start %d]"
-			  " differs from default values [num %d, start %d]%s\n",
-			  res_id, ecore_hw_get_resc_name(res_id), *p_resc_num,
-			  *p_resc_start, dflt_resc_num, dflt_resc_start,
-			  drv_resc_alloc ? " - Applying default values" : "");
+		DP_INFO(p_hwfn,
+			"Resource %d [%s]: MFW allocation [num %d, start %d] differs from default values [num %d, start %d]%s\n",
+			res_id, ecore_hw_get_resc_name(res_id), *p_resc_num,
+			*p_resc_start, dflt_resc_num, dflt_resc_start,
+			drv_resc_alloc ? " - Applying default values" : "");
 		if (drv_resc_alloc) {
 			*p_resc_num = dflt_resc_num;
 			*p_resc_start = dflt_resc_start;
@@ -2332,12 +2331,7 @@ static enum _ecore_status_t ecore_hw_get_resc(struct ecore_hwfn *p_hwfn,
 #endif
 
 	for (res_id = 0; res_id < ECORE_MAX_RESC; res_id++) {
-		/* @@@TMP for AH:
-		 * Force the driver's default resource allocation in case there
-		 * is a diff with the MFW allocation value.
-		 */
-		rc = ecore_hw_set_resc_info(p_hwfn, res_id,
-					    b_ah || drv_resc_alloc);
+		rc = ecore_hw_set_resc_info(p_hwfn, res_id, drv_resc_alloc);
 		if (rc != ECORE_SUCCESS)
 			return rc;
 	}