From nobody Tue Feb 24 21:45:02 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 4fLB8Z64Hlz6T24Y for ; Tue, 24 Feb 2026 21:45:02 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fLB8Z5GpTz42rt for ; Tue, 24 Feb 2026 21:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771969502; 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=p9H8ukiA9tLvlj5KsAbBCAlgnk3Z28/t4KJOet9r+7A=; b=tImJLIu4ozX0MTf6vV7uMLYVLgp6f61D8w+X8Va3Bjn+4t7ARuVBZM8JRsabf/k/RzN4dO 9xNT+n9ATdjSwXhZfhVkFIYjdPvBSRf7fNVaFcrKM2ufb2OZJPn8eGAw/7F3NV4HMLh47S k3C5zeWpg1EAkRv71txOnsOzHES7v8HeS2aEP5TZska7wDdhzHQPzUFKOqE6XbLVPgpTxv BA3DpIyz1/CmSMivtvTXc7+m9+hA+iyNND94A043Tsqhpq6ns26QFH92EkYc7NcSIKYzSY aaD35cdP97NUltpIrs5L2LeX9orFW2ehGk6FtnJiCZVN+V6JN0fvp0U43ptZEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771969502; a=rsa-sha256; cv=none; b=mOGb06PU+aGKOIRgCIi7h9Ercdd0WuShJ0l4oIUDQfzjxixYCBICQuDUdME/oWPWb/TzLI UppgGWpc51I4gadpVQvg6ZSRjHp9tQPBBJyW9w2b1MSr8K2qnYbgu/YyycSbKJuclRzR3Z rxrGa4Kf+1h1Rrho4X7mauSXLKKgZz6Hip9Ua0Q21yxZJe3UaO8ufStdh7rLx040hamEDH 3W7RE7NbYIQigvoafueFz92mBNeUqVFu40yBdNNIQYrDKPmoWWK0j26GUjUmJmKR90+M4u j8nFwmZPs6qlBlOEwnUd4CjG/FlrdUOJ6vWo5ZAOk5GkEOh658K2JizzhSVj5Q== 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=1771969502; 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=p9H8ukiA9tLvlj5KsAbBCAlgnk3Z28/t4KJOet9r+7A=; b=M0Lf5WXqx7fNxU/ufDQtJ/Bmfx9VnPzXT/gaawxLOg1w7tC/zf4WylDCKZ0sNKp9wwKu5t l1a+5egyep991DJqzbropGm4kJDr7+mRkuNvuX/vI5lNq5sVhO8U9aL2gLHSPG4lJRI+Az pEwJY6BOMnhJ/gY6D0u4TbvnrzWQb+DhRziOATW+EIPPRJulXjpLaCDlrGrgFHJF27WZG3 YxvATqAfdmFLYa41HrDkNw7/9zQ1Vzz7VWmR+tpp012HDAvL4GFlLxlegJxo1iAAMXhmCX zfld0wIRUTAs1Y5FZELNdRgT2xIJgO8vEVWiOvVT+kHeKYNa1zqUBOUimCel6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLB8Z4c5kzZHQ for ; Tue, 24 Feb 2026 21:45:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32bb9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 21:45:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: aabd5243fb97 - stable/14 - ahci: Restrict NVMe redirection by BAR size 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: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aabd5243fb97979d33a7eece4f7cca18ffd82a95 Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 21:45:02 +0000 Message-Id: <699e1bde.32bb9.731a65b1@gitrepo.freebsd.org> The branch stable/14 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=aabd5243fb97979d33a7eece4f7cca18ffd82a95 commit aabd5243fb97979d33a7eece4f7cca18ffd82a95 Author: Alexander Motin AuthorDate: 2026-02-09 19:23:26 +0000 Commit: Alexander Motin CommitDate: 2026-02-24 21:43:36 +0000 ahci: Restrict NVMe redirection by BAR size Attempts to access vendor-specific registers on emulator of older Intel hardware was reported to confuse one. Since the redirection obviously require BAR size bigger than normal 2KB of AHCI, add the condition, similar to what Linux is doing. Requested by: kib MFC after: 2 weeks (cherry picked from commit b9d3945831fc7a60f2065c7a0afc747dc5653c9f) --- sys/dev/ahci/ahci_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 3de1f6a79ef5..d708951efb05 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -520,7 +520,8 @@ ahci_pci_attach(device_t dev) * here, or the user has to change the mode in the BIOS * from RST to AHCI. */ - if (pci_get_vendor(dev) == 0x8086) { + if (pci_get_vendor(dev) == 0x8086 && + rman_get_size(ctlr->r_mem) >= 512 * 1024) { uint32_t vscap; vscap = ATA_INL(ctlr->r_mem, AHCI_VSCAP);