From nobody Wed Sep 23 18:07:28 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 4hqlL84x5Lz6tQWN for ; Wed, 23 Sep 2026 18:07:28 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hqlL84Q98z4nNV for ; Wed, 23 Sep 2026 18:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790186848; 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=cdsOC6grc0GympNPs4anIjxDZucFXMY/0X6TCVwu+wM=; b=OdUy3+xH6nCKoGYfSV9Zu64xZbf5m51EIzGE0cuoqTkjFKAI6aySGEzeFne1tJ3JN7LXsI 1TuB/TNfohCBp68xoRs0eMJhfTBnSV3kRylJG4buanOabqlF6MU6uSWb1GQk04PymmahLK LZXNb/FVLmHjUW7WSa7RGM3D9OLeRH9GOTp3PZ9ZBV5oIVG+gra68Eq2mToikIbPiF2H4W b6ksblrr5XwwXMcCmKlFGU5ikqdJl/vWGZ5jakacGBqcRIejT5PikSGsFX7M5qnqR9vIWr NETMgBhaQsrZK4BMn6JhQ/3A6aGmNjcretffZ6Mcpk8kkyy5MLCsCxE3qP/aoQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790186848; b=fDvQC/Eu6kssaMsXZcAtxlDhMvtMhSiSeScWXy5D9++vbzYlcmWUIJqAaEPdNA4jC+Dqju 7oriaLI3k5Q5y2tBRgyu6lxIh1Y0N8cBDHwF/gcbVqZ4lFcsb936rohrVjuvsaKzQObL1D EG6JkBtd5XLRE/aB8XZuUXh9UuMS9BdoOSFDhoX/HY4RNDK4b3kWFuf50vab5PJ/KyEFiH EdWMBCSZgrg78dw6xGYgmyW4yUEoV17r20YW7XwWmlWtME2CFiX6y3r6DyZ7tf1shCd6rk YFNE2gUYdXtxNj1z6TmuBEa3D1MUf5s2MVfV+zfMMfRaJ5fnsc3XR2JDTpAmVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790186848; 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=cdsOC6grc0GympNPs4anIjxDZucFXMY/0X6TCVwu+wM=; b=dIfJxyDe59jPmYoh1ucxcUVgI8rIsW+RhVf+qWDJS8QWuca09F1rFzdlIo87fv4EY3JVeZ 6qVxSAspWVR2RT/+6BbkyfCuHJgcraD36wR3jRUa8mtIdyZFs8ilEDRYgk2ivCps//LgwZ GKuAl7NS9/J4soQg5PWoex29qCqGvmkLJ1Tq4eSxvC0JDNC06lcus662n54RBouIMNTxrN irwcC/0bQE6//X0rVCrojeLBEwg3og2H2Vzow2ugcNtcHMo2deywSBGtYMYjqf2xxMO83H dof6IG57INkf/P9GbMNj9ybG2AntXQNARrnPOyZ0NONIC27/tIazT23jyG0IQw== 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 4hqlL83TzLz13km for ; Wed, 23 Sep 2026 18:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 201e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 23 Sep 2026 18:07:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: ad57f212665e - main - nvme: do not touch INTMS/INTMC when configured for MSI-X 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad57f212665e1642423afb83aef19e755833643f Auto-Submitted: auto-generated Date: Wed, 23 Sep 2026 18:07:28 +0000 Message-Id: <6ab41560.201e3.2fd877a5@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=ad57f212665e1642423afb83aef19e755833643f commit ad57f212665e1642423afb83aef19e755833643f Author: Abdelkader Boudih AuthorDate: 2026-09-23 18:01:57 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-23 18:01:57 +0000 nvme: do not touch INTMS/INTMC when configured for MSI-X The single-vector MSI-X fallback installs the shared interrupt handler, which masks interrupts through INTMS/INTMC around the completion poll. INTx and MSI are unaffected. Only MSI-X track the interrupt mode and skip un/masking Reviewed by: ngie, imp, adrian Differential Revision: https://reviews.freebsd.org/D59637 --- sys/dev/nvme/nvme_ctrlr.c | 7 +++++-- sys/dev/nvme/nvme_pci.c | 1 + sys/dev/nvme/nvme_private.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index a8d8d1b99647..6dba83708df4 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1405,9 +1405,12 @@ nvme_ctrlr_shared_handler(void *arg) { struct nvme_controller *ctrlr = arg; - nvme_mmio_write_4(ctrlr, intms, 1); + /* INTMS/INTMC are undefined when configured for MSI-X. */ + if (!ctrlr->is_msix) + nvme_mmio_write_4(ctrlr, intms, 1); nvme_ctrlr_poll(ctrlr); - nvme_mmio_write_4(ctrlr, intmc, 1); + if (!ctrlr->is_msix) + nvme_mmio_write_4(ctrlr, intmc, 1); } #define NVME_MAX_PAGES (int)(1024 / sizeof(vm_page_t)) diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index 8ea31850d09b..5d4fab3b2ab1 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -385,6 +385,7 @@ again: ctrlr->msi_count = 0; goto msi; } + ctrlr->is_msix = true; if (ctrlr->msi_count == 1) return (nvme_ctrlr_setup_shared(ctrlr, 1)); if (ctrlr->msi_count != num_vectors_requested) { diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index f96729608ed5..9bee1b23bd4e 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -257,6 +257,7 @@ struct nvme_controller { struct resource *msix_pba_resource; int msi_count; + bool is_msix; uint32_t enable_aborts; uint32_t num_io_queues;