From nobody Mon Apr 13 19:54:51 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 4fvdRJ0wKnz6ZclL for ; Mon, 13 Apr 2026 19:54:52 +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 4fvdRH5GXnz3n1R for ; Mon, 13 Apr 2026 19:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776110091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpIomQos7jTnl3xHA8YFcJW5iKePsVzMtalkscCHLLg=; b=ZEEPV/OD0jPNGQYAWdV639yFmgYM/5LbuIsN6dA+17UC6bKZkR1wByZEgh8ntZIXBA+nHV eZ+5bWtW0NNaX5zOecd6yBoLE2aXISOH3TDvXsiiemZdAkDCkX7sLQ76ijw7drKR0jtBx6 BnPjmtkQjktQp+TxFjLB/d90SqMsiE0OXouSXpUj4pFxv2XEzwwpjr05Kks5/WWAj9LsYF Jwx03M897zyisOEWvdHQY5Hh81l7YWuVRI9CRukzh1Hw7o4Mbo4hGhVbPWKBO8Mlr9cHWx SlLFLQQ5RW1vudIg6Kg9RqrUeG8TKMZPuUyhjFfKxpxkDmJSkfUrj14jyi4msw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776110091; a=rsa-sha256; cv=none; b=kWzwmj0MptZ1UXGUCaGdSsdCrwKr3KMDfMAxBFBDuLd6610pqgOculy3Z+gFNhfU1VMZ5B tMICCGkhlwCk/0c5rbFRX3Tg3Az5XbSudaQ9TrdZtDrQakTX0+uhXo5GWAlqIB2DPSDntY G31wVggXNpEVwLBbL9wuoRnrH6UC10Jl+se49qzjyW7ORauclLS7UyE5QmpnxxkLBbQAVz aSKd+tmzHxg3GvFMiKx3NZ3VwRWIbgCXDrK5Ly7MkU/Jnpfo7i4KNB5iTwx2j7DXv9CJgX TfykFmwShJ1zXBi/wTzMYjcIlCtpWI0BAlzUWr5jbPNI8RHjwVfg6K+G8z7J2A== 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=1776110091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpIomQos7jTnl3xHA8YFcJW5iKePsVzMtalkscCHLLg=; b=cZOAXaTDMP7UHCgLRTHNSXwcyuzQguMsHnGB+j4HphayKm/cpDPpzpHymjOuMDGn+yzyr8 fYid49Gz5Qo2fvxMGQmH16QcPRTmP9vUz2FSwsa/yqcecEqANBBOZYb/WZeGUlXy66aBKh DqU8sn7RNSTUVeyvGwmzJHgMkgs+BhFXNDS81Jo5M5ZeOTTMYZUZSgWBp7gKTcAFZwnhlc OiFp6KIWVYCOC7AcEF5JBQ3FC3nUvJt5gys7oG9uVC97Znc58JvZAwGKBt166VXac7K5bI FsiRozkO+ZfGLJdNJv8lSTLMKb618Av5GAPzKwwiM8sLeB5nf9QjlRe8mgSgvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvdRH4r0Fz2Ng for ; Mon, 13 Apr 2026 19:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41ed9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 13 Apr 2026 19:54:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Matt Delco From: Alexander Ziaee Subject: git: b8429aca4cf7 - stable/15 - nvme: Replace bus_space_[read|write]_4 with bus_[read|write]_4 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b8429aca4cf7fae6b88e3bc1aa7309c8b79557c5 Auto-Submitted: auto-generated Date: Mon, 13 Apr 2026 19:54:51 +0000 Message-Id: <69dd4a0b.41ed9.a703c36@gitrepo.freebsd.org> The branch stable/15 has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=b8429aca4cf7fae6b88e3bc1aa7309c8b79557c5 commit b8429aca4cf7fae6b88e3bc1aa7309c8b79557c5 Author: Matt Delco AuthorDate: 2026-03-10 20:12:56 +0000 Commit: Alexander Ziaee CommitDate: 2026-04-13 19:54:16 +0000 nvme: Replace bus_space_[read|write]_4 with bus_[read|write]_4 The goal this change is to remove the use of the tag and handle needed by bus_space_[read|write]_4. Fixes: b3d9e5013f3e5 (Don't active memory space) Requested by: jhb Reviewed by: gallatin, imp, jhb, jrtc27 Differential Revision: https://reviews.freebsd.org/D55818 (cherry picked from commit 889d10d5b12050b4b3923917b5edeac85e8ca706) --- sys/dev/nvme/nvme_ahci.c | 2 -- sys/dev/nvme/nvme_pci.c | 3 --- sys/dev/nvme/nvme_private.h | 17 ++++++----------- sys/dev/nvme/nvme_qpair.c | 7 +++---- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c index dd005dd868de..f85826db43b9 100644 --- a/sys/dev/nvme/nvme_ahci.c +++ b/sys/dev/nvme/nvme_ahci.c @@ -77,8 +77,6 @@ nvme_ahci_attach(device_t dev) ret = ENOMEM; goto bad; } - ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); - ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); /* Allocate and setup IRQ */ ctrlr->rid = 0; diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index f2b9465294f6..143adfda7322 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -223,9 +223,6 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) } } - ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); - ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); - return (0); } diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 9cfe9c32b360..d499c6f34ca8 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -225,8 +225,6 @@ struct nvme_controller { #define QUIRK_INTEL_ALIGNMENT 4 /* Pre NVMe 1.3 performance alignment */ #define QUIRK_AHCI 8 /* Attached via AHCI redirect */ - bus_space_tag_t bus_tag; - bus_space_handle_t bus_handle; int resource_id; struct resource *resource; @@ -331,20 +329,17 @@ struct nvme_controller { offsetof(struct nvme_registers, reg) #define nvme_mmio_read_4(sc, reg) \ - bus_space_read_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg)) + bus_read_4((sc)->resource, nvme_mmio_offsetof(reg)) #define nvme_mmio_write_4(sc, reg, val) \ - bus_space_write_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg), val) + bus_write_4((sc)->resource, nvme_mmio_offsetof(reg), val) #define nvme_mmio_write_8(sc, reg, val) \ do { \ - bus_space_write_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg), val & 0xFFFFFFFF); \ - bus_space_write_4((sc)->bus_tag, (sc)->bus_handle, \ - nvme_mmio_offsetof(reg)+4, \ - (val & 0xFFFFFFFF00000000ULL) >> 32); \ + bus_write_4((sc)->resource, nvme_mmio_offsetof(reg), \ + (val) & 0xFFFFFFFF); \ + bus_write_4((sc)->resource, nvme_mmio_offsetof(reg) + 4, \ + ((val) & 0xFFFFFFFF00000000ULL) >> 32); \ } while (0); #define nvme_printf(ctrlr, fmt, args...) \ diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index f7dc231d74df..e31bf818ed35 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -476,8 +476,8 @@ _nvme_qpair_process_completions(struct nvme_qpair *qpair) } if (done) { - bus_space_write_4(qpair->ctrlr->bus_tag, qpair->ctrlr->bus_handle, - qpair->cq_hdbl_off, qpair->cq_head); + bus_write_4(qpair->ctrlr->resource, qpair->cq_hdbl_off, + qpair->cq_head); } return (done); @@ -1068,8 +1068,7 @@ nvme_qpair_submit_tracker(struct nvme_qpair *qpair, struct nvme_tracker *tr) bus_dmamap_sync(qpair->dma_tag, qpair->queuemem_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - bus_space_write_4(ctrlr->bus_tag, ctrlr->bus_handle, - qpair->sq_tdbl_off, qpair->sq_tail); + bus_write_4(ctrlr->resource, qpair->sq_tdbl_off, qpair->sq_tail); qpair->num_cmds++; }