Date: Sat, 6 Jun 2015 10:15:23 -0700 From: Marcel Moolenaar <marcel@xcllnt.net> To: John Baldwin <jhb@FreeBSD.org> Cc: Marcel Moolenaar <marcel@freebsd.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284078 - head/sys/dev/pci Message-ID: <683C7AD0-A2E7-4EA8-8F98-D1D52F40C073@xcllnt.net> In-Reply-To: <5117505.v1AmJczBtP@ralph.baldwin.cx> References: <201506061551.t56FpCbX013048@svn.freebsd.org> <14005803.mtbqcRkBJG@ralph.baldwin.cx> <FACB89C9-092E-4459-A46D-A1EDE987889D@xcllnt.net> <5117505.v1AmJczBtP@ralph.baldwin.cx>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] > On Jun 6, 2015, at 10:08 AM, John Baldwin <jhb@FreeBSD.org> wrote: > > On Saturday, June 06, 2015 09:18:22 AM Marcel Moolenaar wrote: >> >>> On Jun 6, 2015, at 9:03 AM, John Baldwin <jhb@FreeBSD.org> wrote: >>> >>> On Saturday, June 06, 2015 03:51:12 PM Marcel Moolenaar wrote: >>>> Author: marcel >>>> Date: Sat Jun 6 15:51:11 2015 >>>> New Revision: 284078 >>>> URL: https://svnweb.freebsd.org/changeset/base/284078 >>>> >>>> Log: >>>> Don't return -10000 as the probe priority. That's lower than what >>>> BUS_PROBE_HOOVER is. Drivers like proto(4), when compiled into the >>>> kernel or preloaded, will render your system useless by virtue of >>>> attaching to your PCI busses. >>>> >>>> Return BUS_PROBE_GENERIC instead. It's just the next priority up >>>> from BUS_PROBE_HOOVER. No other meaning has been give to its use. >>>> While BUS_PROBE_DEFAULT seems like a better candidate, it's hard >>>> not to think that there must be some reason why these drivers >>>> return -10000 in the first place. >>> >>> BUS_PROBE_DEFAULT would conflict with other drivers that are supposed to >>> override these, such as acpi_pcib_pci which should override pci_pci >>> for PCI-PCI bridges in the ACPI namespace. That driver currently hardcodes >>> -1000 itself. :-/ Then there's pcibios_pcib_probe for the $PIR PCI-PCI >>> bridge driver for when ACPI isn't present. It returns -2000. The >>> MPTable PCI-PCI bridge driver returns -1000 like ACPI. >> >> So that means we have a regression. Do you want me to back out >> or should we just move forward and fix those too. > > Yeah, I just now realized this. If you can fix this quickly it's probably ok > to just fix it vs backing it out and committing a larger change. I opted to back it out. I searched for all drivers that use BUS_PROBE_HOOVER and it’s exactly one: proto(4). That’s a lot easier then finding all drivers that return some negative value that has some relation to PCI busses... I’m just going to change BUS_PROBE_HOOVER to -1000000 instead. In follow-up rounds we can change magical constants to defines to make the whole pecking order more obvious/visible. -- Marcel Moolenaar marcel@xcllnt.net [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAEBCgAGBQJVcyqrAAoJEIda8t8f0tjjfU4P/iy/9ndUZZSrzUucN3QeaeMs n3Clkr02dE0e6PFNiJat8ENfB/oE+CUiFiqzR+3Fr9DAerPmrWsnVaF0U7jpgJd5 YSMS9y32h93Rng0fnB2w1UMU3UTqNp0m2ulc8tSz69igMAq65rfHEPnIIW5z/CAq pne41DLIqWDCam73MUao+BsPfSPy/9A4MBSYEvJyVQfa4UHXJkdMYqEIidz9ps0T 2AWI0nzpoJd5p04EAqWD86FYt/DKP3tigmBKv0kkrf/Dn5AprcjWFeIAQDa1rLHs MjMP6jaKf81m9lf3XMzmz93m5GItapwLHmlUK8rkX19BvfQgSXyJYIgYtDDBU0i2 c4aJorl8Zes6Ovk2gThYVAgZb4Lw4J6YZdqSvdBH9j5ok8j91SOgrnROzmaBmuIu /jKt6xhK6SwyhsZpSSSt0g9oO+l5eYXQmUJ2J88fKrm5X3eGOC5OzJucHCh/NuoL rC9y42o+bm7pcSmhww959+rrFYulYs673OgTdYT+ldvY7vwFN18qE1iYmtXZNVo5 XQReKjbyfnopc5DJrtiA4ra9v3Ikr1Ca8xN4hM+UTRJiJkTbYnUTJJ/HjY5Hk1rV 4Rb1kWqLhYCchLGvCNKh/F7alJ7LE2DIKkLPTaEuWEi+BAhyRasrZZhccdJxz9Em dysTP8MaNoP3TZtdJ7kz =AG/H -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?683C7AD0-A2E7-4EA8-8F98-D1D52F40C073>