mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-22 15:47:37 +00:00
Fix intrhook release in MPR and MPS for EARLY_AP_STARTUP.
Reported by: Limelight Sponsored by: Netflix
This commit is contained in:
parent
1415db6ca2
commit
a4bb51a4a2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=323384
@ -1816,6 +1816,11 @@ mpr_startup(void *arg)
|
||||
mpr_mapping_initialize(sc);
|
||||
mprsas_startup(sc);
|
||||
mpr_unlock(sc);
|
||||
|
||||
mpr_dprint(sc, MPR_INIT, "disestablish config intrhook\n");
|
||||
config_intrhook_disestablish(&sc->mpr_ich);
|
||||
sc->mpr_ich.ich_arg = NULL;
|
||||
|
||||
mpr_dprint(sc, MPR_INIT, "%s exit\n", __func__);
|
||||
}
|
||||
|
||||
|
@ -3829,12 +3829,6 @@ mprsas_portenable_complete(struct mpr_softc *sc, struct mpr_command *cm)
|
||||
mpr_dprint(sc, MPR_FAULT, "Portenable failed\n");
|
||||
|
||||
mpr_free_command(sc, cm);
|
||||
if (sc->mpr_ich.ich_arg != NULL) {
|
||||
mpr_dprint(sc, MPR_XINFO, "disestablish config intrhook\n");
|
||||
config_intrhook_disestablish(&sc->mpr_ich);
|
||||
sc->mpr_ich.ich_arg = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Done waiting for port enable to complete. Decrement the refcount.
|
||||
* If refcount is 0, discovery is complete and a rescan of the bus can
|
||||
|
@ -1673,6 +1673,11 @@ mps_startup(void *arg)
|
||||
mps_mapping_initialize(sc);
|
||||
mpssas_startup(sc);
|
||||
mps_unlock(sc);
|
||||
|
||||
mps_dprint(sc, MPS_INIT, "disestablish config intrhook\n");
|
||||
config_intrhook_disestablish(&sc->mps_ich);
|
||||
sc->mps_ich.ich_arg = NULL;
|
||||
|
||||
mps_dprint(sc, MPS_INIT, "%s exit\n", __func__);
|
||||
}
|
||||
|
||||
|
@ -3557,11 +3557,6 @@ mpssas_portenable_complete(struct mps_softc *sc, struct mps_command *cm)
|
||||
mps_dprint(sc, MPS_FAULT, "Portenable failed\n");
|
||||
|
||||
mps_free_command(sc, cm);
|
||||
if (sc->mps_ich.ich_arg != NULL) {
|
||||
mps_dprint(sc, MPS_XINFO, "disestablish config intrhook\n");
|
||||
config_intrhook_disestablish(&sc->mps_ich);
|
||||
sc->mps_ich.ich_arg = NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get WarpDrive info after discovery is complete but before the scan
|
||||
|
Loading…
Reference in New Issue
Block a user