From nobody Fri Jan 23 17:16:27 2026 X-Original-To: dev-commits-src-branches@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 4dyPjR3JZ8z6PVJ6 for ; Fri, 23 Jan 2026 17:16: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dyPjR2mkMz4Pgp for ; Fri, 23 Jan 2026 17:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188587; 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=gouWS13mRY30JLra7B3M1e5eQ9T6c6GCu+LqvGk6xbMzzl+4BCMQ9lFBBw9N20Jj6XsnQd spCa9XGRHpSAnWK4LKrW1bW8q2wYeYJ5XTga9oeXE3/M33pugkX6LTthnyqn2joI7x4ruT 8SIXmWYICED+gK1Ka6hTpiTLbe4u2gANwWm1rRmJqMzotl4j55C78vkkTpwBTzCHx5/rPf kCMJpvuWxPUQhboGQA7hrMipQ4Z5zDzhTZ1J3HDY5LYjgMXQN6k/FEfYBSnmoDpc81/9wb nijkRyRStv0itslAoaAa9n5Tnc9SJiy8SJYDLIrvxeLyYj6Y7KDJgrO9Cws+qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769188587; 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=e7A15NHfRYh1yJpTIDrWQubzDUSsUBpmGWhXfJuNtBSIOe0Q7j4kaj1vmdj/fWvpdCOvx+ GvTro1gJGX1ebxk9pZPx4Ul0YYjg2Wo4hEh2qeF9TixbB6XbQp9YD1ErDOiE5X1bdLoPDS boKw5EmTt2U0YkpYrkWQ7rx+Gdjgzqq7EnagoCN9t3qAc9QTkqmfSsUqv3/HGlesPu8pzS iYaDVGxZ8avzrpsr6SoqK7DX9njClyle7oK1PkMxokeWpa/oahtDWQ2TxX21ZqXDlskpsD c0NQFfEDSHfx2tVIpZJVB3FJIo1RKOhqdiw0pEbXlbTBgqGn7QAkhYPXzYg/cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769188587; a=rsa-sha256; cv=none; b=iBtq5upl5Zl0FTg7IRG4HX7TzcuIUEN6del6udQjvyUd57l8rQwcFyqlhdLMMKKu+E4+78 BffxwtSPTSm8E3BCo/SX1QccLzB33SbFdvzkC6NVv4tTLN2lJvr8EVNz6lulpOSuYAj1Uk kUy2xySqi20gF0eCpPhPa93bluxryuSAWokxrvvdLpnDP+m42eX5iF9uItRV+kQ6HmxNaf xHYrsN7e1QBBdkY8nFF5joLOyhj38LJ5fr0AFUZtg8sJ8pCUDUB1cj8ilaLRn9vaD6bJrO U+uSOGweYNP41yxa/u1Ekg9w2uAxK8bqLeAobznh0z0twlbFC4UiwFbLpoq6lA== 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 4dyPjR23XSzCJt for ; Fri, 23 Jan 2026 17:16:27 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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;