Attachment #255332 for bug #282860

Lines 20-25 Link Here

(-)b/sys/amd64/conf/GENERIC (+2 lines)
20	cpu HAMMER	20	cpu HAMMER
21	ident GENERIC	21	ident GENERIC
22		22
		23	options BUS_DEBUG
		24
23	makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols	25	makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
24	makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support	26	makeoptions WITH_CTF=1 # Run ctfconvert(1) for DTrace support
25		27




	 * Create all the non-hinted children by calling drivers'
	 * identify methods.
	 */
	printf("%s:%d\n", __func__, __LINE__);
	bus_generic_probe(dev);

	printf("%s:%d\n", __func__, __LINE__);
	if (device_get_children(dev, &children, &nchildren))
		return;
	printf("%s:%d\n", __func__, __LINE__);
	/*
	 * First disable all pnp devices so that they don't get
	 * matched by legacy probes.




		device_print_child(dev->parent, dev);
	attachtime = get_cyclecount();
	dev->state = DS_ATTACHING;
	printf("%s:%d %s%d\n", __func__, __LINE__, dev->driver->name, dev->unit);
	if ((error = DEVICE_ATTACH(dev)) != 0) {
		printf("device_attach: %s%d attach returned %d\n",
		    dev->driver->name, dev->unit, error);

		 */
		if (dl->pass > bus_current_pass)
			continue;
		printf("%s:%d %s\n", __func__, __LINE__, dl->driver->name);
		DEVICE_IDENTIFY(dl->driver, dev);
	}
	printf("%s:%d\n", __func__, __LINE__);

	return (0);
}

	device_t child;

	dc = dev->devclass;
	printf("%s:%d\n", __func__, __LINE__);
	TAILQ_FOREACH(dl, &dc->drivers, link) {
		if (dl->pass == bus_current_pass) {
			printf("%s:%d %s\n", __func__, __LINE__, dl->driver->name);
			DEVICE_IDENTIFY(dl->driver, dev);
		}
	}
	TAILQ_FOREACH(child, &dev->children, link) {
		if (child->state >= DS_ATTACHED)

		else if (child->state == DS_NOTPRESENT)
			device_probe_and_attach(child);
	}
	printf("%s:%d\n", __func__, __LINE__);
}

/**

Lines 94-101 static void Link Here

(-)b/sys/x86/x86/autoconf.c (+2 lines)
94	configure(void *dummy)	94	configure(void *dummy)
95	{	95	{
96		96
		97	printf("%s:%d\n", __func__, __LINE__);
97	/* initialize new bus architecture */	98	/* initialize new bus architecture */
98	root_bus_configure();	99	root_bus_configure();
		100	printf("%s:%d\n", __func__, __LINE__);
99		101
100	#ifdef DEV_ISA	102	#ifdef DEV_ISA
101	/*	103	/*

Return to bug 282860

Lines 501-511 isa_probe_children(device_t dev) Link Here

(-)b/sys/isa/isa_common.c (-1 / +3 lines)
501	* Create all the non-hinted children by calling drivers'	501	* Create all the non-hinted children by calling drivers'
502	* identify methods.	502	* identify methods.
503	*/	503	*/
		504	printf("%s:%d\n", __func__, __LINE__);
504	bus_generic_probe(dev);	505	bus_generic_probe(dev);
505		506
		507	printf("%s:%d\n", __func__, __LINE__);
506	if (device_get_children(dev, &children, &nchildren))	508	if (device_get_children(dev, &children, &nchildren))
507	return;	509	return;
508		510	printf("%s:%d\n", __func__, __LINE__);
509	/*	511	/*
510	* First disable all pnp devices so that they don't get	512	* First disable all pnp devices so that they don't get
511	* matched by legacy probes.	513	* matched by legacy probes.

Lines 2606-2611 device_attach(device_t dev) Link Here

(-)b/sys/kern/subr_bus.c (-1 / +8 lines)
2606	device_print_child(dev->parent, dev);	2606	device_print_child(dev->parent, dev);
2607	attachtime = get_cyclecount();	2607	attachtime = get_cyclecount();
2608	dev->state = DS_ATTACHING;	2608	dev->state = DS_ATTACHING;
		2609	printf("%s:%d %s%d\n", __func__, __LINE__, dev->driver->name, dev->unit);
2609	if ((error = DEVICE_ATTACH(dev)) != 0) {	2610	if ((error = DEVICE_ATTACH(dev)) != 0) {
2610	printf("device_attach: %s%d attach returned %d\n",	2611	printf("device_attach: %s%d attach returned %d\n",
2611	dev->driver->name, dev->unit, error);	2612	dev->driver->name, dev->unit, error);
Lines 3418-3425 bus_generic_probe(device_t dev) Link Here
3418	*/	3419	*/
3419	if (dl->pass > bus_current_pass)	3420	if (dl->pass > bus_current_pass)
3420	continue;	3421	continue;
		3422	printf("%s:%d %s\n", __func__, __LINE__, dl->driver->name);
3421	DEVICE_IDENTIFY(dl->driver, dev);	3423	DEVICE_IDENTIFY(dl->driver, dev);
3422	}	3424	}
		3425	printf("%s:%d\n", __func__, __LINE__);
3423		3426
3424	return (0);	3427	return (0);
3425	}	3428	}
Lines 3850-3858 bus_generic_new_pass(device_t dev) Link Here
3850	device_t child;	3853	device_t child;
3851		3854
3852	dc = dev->devclass;	3855	dc = dev->devclass;
		3856	printf("%s:%d\n", __func__, __LINE__);
3853	TAILQ_FOREACH(dl, &dc->drivers, link) {	3857	TAILQ_FOREACH(dl, &dc->drivers, link) {
3854	if (dl->pass == bus_current_pass)	3858	if (dl->pass == bus_current_pass) {
		3859	printf("%s:%d %s\n", __func__, __LINE__, dl->driver->name);
3855	DEVICE_IDENTIFY(dl->driver, dev);	3860	DEVICE_IDENTIFY(dl->driver, dev);
		3861	}
3856	}	3862	}
3857	TAILQ_FOREACH(child, &dev->children, link) {	3863	TAILQ_FOREACH(child, &dev->children, link) {
3858	if (child->state >= DS_ATTACHED)	3864	if (child->state >= DS_ATTACHED)
Lines 3860-3865 bus_generic_new_pass(device_t dev) Link Here
3860	else if (child->state == DS_NOTPRESENT)	3866	else if (child->state == DS_NOTPRESENT)
3861	device_probe_and_attach(child);	3867	device_probe_and_attach(child);
3862	}	3868	}
		3869	printf("%s:%d\n", __func__, __LINE__);
3863	}	3870	}
3864		3871
3865	/**	3872	/**