svn commit: r204285 - stable/7/usr.sbin/mptutil

[John Baldwin]

Author: jhb
Date: Wed Feb 24 21:26:27 2010
New Revision: 204285
URL: http://svn.freebsd.org/changeset/base/204285

Log:
  MFC 204086:
  - Don't emit a warning in 'show adapter' if the IOC2 or IOC6 pages are not
    present.  mpt(4) controllers that do not support RAID do not have an IOC6
    page, for example.
  - Correct a check for a missing page error in a debug function.

Modified:
  stable/7/usr.sbin/mptutil/mpt_show.c
Directory Properties:
  stable/7/usr.sbin/mptutil/   (props changed)

Modified: stable/7/usr.sbin/mptutil/mpt_show.c
==============================================================================
--- stable/7/usr.sbin/mptutil/mpt_show.c	Wed Feb 24 21:20:25 2010	(r204284)
+++ stable/7/usr.sbin/mptutil/mpt_show.c	Wed Feb 24 21:26:27 2010	(r204285)
@@ -78,6 +78,7 @@ show_adapter(int ac, char **av)
 	CONFIG_PAGE_MANUFACTURING_0 *man0;
 	CONFIG_PAGE_IOC_2 *ioc2;
 	CONFIG_PAGE_IOC_6 *ioc6;
+	U16 IOCStatus;
 	int fd, comma;
 
 	if (ac != 1) {
@@ -108,7 +109,7 @@ show_adapter(int ac, char **av)
 
 	free(man0);
 
-	ioc2 = mpt_read_ioc_page(fd, 2, NULL);
+	ioc2 = mpt_read_ioc_page(fd, 2, &IOCStatus);
 	if (ioc2 != NULL) {
 		printf("      RAID Levels:");
 		comma = 0;
@@ -151,9 +152,11 @@ show_adapter(int ac, char **av)
 			printf(" none");
 		printf("\n");
 		free(ioc2);
-	}
+	} else if ((IOCStatus & MPI_IOCSTATUS_MASK) !=
+	    MPI_IOCSTATUS_CONFIG_INVALID_PAGE)
+		warnx("mpt_read_ioc_page(2): %s", mpt_ioc_status(IOCStatus));
 
-	ioc6 = mpt_read_ioc_page(fd, 6, NULL);
+	ioc6 = mpt_read_ioc_page(fd, 6, &IOCStatus);
 	if (ioc6 != NULL) {
 		display_stripe_map("    RAID0 Stripes",
 		    ioc6->SupportedStripeSizeMapIS);
@@ -172,7 +175,9 @@ show_adapter(int ac, char **av)
 			printf("-%u", ioc6->MaxDrivesIME);
 		printf("\n");
 		free(ioc6);
-	}
+	} else if ((IOCStatus & MPI_IOCSTATUS_MASK) !=
+	    MPI_IOCSTATUS_CONFIG_INVALID_PAGE)
+		warnx("mpt_read_ioc_page(6): %s", mpt_ioc_status(IOCStatus));
 
 	/* TODO: Add an ioctl to fetch IOC_FACTS and print firmware version. */
 
@@ -541,7 +546,8 @@ show_physdisks(int ac, char **av)
 	for (i = 0; i <= 0xff; i++) {
 		pinfo = mpt_pd_info(fd, i, &IOCStatus);
 		if (pinfo == NULL) {
-			if (IOCStatus != MPI_IOCSTATUS_CONFIG_INVALID_PAGE)
+			if ((IOCStatus & MPI_IOCSTATUS_MASK) !=
+			    MPI_IOCSTATUS_CONFIG_INVALID_PAGE)
 				warnx("mpt_pd_info(%d): %s", i,
 				    mpt_ioc_status(IOCStatus));
 			continue;