From nobody Thu Nov 23 21:09:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SbrN2007cz51ymV; Thu, 23 Nov 2023 21:09:38 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc30.google.com (mail-oo1-xc30.google.com [IPv6:2607:f8b0:4864:20::c30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SbrN12KNxz4Nl4; Thu, 23 Nov 2023 21:09:37 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc30.google.com with SMTP id 006d021491bc7-58cecfb4412so690950eaf.3; Thu, 23 Nov 2023 13:09:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700773776; x=1701378576; darn=freebsd.org; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=lsaYqs+nbushsiBS5myk3jG5BJX/tO8lbMYgWGCqfuY=; b=NoYMxV023IKC5HHAC/dwxXUhU6n3frkGHJRY5NJXSQElAsqWAoKcTPTu8/44geXjEi 7AxMjv2WW1u5xqyOJVjSFSwGFhPgvaO3f3VNZreIbw9nnxR6j9nirv2FXqRD0ZykvwMT 5g4gAR9rTpGNsGBLSF1YX8+rl2LhL22JqMnljxyL15cjuTHMdCSP+T9HmM2AuiG80lol Ft2DUe4ONehwQEh9LRNxwzJyEvNAdQs9tVGaNEYoFhn247d0keM9lQIo7IveX9vf6ayh A16+MU+bAaT9HeRKoKpSCIwRm+xBcBJ4GiaVbwOFGRgZkvkfQuV4p+Aq2mb3sljddFBu yxSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700773776; x=1701378576; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lsaYqs+nbushsiBS5myk3jG5BJX/tO8lbMYgWGCqfuY=; b=HdU9f5/PDXoQHLfRmFoIyjWUTKNNdEXBMhN1FNtFIr5v26lFZJykqO8a9qRy6wrhu1 TNkcoBXyerO6m4q5tJbIPhvK8XXDw/ePPeTMCBZ5XLiChGRsQsWTODCj8pKjmqTwwO+o TgIUuhbkFWwJn0H0Z/QgjXosgXjvZQ6aPBHNPxQWTOsPMBO70XPPc+0t/J4b0zXNGIDh 86jmjou6VWhL0PQOFjtbh5DkTfrBScSH9/569jIn3rfPi4W9lrp7oqhGzOUtnfhQWx5M e1uIfJf+k/gAzC0GLlgz6zxKTyFE9nqPsRBs0lwgAUUn2W4HCQn/FXhseZWff8TZ8M6t 9InQ== X-Gm-Message-State: AOJu0YyoLQP4Ty1cBEwJ0BoPDbem8z/0kEs7CQHEB3EKobhKCNkrdmX6 PDLVCcZuOVpVp56gWI8LzaWPrFOBusVjTBoz1QZbGjMJG80= X-Google-Smtp-Source: AGHT+IE/Yn6OXSXWuKGT1F7INJgmi4W6Z/8ZRn7KYFo7UtUGXk4PuTcac34RA7/Gqs72f0STnCrsFwlVOZO4tqYcWtY= X-Received: by 2002:a05:6820:1625:b0:57b:469d:8af6 with SMTP id bb37-20020a056820162500b0057b469d8af6mr803811oob.4.1700773776044; Thu, 23 Nov 2023 13:09:36 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:795:0:b0:4f0:1250:dd51 with HTTP; Thu, 23 Nov 2023 13:09:35 -0800 (PST) In-Reply-To: <202311231948.3ANJmwEC076780@gitrepo.freebsd.org> References: <202311231948.3ANJmwEC076780@gitrepo.freebsd.org> From: Mateusz Guzik Date: Thu, 23 Nov 2023 22:09:35 +0100 Message-ID: Subject: Re: git: ad34121518bb - main - Revert "pst: improve shutdown_post_sync handler" To: Mitchell Horne Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4SbrN12KNxz4Nl4 i386 kernel is going down, i suggest just dropping the patch On 11/23/23, Mitchell Horne wrote: > The branch main has been updated by mhorne: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=ad34121518bb7e1a38d4a6b1ccf9ca6fe298dd0a > > commit ad34121518bb7e1a38d4a6b1ccf9ca6fe298dd0a > Author: Mitchell Horne > AuthorDate: 2023-11-23 19:46:28 +0000 > Commit: Mitchell Horne > CommitDate: 2023-11-23 19:48:44 +0000 > > Revert "pst: improve shutdown_post_sync handler" > > 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 428ebb7cd9f51afb6809bf81cf21a05e0fd93ff4. > > Pointy hat to: mhorne > --- > sys/dev/pst/pst-iop.c | 2 +- > sys/dev/pst/pst-raid.c | 14 +++++--------- > 2 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/sys/dev/pst/pst-iop.c b/sys/dev/pst/pst-iop.c > index 43ced2401d2c..f9921a564333 100644 > --- a/sys/dev/pst/pst-iop.c > +++ b/sys/dev/pst/pst-iop.c > @@ -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; > diff --git a/sys/dev/pst/pst-raid.c b/sys/dev/pst/pst-raid.c > index 4f9279462ee8..4e9c4fb724bc 100644 > --- a/sys/dev/pst/pst-raid.c > +++ b/sys/dev/pst/pst-raid.c > @@ -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 > > -- Mateusz Guzik