From nobody Fri Jan 23 17:16:27 2026 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 4dyPjX3bj9z6PVG9 for ; Fri, 23 Jan 2026 17:16:32 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyPjX2Y0wz4PSr for ; Fri, 23 Jan 2026 17:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hifESEqc+sa4SFsMtmoraxOOxHc53XcvEmmO3QnFu+E=; b=K1BxwlQFHu1dhN7YoDa978ksUYfo40TPQ83qQW0cj2qoYZFqBqWkOxT7dhWqq/uvb6a1O2 pJVZFO3Jej5FnKwqrZMDD8swuDBDW2+VzROS23V2s/A5ph8sttNWTstuenn/d82XM9G7w1 3k5zNQkdeS+aH4oaH5OlBWvIc5RTmoeCumLQw5M0D8IULtLooJ/zcX7tfDOEqB02zFbiJl SrlZOeLlRMpBLxJ3C+pOnXwICoi0chkPmP+vTTiiAkc6aYukmhWtP1A+p1no+UDWicodHX FxeF6CAg9o/UgR/lfmpUursVzypOFK1McZO05eI2AkOS/P4ldEHquCwo8bimKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hifESEqc+sa4SFsMtmoraxOOxHc53XcvEmmO3QnFu+E=; b=LerWcK+kbW05UJtqzvwZKz+OLdZa+N8seQ68ZGA9+vybl5yDqpc659/3i9M1eNyeS/3NnE GutbfXmTnLhT7Bn7o8TZJQbXCVtPXFNZr5mS/X8z5tdRn4bRXqp8l1OM795tyUH/RQ2/wi PTH/ZoNHAFIie0l/Qeg5A3TpoyVyzfMYNjZbwaC07FJqtPVklR+m1iqMMldBlB4T9yd6Fr 0ep3ptS0hyc/Og/OmH2x6lDYpASdnslaUp/ldsG8mo2+VCPt0fr24cVKhAEMv0RMjpBPm5 oPY6rrm2CicO55wTJpTmUxisVD4BWUlNuG2ONONr/67vuLjZplENaaiAo0d5Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769188592; a=rsa-sha256; cv=none; b=InPZu38uJ6jbBQ4iSq3h7pOTTfNP0itSljLxAfCg9ps5pKlnjXiXoVnnkjzP/NeotyqCHC MYReh2zhcEatS/UueYLCgIg4nYXNh6gkA+V9kZ95yTPMbJdAZW8RN41E8ko7O67MkrAUD2 k3Fb8IAGRk0NIapB/wvQwYF0J/J2KS0yctwr8n/gGNzhdPOJ/DtLpVsLOAnjfow6no5Ypz le3925rGexsf3Wv2KcKzFLsD6zIRehJ0A4frXtcw7jI04/QHluQM8VLKZ7vu+cIjh2J7BK uapw7HgJowWOwQQNmxpFpoc3A/49338DDllSRHEKb5JUUe3Ld7XZmLpM0reGMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dyPjX1sr1zCJv for ; Fri, 23 Jan 2026 17:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 23 Jan 2026 17:16:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Motin From: Mark Johnston Subject: git: 6abefcdd2585 - stable/14 - 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6abefcdd2585019bda24dddeab49040ee39f4079 Auto-Submitted: auto-generated Date: Fri, 23 Jan 2026 17:16:27 +0000 Message-Id: <6973aceb.38212.6d23604f@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6abefcdd2585019bda24dddeab49040ee39f4079 commit 6abefcdd2585019bda24dddeab49040ee39f4079 Author: Alexander Motin AuthorDate: 2024-06-27 13:29:23 +0000 Commit: Mark Johnston CommitDate: 2026-01-23 17:12:50 +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 (cherry picked from commit 87085c12ba8fa51f777bc636df67008b45e20d1c) --- 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 80cbdefd1e29..f9a44f93c26f 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -2177,7 +2177,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 21e0984342d0..0c4c36d001ec 100644 --- a/sys/dev/mvs/mvs.c +++ b/sys/dev/mvs/mvs.c @@ -1799,7 +1799,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 1e5fd5648c2d..372b3ca8a380 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -1396,7 +1396,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;