From nobody Tue Dec 03 00:51:17 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 4Y2MXk0tNDz5fH3Q; Tue, 03 Dec 2024 00:51:18 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2MXj4BS7z4TQF; Tue, 3 Dec 2024 00:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187077; 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=/Xvj4LPJs/a+9amlqXtEkflpK1o54/z4wscT4LBU4gk=; b=iWdENm7fiT3GiOSQZjdTagz1imAQuCC86DaTD06B4BxAxQhay/zPD9foX0iYMqS2r16vZU /Pch+1yZK/0sz27YVL8FNJ48RfuHaSJPn5LcxJd2DTmX/Inx7O6mO1ilUAeWFsIou9U60+ OPfR3sXs0VfMrr8+czThnAYnqS6fO5Ybx4y6tv2logG2trh3hcel3Z1Gf5N9po46hxcUoB 1X0A7MdNGUB/hQkiwE56YP0I1N5wih2MVnpZuQtvmoGUaui5kr5UEvvu99YbncP/CpU7ny AXWb+f+iwRnerQJtjzwZAdFi6nx9NfZI/CYENbyQUnEUnUoaPdBjhpU5AZJCfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733187077; 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=/Xvj4LPJs/a+9amlqXtEkflpK1o54/z4wscT4LBU4gk=; b=GDOzJSnEwVwXr3hWTMsnkkNBXUJfZWM7Z7xjEkVVM/PcBoHZBD7XE9lpEjFneOEsqtu7QN Ohz0OTA4kV+JEUmJvgRJKujELkHD9ApW7Agix0LbtRYrpERFs26iuBy/4lU/jS5E0sLA1Z IKIq7aJjLHOdcRFrdFfb4Qe1Rp4anXHGOqt3xWvd8a9j51bkdDgaHdn7iw3vlRXOTjf+sv AIel4w2kQqCXm8EED21OJRL4X6CBnizMa11afIZYTvRIWXxEAM1N4/OnYScBnijoE64v+c 7U33QykWr3pQ6yj1zah0Xqg7ZwpfuZBXhQofHVZl5C0A83KM8r3McGIcZR8MRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733187077; a=rsa-sha256; cv=none; b=lKWU+4VlG6iAwvxT+Dv5IYoIizTZiUD/obam7TvA5kjkYrjeAFXZDCqsrKNJIzUzTWWCSi g8Iw9I3JAkMjR0Jzz8/GE7UdH0FuF5dfq8NzeLT8agi2c9ejIRLB6fIDv3ID5RNvPacq1P uoA5eqYcsU1ODJ6KEc+KESTyD8hLuJC3vHb+cH2LV3NbzXjjDmWk9fgyPzxyUPIvM69rr4 c9Nl3pRP5RbrjUQypoT07Dw5hxS9Rjz2nNoO+0HJfP1trmOabg8K1CgShL9xUcI1VbYOwp dXSdlIyqL3gsuBKdWAATDnDO+vdnEk5lMTvI3FtssLi3wxPJHM7wfR8o/nttag== 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 4Y2MXj3Kzdz11V3; Tue, 3 Dec 2024 00:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B30pHgx015913; Tue, 3 Dec 2024 00:51:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B30pHNH015909; Tue, 3 Dec 2024 00:51:17 GMT (envelope-from git) Date: Tue, 3 Dec 2024 00:51:17 GMT Message-Id: <202412030051.4B30pHNH015909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 18172439a303 - stable/14 - amdiommu: use static array for device table base register offsets 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 18172439a303d048e668c2fdae4249d37e223524 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=18172439a303d048e668c2fdae4249d37e223524 commit 18172439a303d048e668c2fdae4249d37e223524 Author: Jason A. Harmening AuthorDate: 2024-11-26 18:12:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-03 00:39:22 +0000 amdiommu: use static array for device table base register offsets (cherry picked from commit 31e796c86de08f48422a12a2b846876e93391a63) --- sys/x86/iommu/amd_drv.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 1d9d3b6b72ef..2ab0213925eb 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -224,10 +224,24 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) u_int devtbl_sz, dom, i, reclaimno, segnum_log, segnum, seg_sz; int error; + static const int devtab_base_regs[] = { + AMDIOMMU_DEVTAB_BASE, + AMDIOMMU_DEVTAB_S1_BASE, + AMDIOMMU_DEVTAB_S2_BASE, + AMDIOMMU_DEVTAB_S3_BASE, + AMDIOMMU_DEVTAB_S4_BASE, + AMDIOMMU_DEVTAB_S5_BASE, + AMDIOMMU_DEVTAB_S6_BASE, + AMDIOMMU_DEVTAB_S7_BASE + }; + segnum_log = (sc->efr & AMDIOMMU_EFR_DEVTBLSEG_MASK) >> AMDIOMMU_EFR_DEVTBLSEG_SHIFT; segnum = 1 << segnum_log; + KASSERT(segnum <= nitems(devtab_base_regs), + ("%s: unsupported devtab segment count %u", __func__, segnum)); + devtbl_sz = amdiommu_devtbl_sz(sc); seg_sz = devtbl_sz / segnum; sc->devtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL, atop(devtbl_sz), @@ -248,7 +262,6 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) for (i = 0; i < segnum; i++) { vm_page_t m; uint64_t rval; - u_int reg; for (reclaimno = 0; reclaimno < 3; reclaimno++) { VM_OBJECT_WLOCK(sc->devtbl_obj); @@ -276,9 +289,7 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) pmap_zero_page(m); pmap_qenter(seg_vaddr, &m, 1); } - reg = i == 0 ? AMDIOMMU_DEVTAB_BASE : AMDIOMMU_DEVTAB_S1_BASE + - ((i - 1) << 3); - amdiommu_write8(sc, reg, rval); + amdiommu_write8(sc, devtab_base_regs[i], rval); } return (0);