From nobody Sun Sep 14 17:47:33 2025 X-Original-To: dev-commits-src-main@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 4cPwbp1v5sz68BkK; Sun, 14 Sep 2025 17:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPwbn5k79z3cg9; Sun, 14 Sep 2025 17:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757872053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9A76k2E7JBz3dc0qcOMc1oZhhmBanz2IHYGHa8w1YHY=; b=ci+94PvgdlkIQBj50dL67LKTLdlWdOh6O+Or8hV3ZfBItqK+2DI5qpN6/EK8jjsiRSBUH5 99+L6jhS8yPw1Xaw+32g+QPMopxT0bBx1J+5LYT4uFSIdw+dpk002lK7NwtVBjm9HghIhE eUICvq9AaaYakT5Xs01CQPzrGSSjTAFQGvgp2rQdWoFQ091l4yKxlvSaxAw3hOPbRJZheu B6TJP/w1xKUACRRuiUG+f6LmNNQHB0OPNwTv6OSltk9jD+MlmU5Yc7U8/9Gm4iTSZLKN4g xFg4ZcWs8+2PacobAPzaCM3oQi9poalswj0bPkOWrlWI+CHuRvM4/czgcwk5MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757872053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9A76k2E7JBz3dc0qcOMc1oZhhmBanz2IHYGHa8w1YHY=; b=Aml7IXxrU8Wf11h3BLXU3ml6Py57ud19Taaz9JyhtqiZAO/tGR8xA2eoO8pHINXhZB4bmS Dw2dygxTuzGOCH5ns1MOaA0QKFss877LqBkMBXRDczuLm3oSqVoX3vqvtrAO/63qr+1z05 tCJC3smGce3ciPyWJffrHTE40yOLQGBl1fcSiSMIs73SN8uq4fbQYobaHRBxI++q2/fG0q UTJ7cPAEsILAxezvonqb8vH8gLFpcVT+xN/V88+H53o88exHDBmy0WD9R9BBJuWOJFMI74 PQovvSOHSYKlZn2zT6J/W8OEeoZmFKlK1zCTwHSPK2cgahWXkioFHupaVRcSqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757872053; a=rsa-sha256; cv=none; b=cvAMZ7iYFawCS3ouzk1l2TSWnlcNsS7lACj19q5Vj+H43uwa1e3P6wFjELI51Fx/ypKH3k QPPHDHxdkG4itCBDsurVTEvYkxoa42Mqr1jtYsF/3thgGPQfNGukaijhdn9lZOHIs6J5zy tFWCnQEdF52DJ4exXGYT77Y9bxoHJjwkuWL1/oYAhxxEaakDYa7SfczHNjM7FBSW5HdgvK JC3otSE7Nuk0NWK7xg/dXQsOAP20+F1F5PbAFIJi6hsobyhGuTWG/zS3UlwW3Ylaitusfb DScjybV45sfxf/lqpmkojbznnlv7Z2rTQHDMGpkhGsfzqA8U1K5nfBqary55vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cPwbn5FKyz3Pw; Sun, 14 Sep 2025 17:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58EHlXdm084732; Sun, 14 Sep 2025 17:47:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58EHlXMd084729; Sun, 14 Sep 2025 17:47:33 GMT (envelope-from git) Date: Sun, 14 Sep 2025 17:47:33 GMT Message-Id: <202509141747.58EHlXMd084729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3dfb4e52587a - main - mpi3mr: Build with gcc12 by being more explicit about conditions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3dfb4e52587ae692745993a3fee975ad1d3865be Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3dfb4e52587ae692745993a3fee975ad1d3865be commit 3dfb4e52587ae692745993a3fee975ad1d3865be Author: Warner Losh AuthorDate: 2025-09-14 17:24:16 +0000 Commit: Warner Losh CommitDate: 2025-09-14 17:24:16 +0000 mpi3mr: Build with gcc12 by being more explicit about conditions Help the flow analysis in gcc12 by initializing scsi_reply to NULL and testing it along with sense_buf. Sense buf should be non-null only in this code path, but might also be non-null if the PA for is somehow set to zero. I debated adding an assert for the latter, but opted to instead preserve existing behavior. Also set host_diagnostic to 0. gcc12 can't quite realize that we only test it after we've been through this loop at least once to report an error condition. Initialize to 0 to avoid a diagnostic. Sponsored by: Netflix --- sys/dev/mpi3mr/mpi3mr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 4211529e76ad..bcf8f46ddf5d 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -4487,7 +4487,7 @@ static void mpi3mr_process_admin_reply_desc(struct mpi3mr_softc *sc, Mpi3SuccessReplyDescriptor_t *success_desc; Mpi3DefaultReply_t *def_reply = NULL; struct mpi3mr_drvr_cmd *cmdptr = NULL; - Mpi3SCSIIOReply_t *scsi_reply; + Mpi3SCSIIOReply_t *scsi_reply = NULL; U8 *sense_buf = NULL; *reply_dma = 0; @@ -4590,7 +4590,7 @@ static void mpi3mr_process_admin_reply_desc(struct mpi3mr_softc *sc, } } out: - if (sense_buf != NULL) + if (scsi_reply != NULL && sense_buf != NULL) mpi3mr_repost_sense_buf(sc, scsi_reply->SenseDataBufferAddress); return; @@ -6162,7 +6162,7 @@ static int mpi3mr_issue_reset(struct mpi3mr_softc *sc, U16 reset_type, { int retval = -1; U8 unlock_retry_count = 0; - U32 host_diagnostic, ioc_status, ioc_config, scratch_pad0; + U32 host_diagnostic = 0, ioc_status, ioc_config, scratch_pad0; U32 timeout = MPI3MR_RESET_ACK_TIMEOUT * 10; if ((reset_type != MPI3_SYSIF_HOST_DIAG_RESET_ACTION_SOFT_RESET) &&