Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 16 May 2016 06:26:18 +0000 (UTC)
From:      Andrew Rybchenko <arybchik@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r299901 - head/sys/dev/sfxge/common
Message-ID:  <201605160626.u4G6QIK7060503@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: arybchik
Date: Mon May 16 06:26:18 2016
New Revision: 299901
URL: https://svnweb.freebsd.org/changeset/base/299901

Log:
  sfxge(4): cleanup: make VPD lookups quieter
  
  A lookup on a VPD entry which is missing reports several failure
  messages as it propagates through wrapper functions. Restructured
  the wrappers to treat this gracefully as an expected case.
  
  Submitted by:   Richard Houldsworth <rhouldsworth at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week
  Differential Revision:  https://reviews.freebsd.org/D6366

Modified:
  head/sys/dev/sfxge/common/ef10_vpd.c
  head/sys/dev/sfxge/common/efx_vpd.c
  head/sys/dev/sfxge/common/siena_vpd.c

Modified: head/sys/dev/sfxge/common/ef10_vpd.c
==============================================================================
--- head/sys/dev/sfxge/common/ef10_vpd.c	Mon May 16 06:24:04 2016	(r299900)
+++ head/sys/dev/sfxge/common/ef10_vpd.c	Mon May 16 06:26:18 2016	(r299901)
@@ -332,8 +332,11 @@ ef10_vpd_get(
 
 	/* And then from the provided data buffer */
 	if ((rc = efx_vpd_hunk_get(data, size, evvp->evv_tag,
-	    evvp->evv_keyword, &offset, &length)) != 0)
+	    evvp->evv_keyword, &offset, &length)) != 0) {
+		if (rc == ENOENT)
+			return (rc);
 		goto fail2;
+	}
 
 	evvp->evv_length = length;
 	memcpy(evvp->evv_value, data + offset, length);

Modified: head/sys/dev/sfxge/common/efx_vpd.c
==============================================================================
--- head/sys/dev/sfxge/common/efx_vpd.c	Mon May 16 06:24:04 2016	(r299900)
+++ head/sys/dev/sfxge/common/efx_vpd.c	Mon May 16 06:26:18 2016	(r299901)
@@ -253,8 +253,12 @@ efx_vpd_get(
 	EFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);
 	EFSYS_ASSERT3U(enp->en_mod_flags, &, EFX_MOD_VPD);
 
-	if ((rc = evpdop->evpdo_get(enp, data, size, evvp)) != 0)
+	if ((rc = evpdop->evpdo_get(enp, data, size, evvp)) != 0) {
+		if (rc == ENOENT)
+			return (rc);
+
 		goto fail1;
+	}
 
 	return (0);
 

Modified: head/sys/dev/sfxge/common/siena_vpd.c
==============================================================================
--- head/sys/dev/sfxge/common/siena_vpd.c	Mon May 16 06:24:04 2016	(r299900)
+++ head/sys/dev/sfxge/common/siena_vpd.c	Mon May 16 06:26:18 2016	(r299901)
@@ -436,8 +436,12 @@ siena_vpd_get(
 
 	/* And then from the provided data buffer */
 	if ((rc = efx_vpd_hunk_get(data, size, evvp->evv_tag,
-	    evvp->evv_keyword, &offset, &length)) != 0)
+	    evvp->evv_keyword, &offset, &length)) != 0) {
+		if (rc == ENOENT)
+			return (rc);
+
 		goto fail2;
+	}
 
 	evvp->evv_length = length;
 	memcpy(evvp->evv_value, data + offset, length);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605160626.u4G6QIK7060503>