git: 40089481d099 - stable/14 - mpi3mr: diag fault success beyond F000 fault code
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Apr 2025 17:21:40 UTC
The branch stable/14 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=40089481d099ab2cba79abdbe3a693b6151c49e2
commit 40089481d099ab2cba79abdbe3a693b6151c49e2
Author: Chandrakanth patil <chandrakanth.patil@broadcom.com>
AuthorDate: 2024-03-19 06:47:57 +0000
Commit: Warner Losh <imp@FreeBSD.org>
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;
}
/**