From nobody Tue Nov 26 20:16:02 2024 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 4XyYjt42tdz5dxlJ; Tue, 26 Nov 2024 20:16:02 +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 4XyYjt3XL4z43qP; Tue, 26 Nov 2024 20:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732652162; 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=3o4uCMzYiYWXSH+yNqyAAmtpBkrzP8H/CtzjdY5fSUk=; b=feuVEMsud/mdIzMRmmuSggk+OHpgxI8lSWvlBoB5A7GCgd8sNn6f4Rf0OsrBiaxXvgf5eA FQ0mHtmU6TQ9WpU1VTioJRZTBEZwayIsUVOKn9E7OtRCP+D6TnOghamjNR+/5gH3yRL+5T 0c6H3gEHgMXuxYbnkPNKdJUVyR2c4TAUOF3Hy3dF5d/76muQ5sNtJPQg0LfI5RkHIlISdY qGjHy9hofDwf4Ob5ig9tAyfmQPGFiazLlb+hWCRHSjs1tKblrbdEhREQmXgB5DZhm4MmZw TR0iODoizWVNAaL/h29/2NJZgQxf1QH+2YKiRke5OB/ynIl6o3K3/QNeFuoa1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732652162; 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=3o4uCMzYiYWXSH+yNqyAAmtpBkrzP8H/CtzjdY5fSUk=; b=kmKitJfhFQbRfk4ND/vFNOeFSyvH/Tiz/ro+gHZobFQeZfZYXlsp0Y8eqSncph1EY+zX0Y pIEIKMhzgWZAHziaEmcj0tXoVlrFpnbiM7m0XWgBJDfc8kdZQAAousJTsDGr0a4x81/aV9 SYwIlXId4X6xUOecRvW+84zPU3XFEshiVxPCPsTWsezCCgFk1TcdljpAuacxoK+BlRF1Q+ w5GqQtrsVY/Wu+EmHm21sI+TtknGhWQQe5V/s/ksajfEMqwoRL25bdBYShfJnjMcMLo9Oy r1JOFntGlK0W9JHmSVEMJ3lZyrzE5SXmkh2p/wWioOGgUfpILEGTcy+scDfAzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732652162; a=rsa-sha256; cv=none; b=eUya/er29+j6X39RSHLjase6Pp4fMEe77UOl1jgx7CMzdm6x8uiEKlT+dUl9iB0/h87it+ nJOh5PDguza9CGQ6CDJ7XOWd6KSbWWLAg1eUbC4QTbZm6sLwJOzh31dRqelP6iJOPjJngF rIgs0Lq445VRTjRXBOcqQECgX7v1I3w08WoK7a5aPFI5leIp3K7qRiE1tcBBr5NvDjZfeB 2lQx8HNIavcLiqG2tR9rsxkDIc1r3NyYRvo+J3QweoraOZAG9ShtfjxqIbydbEJ09FOxAP z3sM4Tj45QgQr5z7SIsKX4hk+tU9mlVFjFxOnm7iGWtcMOMSqknAagtqUVRRfg== 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 4XyYjt37dxzfwt; Tue, 26 Nov 2024 20:16:02 +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 4AQKG2HL097899; Tue, 26 Nov 2024 20:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AQKG23h097896; Tue, 26 Nov 2024 20:16:02 GMT (envelope-from git) Date: Tue, 26 Nov 2024 20:16:02 GMT Message-Id: <202411262016.4AQKG23h097896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 31e796c86de0 - main - amdiommu: use static array for device table base register offsets 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: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31e796c86de08f48422a12a2b846876e93391a63 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=31e796c86de08f48422a12a2b846876e93391a63 commit 31e796c86de08f48422a12a2b846876e93391a63 Author: Jason A. Harmening AuthorDate: 2024-11-26 18:12:55 +0000 Commit: Jason A. Harmening CommitDate: 2024-11-26 20:14:25 +0000 amdiommu: use static array for device table base register offsets This is a somewhat cleaner and more future-proof way to get the correct device table offsets. Reviewed by: kib Reported by: crest_freebsd_rlwinm.de Fixes: 5035db22 "amdiommu: Fix device table segment base register offsets" Differential Revision: https://reviews.freebsd.org/D47769 --- 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 5820594691f7..4d7db52a4acd 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);