svn commit: r322116 - stable/10/sys/dev/ichwd

[Alexander Motin]

Author: mav
Date: Sun Aug  6 08:15:21 2017
New Revision: 322116
URL: https://svnweb.freebsd.org/changeset/base/322116

Log:
  MFC r321720, r321856: Attach ichwd(4) only to ISA bus of the LPC bridge.
  
  Resource allocation for parent device does not look good by itself, but
  attempt to allocate them for unrelated device just does not end up good.
  On Asus X99-E WS/USB3.1 system reporting ISA bridge via both PCI and ACPI
  this reported to cause kernel panic on shutdown due to messed resources:
  https://bugs.freenas.org/issues/25237.

Modified:
  stable/10/sys/dev/ichwd/ichwd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/10/sys/dev/ichwd/ichwd.c	Sun Aug  6 08:14:46 2017	(r322115)
+++ stable/10/sys/dev/ichwd/ichwd.c	Sun Aug  6 08:15:21 2017	(r322116)
@@ -527,23 +527,29 @@ ichwd_event(void *arg, unsigned int cmd, int *error)
 }
 
 static device_t
-ichwd_find_ich_lpc_bridge(struct ichwd_device **id_p)
+ichwd_find_ich_lpc_bridge(device_t isa, struct ichwd_device **id_p)
 {
 	struct ichwd_device *id;
-	device_t ich = NULL;
+	device_t isab, pci;
+	uint16_t devid;
 
-	/* look for an ICH LPC interface bridge */
-	for (id = ichwd_devices; id->desc != NULL; ++id)
-		if ((ich = pci_find_device(VENDORID_INTEL, id->device)) != NULL)
-			break;
-
-	if (ich == NULL)
+	/* Check whether parent ISA bridge looks familiar. */
+	isab = device_get_parent(isa);
+	pci = device_get_parent(isab);
+	if (pci == NULL || device_get_devclass(pci) != devclass_find("pci"))
 		return (NULL);
+	if (pci_get_vendor(isab) != VENDORID_INTEL)
+		return (NULL);
+	devid = pci_get_device(isab);
+	for (id = ichwd_devices; id->desc != NULL; ++id) {
+		if (devid == id->device) {
+			if (id_p != NULL)
+				*id_p = id;
+			return (isab);
+		}
+	}
 
-	if (id_p)
-		*id_p = id;
-
-	return (ich);
+	return (NULL);
 }
 
 /*
@@ -559,7 +565,7 @@ ichwd_identify(driver_t *driver, device_t parent)
 	uint32_t base_address;
 	int rc;
 
-	ich = ichwd_find_ich_lpc_bridge(&id_p);
+	ich = ichwd_find_ich_lpc_bridge(parent, &id_p);
 	if (ich == NULL)
 		return;
 
@@ -612,7 +618,7 @@ ichwd_probe(device_t dev)
 	if (isa_get_logicalid(dev) != 0)
 		return (ENXIO);
 
-	if (ichwd_find_ich_lpc_bridge(&id_p) == NULL)
+	if (ichwd_find_ich_lpc_bridge(device_get_parent(dev), &id_p) == NULL)
 		return (ENXIO);
 
 	device_set_desc_copy(dev, id_p->desc);
@@ -630,7 +636,7 @@ ichwd_attach(device_t dev)
 	sc = device_get_softc(dev);
 	sc->device = dev;
 
-	ich = ichwd_find_ich_lpc_bridge(&id_p);
+	ich = ichwd_find_ich_lpc_bridge(device_get_parent(dev), &id_p);
 	if (ich == NULL) {
 		device_printf(sc->device, "Can not find ICH device.\n");
 		goto fail;
@@ -720,7 +726,6 @@ static int
 ichwd_detach(device_t dev)
 {
 	struct ichwd_softc *sc;
-	device_t ich = NULL;
 
 	sc = device_get_softc(dev);
 
@@ -745,9 +750,8 @@ ichwd_detach(device_t dev)
 	bus_release_resource(dev, SYS_RES_IOPORT, sc->smi_rid, sc->smi_res);
 
 	/* deallocate memory resource */
-	ich = ichwd_find_ich_lpc_bridge(NULL);
-	if (sc->gcs_res && ich)
-		bus_release_resource(ich, SYS_RES_MEMORY, sc->gcs_rid,
+	if (sc->gcs_res)
+		bus_release_resource(sc->ich, SYS_RES_MEMORY, sc->gcs_rid,
 		    sc->gcs_res);
 
 	return (0);