From nobody Thu Jun 06 10:39:26 2024 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 4Vw16R1WbWz5Mfnq; Thu, 06 Jun 2024 10:39:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vw16Q5HZYz4j9Q; Thu, 6 Jun 2024 10:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717670366; 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=ECfk9O9WO7B9KlAHmDMsYE/QeC65OdLdXQ7vjomHkfc=; b=rezL5fHQvRxyM23xD2oPfPRQe2YYSAB78J4YyEiHjMI0JTXFTPHsmG/FqauSovjS3jPCOu WKceokI2s6xlKacwefm/CAdNpRj7f/NobWv9lc6WrIuGs1Vce1C+FCRs0WHKGRP/BjhI6t eowbA5tTBrsFAnMjrXxKU2b52nPy/sKDPkzyncpGYC4Tf18vnz0B5GjdXISMyPW2DRh2VR Lw7Z2aY8JWwEc0gZ6uR3zYVKraEwWeswfiFjJ3WpQ0g591NVGm2zi4/ACYEfPRFeeEEAK0 bomvjlR/4w11r2C5mQOtYOhb5kKTg8cok8umfSgLw6JVBUR0rAyEP5KJ5DOdwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717670366; a=rsa-sha256; cv=none; b=kctin7OJx3w5buefrbP8gTWs2Rpqi3W7+OoBV5jFa94Taor7gm0Yw6HHYRIYH3lE64MDOD tlspXU/GJSVZnCxQUcypEpJg8NBc9i/35yYsV7K0JOR6I4mstN1hlS7Sv54CKPhGRMpRUI jAeJacV9tJuwuh5FOnZkjOUvr7BQyr4DOnOe2I1QuOd+nSdi2w5KgVfQ9eoKHRnMeIuOKE 2jfhuiGl0Acx4sauZUl1OblzCVDpAcBsBLyHAfcUyebx8vtGDABdvF4ipubavT/jUmx6dt 7hdkXRWUFtquI2UWemTs/YTuZyxE5EE37yu3P+bVCj+a3tPqBN2EcjOBLDdGyQ== 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=1717670366; 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=ECfk9O9WO7B9KlAHmDMsYE/QeC65OdLdXQ7vjomHkfc=; b=ibXsa+RbzEsjTbICi9Du9NtHwj40A+HAZKTGGp3qTFBy57jya4sQciWorH3uyEhML6NDOk vtz+raCLAFAsEWJzfAgas47LwFatgWbj+a2pQunpN3/skT13v6+o8D686rJIVdncwgiv7p MM2BmRBF4LyylB2odhpeq7TaULoTf4uJxd7Zqv6p6ybAIDDqtaw6XQltC51+zTZXfVKG33 IP86re8ideVrSaBOHlw8yFvaGqLD95ThIkoRyvNIVGClKmyJmVe2xkbV4sTEyO4QQQCpiB 5jUD+8YbX0bUDo2NHvI0RQnIN8qY2Jbb9XJLWXhdMNIDeG9GNnQ2uQEkUC/YVg== 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 4Vw16Q4qnfzjK0; Thu, 6 Jun 2024 10:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 456AdQ4S089811; Thu, 6 Jun 2024 10:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456AdQ6L089808; Thu, 6 Jun 2024 10:39:26 GMT (envelope-from git) Date: Thu, 6 Jun 2024 10:39:26 GMT Message-Id: <202406061039.456AdQ6L089808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 4034d7061a11 - main - 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: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4034d7061a112b78d60cdb581c2d71f7cfa9f74e Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=4034d7061a112b78d60cdb581c2d71f7cfa9f74e commit 4034d7061a112b78d60cdb581c2d71f7cfa9f74e Author: Chandrakanth patil AuthorDate: 2024-03-19 06:47:57 +0000 Commit: Sumit Saxena CommitDate: 2024-06-06 10:39:15 +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 --- 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 1adc19f49dea..916829f4a38f 100644 --- a/sys/dev/mpi3mr/mpi3mr.c +++ b/sys/dev/mpi3mr/mpi3mr.c @@ -1403,14 +1403,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; } /**