From nobody Mon Mar 16 19:44:51 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 4fZQXh12R4z6VtKM for ; Mon, 16 Mar 2026 19:44: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 4fZQXg6QMtz43DB for ; Mon, 16 Mar 2026 19:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773690291; 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=RxbScjjP3gr1ByWtfJpckLlUb/uwhUNeMRqmuaUFvHM=; b=xi+RiNagcWJ3swP5x3s8IneoIjS9dwL7UKKCMfOY90f6+jhM4g3VN/5Fdy7H2n24OlxBch aN/4yOEZI1GM6TruW69dLbtYu7yhxOSuRKg3fiB09GR+PgHedsrxL6sDf+Hwi2Fxs/nwvJ av35aA9yyQJIi8nkoq4GQtNCo14mF4lnN6nUdjS7+3XkasyJKh2Ixq5qsZhwfDqFkmEqzL 4dbIPJCrmEk2V61i3WBG7/7JGu2I05OtfujAMZcB86j6krQU9Yz02HoM5TA6HjrUKpZJuL pZf7BMcVBS9trcW5hVJi9gjRyjkfRVSj1bypi6FpLDkoWPgyZCkFCgWFYiHGTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773690291; a=rsa-sha256; cv=none; b=hUKkCcfbOqBA66V7Dn++/ddAybQ4O95F74n/X8C4LF7y/N74h3VjAQXQ8ZZbQVqhA57IWu U8EgohtNrFmVe8672Z5lFBwbQgZ11Rc+21Dm7SJizWpITA0lhDiVpQvws9uH7FAc8xAo/n W5L5Utd57UAiSw59O4QsouXDfL5eqhCI3Ie04AfcrYUGgI1VYeTueBLVCUieHSd8lF64GQ mjWNa2HnDduQAdFHpCzYuUowU41mxJP1r0pMFVLHPGM2/lf0/nPURjzPaQBecjvAatndgJ nF94lWMrapwIXnJn3jyH5t7kjhULQaZ0IoZ0/kHNx5Hxzi2mlykObcPbO42hNA== 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=1773690291; 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=RxbScjjP3gr1ByWtfJpckLlUb/uwhUNeMRqmuaUFvHM=; b=Jf81kkyIOdI6Lq4Fi6nIcbdn4Ypu3ydEuHxCQaagWXvy/riHHVwxvJJhR4rpwT83SQXJL4 PUREHGxFJTBUv/g9beGuprPscJ2TTMv1EdY+9MUkeJt2605TiZUsjsVaeWfue5Fr0j6Tu0 5It8xtaRb28PW/clX8gxiXwjnEIgd08G3wqpt7n7Eh5dvAgeBhQevxhHXPyO+cHYJaeR0A 7QK8Dv7ZZN8aGNBQXwqVKSfszuPb+GsgTfWZmgUGPGmDOdPZBhq858ZcwSLL+fd5I41Jk9 gygCzuHL0MIUHTqJ7initNO68HTzrTLNZdmJZVvz4+itTHmhi680D9A5sI0blA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fZQXg56RLzqXY for ; Mon, 16 Mar 2026 19:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b481 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Mar 2026 19:44:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Matt Delco From: Alexander Ziaee Subject: git: 889d10d5b120 - main - nvme: Replace bus_space_[read|write]_4 with bus_[read|write]_4 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: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 889d10d5b12050b4b3923917b5edeac85e8ca706 Auto-Submitted: auto-generated Date: Mon, 16 Mar 2026 19:44:51 +0000 Message-Id: <69b85db3.3b481.6e88a0d@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=889d10d5b12050b4b3923917b5edeac85e8ca706 commit 889d10d5b12050b4b3923917b5edeac85e8ca706 Author: Matt Delco AuthorDate: 2026-03-10 20:12:56 +0000 Commit: Alexander Ziaee CommitDate: 2026-03-16 17:38:27 +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 --- 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 8b3b6855bb62..8be3887d835e 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 fa5a88844f92..55cba580d6ca 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 95c38fe2e39e..32c8cf91c1db 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; @@ -328,20 +326,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++; }