d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Limit CHANNEL_B_PRIMARY's effect to twin channel adapters where we can easily

Browse Source 
register our sub-busses in the reversed order.  In the future, we may provide
a hint to CAM on how to order the scans for multi-function adapters that also
set this flag, but trying to do it the "twin channel" way will lead to
a panic.
This commit is contained in:
gibbs 2001-02-17 01:53:22 +00:00
parent 2d4d551f1e
commit 80353cf8bd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/aic7xxx/aic7xxx_freebsd.c
View File

@ -122,7 +122,8 @@ ahc_attach(struct ahc_softc *ahc)
* Attach secondary channel first if the user has
* declared it the primary channel.
*/
if ((ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
if ((ahc->features & AHC_TWIN) != 0
&& (ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
bus_id = 1;
bus_id2 = 0;
} else {
@ -212,7 +213,8 @@ ahc_attach(struct ahc_softc *ahc)
}
fail:
if ((ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
if ((ahc->features & AHC_TWIN) != 0
&& (ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
ahc->platform_data->sim_b = sim;
ahc->platform_data->path_b = path;
ahc->platform_data->sim = sim2;

6
sys/dev/aic7xxx/aic7xxx_osm.c
View File

@ -122,7 +122,8 @@ ahc_attach(struct ahc_softc *ahc)
* Attach secondary channel first if the user has
* declared it the primary channel.
*/
if ((ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
if ((ahc->features & AHC_TWIN) != 0
&& (ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
bus_id = 1;
bus_id2 = 0;
} else {
@ -212,7 +213,8 @@ ahc_attach(struct ahc_softc *ahc)
}
fail:
if ((ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
if ((ahc->features & AHC_TWIN) != 0
&& (ahc->flags & AHC_CHANNEL_B_PRIMARY) != 0) {
ahc->platform_data->sim_b = sim;
ahc->platform_data->path_b = path;
ahc->platform_data->sim = sim2;