From nobody Tue Feb 24 21:45:02 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 4fLB8j0Mb6z6T2XM for ; Tue, 24 Feb 2026 21:45:09 +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 4fLB8g65SDz435L for ; Tue, 24 Feb 2026 21:45:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771969507; 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=Ff0DZqJrnkQbLyrXNxb/bmrvLJh1th1701AlFrhLyKRjuejfGLxf3/E/B2hgtZDaiZMKEk eP5SQ+CYmEoxdveCeEqV5IssVYUOkpwxpV4OKsm0hj1kLZ8cUQISm3272w59MXjeU+JCx6 4cOlJtUJmhbK0HzfXFP3yPcrZctN9+JGmuNdKgD5N38uuSz7uUOUC/ftD/F5SVaoxbWwKY /mQy8wG6F5lkY2sE/uCBptJg1oYy6XCh1IupAKmbLrfI5wukMEnk1G3+wD70QvHhhp4TTd HVbgcoJ+yYyzS1YKpN/VwDTTaw7Pjk1bk3UwBJrGB7WWiAKfhVPSTc4SdDGqbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771969507; a=rsa-sha256; cv=none; b=g5mgs9hLVkRWFZ8gjFm/6UeD0efIPZ2qfKg/96txxcBhZdcG1/6ZvCrxCjSO1KqCztl7HJ rCXDGXErWU7mCyHj1dB7iPvMtY7zV2QvZijuiPRGemNd0uUxsUz5WWswjdH+Fdmub29ttY spogoUtZldt8iUVFY6gTaayOvyIB4TE7/ZEifuI7NETt3w2z8SF10e594MPjly86E01KDs JhexpXNeiqzG368a23U1Pn5Ou2wQ2tU0X2d0H+0N9ueI3gkDv0gUTFojFGZ72DFkIbjiKg MkIG8xjTSrcf+qcH7KPtfFCknZMY6IZnlwzXvfYue1NE4W9q4yYlir6OmTAqDg== 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=1771969507; 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=MewV4c3meEd/V4VU6/07gwj4V2TpGMaYNrS86V6MwsHU6vVRZ4Aq8KCt4LGrHHMJ/QUSUB 6CMVsNOYQ36haQN+rTWg3KNA+zcsd3H0pg+HypaZGgzAcKleiYfUGFfWSoExmETbUAFDp6 rftuc+1wnoPfCw38XyQtrQeO4zxrqz777x8f3FEQOwXrEbtBzmH64rDgJWvOpi3xjt1f/h 0ELL38kK+LsdXYdLiEu+O6i9j6SNMdYv5yB6lbQ3cPMfL0mg2idQ32qpd2/fMcaTUaDS79 2SYl+OgF3u6qJfR8N4uNwAG9tHTrF8srJAoovpFe/zSVUsR9eri57Cz+UnBaPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLB8g5Mw6zZlB for ; Tue, 24 Feb 2026 21:45:07 +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: 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/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);