From nobody Wed Apr 30 17:21:40 2025 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 4ZnkW92JxGz5tj3H; Wed, 30 Apr 2025 17:21:41 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZnkW83gClz3Lw4; Wed, 30 Apr 2025 17:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033700; 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=yQk/io+FOeWlV5UVwc8MAAQeXzb5eoaBgaTZ4opoIEE=; b=Osy41VsShvs39I3rHAwKpNJR0VDXz4ewg3EzCB9VLwRKppHlIlqpzoXKUpj7yOb3mi/nuB 92UiGibTMB96VJkFXeV5jZBeEGOKEAh1hE86Kn4R81FYhZMM71UCtLICHZtRS70wMjFNVg 3gxlo4rNdsr/GMcqLKkQv9Y0sJ/3KCXZNpKpQTR9vf1hPObNy4jZ7L2GJ6ERXe1rVM2Zdv nox4AyLngfWoE0BYfMOgJk8YApP5X4YGBzY/2Xd4fsvZkHr0DD7HOv69e6V2x+qLSQuItk Qk5/qghZGa3tek6xBWdIAW7Jip9TmGNMKSm18cL0brVxpJvpjVVWp+/2erwZtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746033700; a=rsa-sha256; cv=none; b=xBt/rXCMADIO++hU/Tx7rRtC2WbDdi0d3nhEk9znslVplXhKigwiK4/UC4Wz3p3C+DOT29 ifc1EpvAyTD/WXiOePJREI8LbJEmbXG5S+AaY1m7zGV/1qGT9cDr7rQUtUC3xFSloIii+D Eb2GQEV6ZDhamYp5j8E2c3yijaBME3e3dpq4tsdWKNEj2YxL44pR0KHvhHQLZNfm387RRj jEQnbk6iei0Lanr54NjuHuUBIg0DvW0LVEWvvthOlK3VJQTIcZaQSGHOLPSOPn6jyPq2Dt x7Sjh2cHvgeAR2ja/SHscvCSs/6+cd4/e7CKlvnSbCNTLJMXNPREluGUTLEcgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746033700; 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=yQk/io+FOeWlV5UVwc8MAAQeXzb5eoaBgaTZ4opoIEE=; b=ITaOYHmi3MCKgWw7sxL2NgI9QRcU//Q0wbgt4+1LxJ5SMNUY0Q5wX4VBi3xr0hupaodtY/ YipBzXcxbREwrUWx5LFB2wuGtUyGLIuH8ivLtrJTonwgWpHuCXQH1c9aD/JKOMhYMGYEol 9A1tcxxyJcxUIzzz1ccCWWGeXxYHPNR6rfeQxJCRjkVZId7K9HIe/rGgMIwKApW6n2Ln1W RymB2kz3xiSlYXssx4V+5DxfdNXf+U9n1GYZXzJRrPzGJJKoy7G/vERs8UKMypwPs5ExUp V5x70L7QkqN46L5yVk9fErLU+rmEQ8+y21lLG68v7k5Ll2rirBcDDP4fOmMVwQ== 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 4ZnkW83GMMzmG; Wed, 30 Apr 2025 17:21:40 +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 53UHLeSj094932; Wed, 30 Apr 2025 17:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UHLebf094929; Wed, 30 Apr 2025 17:21:40 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:21:40 GMT Message-Id: <202504301721.53UHLebf094929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 40089481d099 - stable/14 - mpi3mr: diag fault success beyond F000 fault code 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 40089481d099ab2cba79abdbe3a693b6151c49e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=40089481d099ab2cba79abdbe3a693b6151c49e2 commit 40089481d099ab2cba79abdbe3a693b6151c49e2 Author: Chandrakanth patil AuthorDate: 2024-03-19 06:47:57 +0000 Commit: Warner Losh CommitDate: 2025-04-30 17:05:51 +0000 mpi3mr: diag fault success beyond F000 fault code Accept any fault as successful for diagnostic fault reset, not just the 0xF000 code. print fault information and return. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D44426 (cherry picked from commit 4034d7061a112b78d60cdb581c2d71f7cfa9f74e) --- sys/dev/mpi3mr/mpi3mr.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/mpi3mr/mpi3mr.c b/sys/dev/mpi3mr/mpi3mr.c index 41981dce0c5f..f90fcff69f85 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -1404,14 +1404,10 @@ mpi3mr_soft_reset_success(U32 ioc_status, U32 ioc_config) static inline bool mpi3mr_diagfault_success(struct mpi3mr_softc *sc, U32 ioc_status) { - U32 fault; - if (!(ioc_status & MPI3_SYSIF_IOC_STATUS_FAULT)) return false; - fault = mpi3mr_regread(sc, MPI3_SYSIF_FAULT_OFFSET) & MPI3_SYSIF_FAULT_CODE_MASK; - if (fault == MPI3_SYSIF_FAULT_CODE_DIAG_FAULT_RESET) - return true; - return false; + mpi3mr_print_fault_info(sc); + return true; } /**