From nobody Mon Feb 9 19:29:42 2026 X-Original-To: dev-commits-src-main@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 4f8vsR6P7Hz6RtvN for ; Mon, 09 Feb 2026 19:29:47 +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 4f8vsR4T2lz3Jlg for ; Mon, 09 Feb 2026 19:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770665387; 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=VgQs6Nc/T7sibZ483J05nuD4m9OANwodjQMFwWj6Jdzob8rt5hUQ6JSj/xLuqcPKwYmm37 UBA1vDaQtidGOIcOjWqNOJmsVaRILrMGrFEi3PTpcQQUzkJntgl7GcJNCyvamhfFCsZBiq P/5gPXV5bCihLr0trAZoySEt3I8cuSsCbWV+9bN/sXL7L12R2Gtdu9f5QZtuRFqKrK13M1 xFyXpn6lMUrXIjGYx8IjFx2tpRpvoQvqUQDaT4WkTF77shuQNQBs+9YUBty60IGLYBgpeE RnjYlR5Zh8YHS0bHgx8BQBmRzOZipFrKf1EdgJiGLW0iC6zd16psCnKvZSRKfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770665387; a=rsa-sha256; cv=none; b=PXnppITeCSDGvKjm1MHfoF8z/pmKRbcBpgVcG6hwOeaNjmtz9V6vVCe6tEihJpfuV+XD0u Vx5+whj/0Kj5VGrAqH2Yrn5FU9mzU5Iqjv9uHfUU2KOSNqqz/IQUh3edJF1sCHFfyyVNWr PNZPu1iBOFudedbhNoEoqVaIiHH7Av4CA3BayQCuX9/g7upsAXm2Xa5/LJXIBCj6PqksFL EQEYiB1sJAljIoDTUBd3AArSmLLu2zO9BWN+6UqcEYDSXtzbvVYpZxfOvBtNqwp03pUVWv XEb2UHMvyolaP44HBhPRDk5x6KlzRWvbZx5C3pqACxzcXq5V1ZEtV7Vs+24A5A== 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=1770665387; 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=kGQNJvTEHx9Q/mbIFkODAYNVNf30TacjOtz/wlD9C3HeIS6Pl01l05lh8ET5HxCgYnu9oE SEI5SsCdtnf5CaXftM9FwNemHtzKrGzDvLoNnH/PxP4QIscWoukv67xx1vtN4APKIfqyAe Zu69VJfeMTUFmO2SGQttYaJJ5YIH7yfZKAou2pv7YJlyLTZAG38ZQXcbMAGWzXITYcACJi CAyRXu2TQfMyAywZKm5eaPNyWKajCZNDFYbNFai9+yd9OeNcLqJjafDJnuyJWG4k/eTQED UafYSnxU1oDO0aECwLwsEIx5qBXYa5xP85WS5+RNpgrK34G6EhBfgcUT60JwNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vsR3wxYzmXZ for ; Mon, 09 Feb 2026 19:29:47 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);