From nobody Sat Nov 25 07:51:36 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 4SckZM0rvdz52WS4; Sat, 25 Nov 2023 07:51:39 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SckZM0PyZz4FwQ; Sat, 25 Nov 2023 07:51:39 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700898699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=U5YqbOYjmZWP2mldxcqGAeK5+tHRfHjXd42//77hOtY=; b=Wg3lx5O2+iVtF882DZ8fSU5QoRUESWF3HnhBM1m7yXJ2gNAmCyc62WgiZW7j1HdCwzoImD kmValT93zIonU8/ScZOPGnK8jWN07o4YRvnm1hby8RkBymAdQtmccBmhvfUq07kfNl2nVQ 487+ahQhySALrsrLlqKs8i7Ks3lONMcB+7awQoHLQPM+JUWXo2g+SGSGN5QQmPK6Kw/VAi LJzFa7H73P6ezrvQrOTtn6Fgg/4sNclGlvdW1/tcoFhyz2hTN50NLQgzhzm9nxJrHgGexi L96Dz0V6V1ClO7dKvQOsgFh3pPAKM/rS0nLZnVWO9m6rzfcJWgI7fgHkPfxyxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700898699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=U5YqbOYjmZWP2mldxcqGAeK5+tHRfHjXd42//77hOtY=; b=ZUhXHWCY79+eD8jV7n4zay35XrFp+iWWoxDP5E3iYvmNRuBJih1qDe3wan0QH3Y4VrnhwD ZG/Znl66GDN63kMKLRm3eNVDOdCtDNJdK2G9aOckcNq1dXuNuFBHxqayMDLJmU84/6GDiy Qp4abZjnIvXK49SCsLDNN1sQmtVGfYmqay34YjvnK2ipS3wexAn3RalKVjz8P4mFKtEMnv G5JgUou2mPcmXJA2HjUhc9g3wUqxu258qVura+XvETqyn6PFOIurL85pQLS+CraBxBkd2j unKEIErln6rDCA7D7ZXV9Eg0AFwAt6joaY2In67Fkler4mcMmH2EA8FebqbCgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700898699; a=rsa-sha256; cv=none; b=oj9QGHfTZ2wIxjeNHEowesg8B0oYKnjOv1/J+Fn+dzJ3pxn+BIuku4G2Yvq+B7RtVcXwRC cA5Z2ayogCgqD35wdb/NSVBmxGGQHVN/IG4gBkNRJ34akbN0A7tx3uCGj8b8ZREEft3Qh9 jxBGvtjdNNDMnB+WcfeLukJnoUIULub972Ms3BO4nVCBt7Nt6u4SpGMANFdQXnU7arIZsx HEZpwmXcb25YTljXQDD7/rtcnajwdtdqSHmaL1HlaYxhWi8/lP8K26Q4pqBxJIJI/j63AT z16Fh10OT4tuvsBe7GDiJIjlg3DCCzkKR1/vcU0FsNQb4H9g5o7ByMfe3HKWwA== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SckZL5zyRzr0H; Sat, 25 Nov 2023 07:51:38 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 62BCC1A34D9; Sat, 25 Nov 2023 08:51:36 +0100 (CET) Date: Sat, 25 Nov 2023 08:51:36 +0100 From: Baptiste Daroussin To: Mateusz Guzik Cc: Mitchell Horne , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ad34121518bb - main - Revert "pst: improve shutdown_post_sync handler" Message-ID: References: <202311231948.3ANJmwEC076780@gitrepo.freebsd.org> 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Kernel building for i386 is broken now and pkgbase builders do complain, can anyone have a look? Best regards, Bapt On Thu, Nov 23, 2023 at 10:09:35PM +0100, Mateusz Guzik wrote: > 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 >