From nobody Mon Apr 08 19:04:36 2024 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 4VCz6Y1hYfz5HYmN; Mon, 8 Apr 2024 19:04:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VCz6X5mJkz4gZp; Mon, 8 Apr 2024 19:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603076; 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=+KA3Fe/fYWAD5Oy1WdXCpMw23L6Cn9C4e3wdo5eXRCs=; b=fujiPBfxOtC36wOpPkwZdhIM3CXA6EsNztd0yB8L6EMhJugY7ojiTBgOGz0BmoTsJIbqDB 9wSOy6EqdwNmb3kLJ+5rYmZN+mtTMVTTf6e7UqEuY6txr2wLbtjFsIYOjwQtLQYQEowgUz dfPdTdh6PG+9aL/cxNHAcE2SpXzQaC6EnmZKBBqwAoG38J+dcIgrV38H6kJoS9EIeMRYg/ rDDls4RCuoD0qiF8z1HyBKxQhTGHWZeJt4E0xTeww1vwJhoSO4rcld9zpVgtuh/CSQhUno ABZSOq2cKCbstIDSLQbTZO+RXhd4gQ5IfiZMQ4Xb1wMW1HF//YenVRNOBrJm4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603076; a=rsa-sha256; cv=none; b=rSop9PLylGQ6wA4JEmu6g48eDOhjsijB5C8odU8NVnP0s/vXOImzMnJc22s3yDyrMJk5RG cN07DlHRA7k9KjIhcyMV1Yj01XY3ZcT5X2TTCXXWOsEpyOIFVkTRUsmnAKWQ2YQ121uwvA WyqQxFIjICVf+GbHrQC1aM2oPFQrSxhs6EmuOhfuUp3zOKcB2VvlLViGBvAzG/PUr3ecN/ kdnpEUeCCTlmrNuaR+DwQZDqKmWcat9wu5+OYPeUJ/KETpdpqREDHhhgxeL5iQAMboJZth j6EaQ+APNspBhcTip8B6TLlO4CXN0jaxbh+AJQgbQV9h/boDwXsbH0q9ZrjzBA== 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=1712603076; 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=+KA3Fe/fYWAD5Oy1WdXCpMw23L6Cn9C4e3wdo5eXRCs=; b=cE6iWbF+rlDDmQwkUTbZ5MV5+XogXG1Dk1U9mOIgGfXmi4jL2io5cfBuzFpMEvD+4o/w5Y jf7UoFD6ta65IxVevOicJ3enLYENbVHokIBQnh7wwJLzGKsRo2VlYBxF4MrTNZgrvMDl0y yaFSFuDlRCvhqWn/oh1cyrQ9Gs3scFYRAVS8tMfAFNURKChEdFVXSJQVVBPF48QbBTW/Zv oBVYFwrsB+O+pU0+U7cJsR5Csq+crSlIt7ynziKDN/snh1al3h52aFbKCAjbCLA1LwZd7X PjzIM/wIH+iVq+G17NAOdLbYIvoGrIzjzWeMrCYRz6O++I7T9gbqPG8Kc1unBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VCz6X53zhzNfM; Mon, 8 Apr 2024 19:04:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 438J4aLk094609; Mon, 8 Apr 2024 19:04:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4aaK094606; Mon, 8 Apr 2024 19:04:36 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:36 GMT Message-Id: <202404081904.438J4aaK094606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 00907525212d - stable/14 - vmd: Use bus_read/write_* instead of bus_space_read/write_* 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00907525212d3cbac7f0ad7ea1ed6f65ce0e05aa Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=00907525212d3cbac7f0ad7ea1ed6f65ce0e05aa commit 00907525212d3cbac7f0ad7ea1ed6f65ce0e05aa Author: John Baldwin AuthorDate: 2024-02-15 20:26:19 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:57:24 +0000 vmd: Use bus_read/write_* instead of bus_space_read/write_* Using an explicit bus space tag and handle is deprecated. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43885 (cherry picked from commit 76c678688634e9e2ea5f6369fb979aabddbfe426) --- sys/dev/vmd/vmd.c | 21 ++++++--------------- sys/dev/vmd/vmd.h | 2 -- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/sys/dev/vmd/vmd.c b/sys/dev/vmd/vmd.c index 395b789fdff4..7fc045032dc6 100644 --- a/sys/dev/vmd/vmd.c +++ b/sys/dev/vmd/vmd.c @@ -185,14 +185,11 @@ vmd_read_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, int width) switch (width) { case 4: - return (bus_space_read_4(sc->vmd_btag, sc->vmd_bhandle, - offset)); + return (bus_read_4(sc->vmd_regs_res[0], offset)); case 2: - return (bus_space_read_2(sc->vmd_btag, sc->vmd_bhandle, - offset)); + return (bus_read_2(sc->vmd_regs_res[0], offset)); case 1: - return (bus_space_read_1(sc->vmd_btag, sc->vmd_bhandle, - offset)); + return (bus_read_1(sc->vmd_regs_res[0], offset)); default: __assert_unreachable(); return (0xffffffff); @@ -214,14 +211,11 @@ vmd_write_config(device_t dev, u_int b, u_int s, u_int f, u_int reg, switch (width) { case 4: - return (bus_space_write_4(sc->vmd_btag, sc->vmd_bhandle, - offset, val)); + return (bus_write_4(sc->vmd_regs_res[0], offset, val)); case 2: - return (bus_space_write_2(sc->vmd_btag, sc->vmd_bhandle, - offset, val)); + return (bus_write_2(sc->vmd_regs_res[0], offset, val)); case 1: - return (bus_space_write_1(sc->vmd_btag, sc->vmd_bhandle, - offset, val)); + return (bus_write_1(sc->vmd_regs_res[0], offset, val)); default: __assert_unreachable(); } @@ -283,9 +277,6 @@ vmd_attach(device_t dev) } } - sc->vmd_btag = rman_get_bustag(sc->vmd_regs_res[0]); - sc->vmd_bhandle = rman_get_bushandle(sc->vmd_regs_res[0]); - vid = pci_get_vendor(dev); did = pci_get_device(dev); for (t = vmd_devs; t->vmd_name != NULL; t++) { diff --git a/sys/dev/vmd/vmd.h b/sys/dev/vmd/vmd.h index a8156ba88a17..2ab943c07a6d 100644 --- a/sys/dev/vmd/vmd.h +++ b/sys/dev/vmd/vmd.h @@ -53,8 +53,6 @@ struct vmd_softc { #define VMD_MAX_BAR 3 int vmd_regs_rid[VMD_MAX_BAR]; struct resource *vmd_regs_res[VMD_MAX_BAR]; - bus_space_handle_t vmd_bhandle; - bus_space_tag_t vmd_btag; struct vmd_irq *vmd_irq; LIST_HEAD(,vmd_irq_user) vmd_users; int vmd_fist_vector;