From nobody Mon Feb 9 19:29:42 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 4f8vsL5bLpz6RtlB for ; Mon, 09 Feb 2026 19:29:42 +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 4f8vsL4bvlz3JkM for ; Mon, 09 Feb 2026 19:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770665382; 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=fCeXkQNo8p/8Te1ZVJOyQ8OY1ymmmrDCZqo6sB1mv/g=; b=HTjUGRcI/n4JpX779iNrq1zi0j1Syh0wUHLQa9g1El1tSUgilTtk4S3zKvZlXk1I98zSlx VihO+SaYQ8OL5/uxJ1X1ZqxdpZB8QCRPDAmRFK/Gh4PrDihLhSpLCENL2dM2pcdcfa60e/ ri2At0JfqPs/78Tol9YPjOpXC6x68XyVLe6tEqo+PuLeC1XQCwqwk1qCj+IHmSiRjRNZSS GKN83JDG5+ROtATIhUFYPGumXGNFbcHf5et9o5Dg6K8HNNjqtuo90vh8nVm9tOYtC/CPN3 w8GE6C/M1xotJggTVHJv6qlvI5O6pct//2zEqF4bYfscE1xI93u1rn/xMIyksQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770665382; a=rsa-sha256; cv=none; b=nlxVuAtOaRhVr9KisXpvl+2fUfZomJLBtEz/wbzlcrBOnZjcwzw3GcwTrpcjdL1OxYRImu OiLL7tlYQtM2kqsjMvdtepBi0vX82o6fgnLV3t8wljg5W/eOk7f49Rm+FM2gkydaCzJtHn SvEujDl4v/tOVmSqfdapGP6my1C+73jcYeyWe5m6OeR7LeXBXiejqCckOMIRXp1nVbuGg4 zBhPfQUrRMX8Ph8vazR+rRsFjx+7KROn1Ra57CyCI7amPS4ijYUwBPJ8/GKEwvFq+TXJTe 6mzi3vDHyqN6fk0v96HYfPb+0hqYdUJrzUvIKgn22mEEr+1G21To3jWO9cey0g== 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=1770665382; 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=fCeXkQNo8p/8Te1ZVJOyQ8OY1ymmmrDCZqo6sB1mv/g=; b=qAyZiLsE34uIieA0koFIK66gs3ZmwpYyoHn9Qy8KZK77m7SZo9VixqkcckK12AmNHIsgxw 5MHN5tq1uVvXoAi74VFzlFeuVkjhpJb5NoTrOnrEZNbFf6GnUeQzCN2Hl+BvAQsdpgl9vm kib7DzQkSAv6OdKXAlAdPPp+d9MOXy+vlG1lO6vtdyVIU0mSa23Eat5N11xq9oQjAZhaMn LIPUFHS7qQaN33NpYexKZAP2cb13VnZcSwbpvavIUdIUwJ24bnLcmlUvsMpt5Dmr8n1+2T LLyPmjsGJZ2tOasg8d5ayhINmN6q6bb/LZEQBcCN5WlvTgFzSrcEE8RTJFE1Qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vsL3tD2zmKC for ; Mon, 09 Feb 2026 19:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3694e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:29:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: b9d3945831fc - main - 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/main X-Git-Reftype: branch X-Git-Commit: b9d3945831fc7a60f2065c7a0afc747dc5653c9f Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:29:42 +0000 Message-Id: <698a35a6.3694e.52bf02f9@gitrepo.freebsd.org> The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d3945831fc7a60f2065c7a0afc747dc5653c9f commit b9d3945831fc7a60f2065c7a0afc747dc5653c9f Author: Alexander Motin AuthorDate: 2026-02-09 19:23:26 +0000 Commit: Alexander Motin CommitDate: 2026-02-09 19:23:26 +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 --- 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 2b4cb37275a6..ed1b734f70be 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -523,7 +523,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);