system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "pst: improve shutdown_post_sync handler"

Browse source 
I did not realize this driver was i386-only, and the change fails to
compile. Revert so that I can fix it properly.

This reverts commit 428ebb7cd9.

Pointy hat to: mhorne
This commit is contained in:
Mitchell Horne 2023-11-23 15:46:28 -04:00
parent 3578000a6f
commit ad34121518
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/pst/pst-iop.c
View file

@ -432,7 +432,7 @@ iop_queue_wait_msg(struct iop_softc *sc, int mfa, struct i2o_basic_message *msg)
int status, timeout = 10000;
mtx_lock(&sc->mtx);
if ((sc->reg->oqueue_intr_mask & I20_OUT_INTR_QUEUE) == 0) {
if (!(sc->reg->oqueue_intr_mask & 0x08)) {
msg->transaction_context = (u_int32_t)&request;
msg->initiator_context = (u_int32_t)iop_done;
sc->reg->iqueue = mfa;

14
sys/dev/pst/pst-raid.c
View file

@ -73,7 +73,7 @@ struct pst_request {
static disk_strategy_t pststrategy;
static int pst_probe(device_t);
static int pst_attach(device_t);
static void pst_shutdown_post_sync(device_t, int);
static int pst_shutdown(device_t);
static void pst_start(struct pst_softc *);
static void pst_done(struct iop_softc *, u_int32_t, struct i2o_single_reply *);
static int pst_rw(struct pst_request *);
@ -170,23 +170,18 @@ pst_attach(device_t dev)
name, psc->info->capacity/(512*255*63), 255, 63,
device_get_nameunit(psc->iop->dev));
EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown_post_sync,
EVENTHANDLER_REGISTER(shutdown_post_sync, pst_shutdown,
dev, SHUTDOWN_PRI_FIRST);
return 0;
}
static void
pst_shutdown_post_sync(device_t dev, int howto __unused)
static int
pst_shutdown(device_t dev)
{
struct pst_softc *psc = device_get_softc(dev);
struct i2o_bsa_cache_flush_message *msg;
int mfa;
if (SCHEDULER_STOPPED()) {
/* Request polled shutdown. */
psc->reg->oqueue_intr_mask = 0xffffffff;
}
mfa = iop_get_mfa(psc->iop);
msg = (struct i2o_bsa_cache_flush_message *)(psc->iop->ibase + mfa);
bzero(msg, sizeof(struct i2o_bsa_cache_flush_message));
@ -199,6 +194,7 @@ pst_shutdown_post_sync(device_t dev, int howto __unused)
msg->control_flags = 0x0; /* 0x80 = post progress reports */
if (iop_queue_wait_msg(psc->iop, mfa, (struct i2o_basic_message *)msg))
printf("pst: shutdown failed!\n");
return 0;
}
static void