From nobody Thu Jun 27 13:37:38 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 4W904L22tJz5Pk7v; Thu, 27 Jun 2024 13:37:38 +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 4W904L17V7z3xYp; Thu, 27 Jun 2024 13:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719495458; 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=wd3jjNWeKzU7FKryBGB21vbAMekqC0kLkKSRZubGXnQ=; b=RnQwFZM5VmPLGK7ebDGv/ps+VLD2VtH4IF+ZZPRS+qS9PQ6HXdUcIkm/dzBSqciViZ1DpI nhG6LKz44enhvUIIOigu2m8JBzJan5oeNUiayWTCwcTDef44I5ARvFB/cKSg4gLYzUEWw6 tfpGMX9K6M0+CK7jVPAvzvK2CBEtcG99+U+eTocNQTxNwO/Z5H5w7Kn+tOcohVcBuNHoi0 xtXQDpgUaTgpAoKvW7XWXQUheYSNlz6IUNVglUABJ2m8H8XJUXGxieCO/spjAoZfvIY4QT +MBZLBtrisZ7VBAgjrTirBViSnQbK3z2kZuNqmSD2ocCokXba0cLPPnkAbca6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719495458; a=rsa-sha256; cv=none; b=C+pbWL4Rseqjk9c3f1J8Zr8rLJoYhw3fT877K+UtubwoXtkGk1ah8xzwcQABuvScQOgyX2 Q/sIOixfzV/Fyr432rW+SLjg8O7VoyVGr78Wid0+ilgqY9dsJmkmbUZORyaAVsvbx7RA+r wKQvugLEltKMiik/F+vhAF3ObRacuA3U+vZzpsrTpGF53nWxNh+Faxb7a0E+rL6+5gczmL 8Utl4QSruSercGI1PuKHQZXwThvPBYwa1RSrDF0DraW2+2HMsQj+XmJEdic0NbJg0f2HkE g5g4Qwkjvdw2LjjwfJIg0RSC3dJy2xKXaBQ2ED/pNm/c1DX3cLTDgEjdeVJ4Sg== 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=1719495458; 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=wd3jjNWeKzU7FKryBGB21vbAMekqC0kLkKSRZubGXnQ=; b=m2da2tL1YcfWHhQqslqffv8gmUCnNsNj5oAK/T5uUENR7b6Gfb4B1LPhCdfpy4656XT5JF H6TYodaTChgCfz8xFEDQFPD6UCslabDP9X9J4WLtRmIt+nYjzEBQVwLSsjX20GDTuLPrUZ 3blngrva8tBbddmWwDbTXTEK1AdAI/rJNH0iRwshnFrfqxqsnllCkDpHQcve2Atj2tY6j/ uNdf/8vLiIsvJDEefp0YUzcvnviRcx6ge0hCaV+AEH/rnbqdqWTAHPbFYzZYHNbnPHdPKI 1VoG843cJhCLZBkxkI7r3tBD6nkprjrs/MPmo2d7ebr+6Tzl4u69rU4FGbqGBw== 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 4W904L0gZLzFMy; Thu, 27 Jun 2024 13:37:38 +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 45RDbcvE082754; Thu, 27 Jun 2024 13:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RDbcHn082751; Thu, 27 Jun 2024 13:37:38 GMT (envelope-from git) Date: Thu, 27 Jun 2024 13:37:38 GMT Message-Id: <202406271337.45RDbcHn082751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 87085c12ba8f - main - Fix SATA NCQ error recovery after 25375b1415 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87085c12ba8fa51f777bc636df67008b45e20d1c Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=87085c12ba8fa51f777bc636df67008b45e20d1c commit 87085c12ba8fa51f777bc636df67008b45e20d1c Author: Alexander Motin AuthorDate: 2024-06-27 13:29:23 +0000 Commit: Alexander Motin CommitDate: 2024-06-27 13:29:23 +0000 Fix SATA NCQ error recovery after 25375b1415 Since that commit ahci(4), siis(4) and mvs(4) drivers ended up using wrong command to fetch error information for NCQ commands. Since ATA errors are not very informative to begin with, the only noticeable effect is a lack of retries on those errors by CAM. MFC after: 1 week PR: 279978 --- sys/dev/ahci/ahci.c | 2 +- sys/dev/mvs/mvs.c | 2 +- sys/dev/siis/siis.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index b8cca377e47f..2910247d9327 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -2175,7 +2175,7 @@ completeall: } xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, ch->hold[i]->ccb_h.pinfo.priority); - if (ccb->ccb_h.func_code == XPT_ATA_IO) { + if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; ccb->ccb_h.func_code = XPT_ATA_IO; diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c index 253fdc096475..9677d16f088c 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -1798,7 +1798,7 @@ completeall: } xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, ch->hold[i]->ccb_h.pinfo.priority); - if (ccb->ccb_h.func_code == XPT_ATA_IO) { + if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; ccb->ccb_h.func_code = XPT_ATA_IO; diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index ad370c99f85e..e5b0b8b1f009 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -1394,7 +1394,7 @@ completeall: } xpt_setup_ccb(&ccb->ccb_h, ch->hold[i]->ccb_h.path, ch->hold[i]->ccb_h.pinfo.priority); - if (ccb->ccb_h.func_code == XPT_ATA_IO) { + if (ch->hold[i]->ccb_h.func_code == XPT_ATA_IO) { /* READ LOG */ ccb->ccb_h.recovery_type = RECOVERY_READ_LOG; ccb->ccb_h.func_code = XPT_ATA_IO;