svn commit: r346845 - head/sys/dev/isp

[Edward Tomasz Napierala]

Author: trasz
Date: Sun Apr 28 15:08:57 2019
New Revision: 346845
URL: https://svnweb.freebsd.org/changeset/base/346845

Log:
  Make isp(4) suggest loading ispfw(4) when it fails to attach.
  It cannot load it automatically at boot, because the root filesystem
  is not there yet. An alternative would be adding ispfw(4) to GENERIC,
  but it's an additional 1MB.
  
  Reviewed by:	mav
  MFC after:	2 weeks
  Sponsored by:	Klara Inc.
  Differential Revision:	https://reviews.freebsd.org/D19369

Modified:
  head/sys/dev/isp/isp_pci.c

Modified: head/sys/dev/isp/isp_pci.c
==============================================================================
--- head/sys/dev/isp/isp_pci.c	Sun Apr 28 14:38:21 2019	(r346844)
+++ head/sys/dev/isp/isp_pci.c	Sun Apr 28 15:08:57 2019	(r346845)
@@ -931,6 +931,15 @@ isp_pci_attach(device_t dev)
 	return (0);
 
 bad:
+	if (isp->isp_osinfo.fw == NULL && !IS_26XX(isp)) {
+		/*
+		 * Failure to attach at boot time might have been caused
+		 * by a missing ispfw(4).  Except for for 16Gb adapters,
+		 * there's no loadable firmware for them.
+		 */
+		isp_prt(isp, ISP_LOGWARN, "See the ispfw(4) man page on "
+		    "how to load known good firmware at boot time");
+	}
 	for (i = 0; i < isp->isp_nirq; i++) {
 		(void) bus_teardown_intr(dev, pcs->irq[i].irq, pcs->irq[i].ih);
 		(void) bus_release_resource(dev, SYS_RES_IRQ, pcs->irq[i].iqd,