From nobody Mon Oct 14 05:40:54 2024 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 4XRmL04YSwz5ZChk; Mon, 14 Oct 2024 05:40:56 +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 4XRmKz2RqKz40dl; Mon, 14 Oct 2024 05:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728884455; 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=HyqpMOwdia1xf+cdRnVqizig1nan+vaj4UwM80sRipE=; b=QQ4JGmsVG/Ghx67kMu1L1g+dXO+N+mTnR8d8yySuDV5hlICeoDt6Q3/kzpR/6rY55l8zq3 KJCHIlR85AbunTKAbm9UJVEiYO34v3kpbRHuuOsLLBTNTqRNX75tnS1GjASJBb4TETvAJT qw19Nyp5/VmfGMlBDdcDKWmRgXjuYvqIg1zgdhOeWM59pH1XRdsEuzAGVsKBxqRBLHrTiW 6chDX6GuFg4/k4Ld84kAXYsZJEBUPPwDZyYBOfvOEIQVKoJzc8hf0o4OA8XDxYpQLi1JA3 tGKtffuGisnVaiH8OL5gFfHIvuBUx5PSjD6tcYTw3IJPAK9AcuXcbW575tQnSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728884455; 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=HyqpMOwdia1xf+cdRnVqizig1nan+vaj4UwM80sRipE=; b=SgK/EuBGi9w6JsWMNwJWRSbHd6FlVLE4ziN7sw8wwX9rFYwZV0uLrxoqyqYJL7G/f2NcUu WcSgPEHncreO35BaFaQinK06FCNdncreCiCfNjid1ZhNe2vH8/98hxRdeMNLjddivrMrRY VjcryHjOpcOujm+QLaueyBQbB3V3sWoqe0c7EzPEbE+rEfFRDymGAYXWCdIgOiNl168+lI GVxTGEJIWxKll1gme9fx8l8+4FTQeNOBUj+ta0E1K6JDC8JmYqWQC6BfPh8kwN6oS0v2Wc NmIIasEW4RQkMPNnQF7UKrxwrrTtv3Ngzr0mxKTzGJ+HazXxERjRT1GRZYaOiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728884455; a=rsa-sha256; cv=none; b=rDy3I2oUb5lrbCXSFvsCAeE2nKE+QvEkRt0kIC05+qYHqstcqrrr7KfbUkZM4wZW8/6Ut/ Ao9Qx/VzgO2iP0OZIxyqQV4qnmqOj8k7jgeLfI+52XaVzl96R1MMnEZj06p+5rd9zGwmP8 eFgXJLOiD7n1Sdx0G2eAe1ilLzyW51c536aA0q6sLBdj2G853woZSK7gOpZXTTWzK2dgEy OvEuaZzijND5I49qQUL5fqncvUauRbr9MH4s/fVByx+ZPzTX+dS1RhsSo1u8XECeEay4DS i1PMUOqjELfEOZrhv2j3qXuuEtBPRfEZHkeyqI9ThVx9FkTJkH2CBkAUb7TVrg== 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 4XRmKz16NSzQfn; Mon, 14 Oct 2024 05:40:55 +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 49E5esHS089450; Mon, 14 Oct 2024 05:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49E5eslI089447; Mon, 14 Oct 2024 05:40:54 GMT (envelope-from git) Date: Mon, 14 Oct 2024 05:40:54 GMT Message-Id: <202410140540.49E5eslI089447@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: d8b024673bbf - main - ciss: Report more errors at higher ciss_verbose levels 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: d8b024673bbfb32259030db7e54f043f3e471abe Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d8b024673bbfb32259030db7e54f043f3e471abe commit d8b024673bbfb32259030db7e54f043f3e471abe Author: Peter Eriksson AuthorDate: 2024-10-14 04:01:33 +0000 Commit: Warner Losh CommitDate: 2024-10-14 05:23:25 +0000 ciss: Report more errors at higher ciss_verbose levels Report more information on errors, including the the opcode. PR: 246279 Reviewed by: imp Tested by: Marek Zarychta Differential Revision: https://reviews.freebsd.org/D25155 --- sys/dev/ciss/ciss.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 168d1892e59d..69b3dcb97171 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -2360,10 +2360,13 @@ _ciss_report_request(struct ciss_request *cr, int *command_status, int *scsi_sta *scsi_status = -1; } } - if (bootverbose && ce->command_status != CISS_CMD_STATUS_DATA_UNDERRUN) - ciss_printf(cr->cr_sc, "command status 0x%x (%s) scsi status 0x%x\n", + if ((bootverbose || ciss_verbose > 3 || (ciss_verbose > 2 && ce->scsi_status != 0)) && + (ce->command_status != CISS_CMD_STATUS_DATA_UNDERRUN)) { + ciss_printf(cr->cr_sc, "command status 0x%x (%s) scsi status 0x%x (opcode 0x%02x)\n", ce->command_status, ciss_name_command_status(ce->command_status), - ce->scsi_status); + ce->scsi_status, + cc->cdb.cdb[0]); + } if (ce->command_status == CISS_CMD_STATUS_INVALID_COMMAND) { ciss_printf(cr->cr_sc, "invalid command, offense size %d at %d, value 0x%x, function %s\n", ce->additional_error_info.invalid_command.offense_size,