From nobody Tue Nov 26 03:44:13 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 4Xy7jV1DCwz5dlfg; Tue, 26 Nov 2024 03:44:14 +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 4Xy7jV0jlDz49QW; Tue, 26 Nov 2024 03:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732592654; 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=wB7sXPbU7VlR+/ASdfqAYh9raeb4NlBdbAgA3GP2MK0=; b=lyNSif9bGzBaT7WQRaKaPVGBnlggEEvthryNZZL3NHAobiMN63+kPcnBoc0Iu6aILdsuqr 3JrhrIrG5f1s7L7TB7OLOnVOuaoSbQkzm3kQC1gz8k92ky91AWeHPHyCGddx+aBUDojgH7 d5Yu+bDAv581JZ6CQJBz9X3G6KfHTduxSeioft2ctss1tBTWWk1LZuyTHgoz6o555ifhqG zjp9TES+ZQjzEwyWh8FMCUFQhEPU8OmZjnZmLj0X3TyVIIGJ1GMLC59y585LhCXfwlZDA6 DgF59Eq6Nj6Et1dnNW4C8cBwFHnKqI8sWfgYjVXg6RGSzrlX2AU/ah47oUeyXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732592654; 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=wB7sXPbU7VlR+/ASdfqAYh9raeb4NlBdbAgA3GP2MK0=; b=oCvA/MYAMqVR9RE5nvP9SECUNYEVN3zVyitHZpo0/teuv/ZguV4KNMXIs9t70spJ495/2s WfZ9O2SldUzKAv8MDs3KXpKEshxMHVtzBfbp2QS0efG8tGDiSNjSX4gJKh+WJqenpUgvqo aS2ACSkdF1vGo80uNqbc8KFnox/lABvJbzBo2QLiZFuHKHbRnOyv8UVsQKFa3DxDJDMF9G pfrii2ykgIdaWwcz4sw/aL3ASSm9VLoTqpZRet5Fc0iO8olxVS2CSPrmaXJjNqz2wIy8Bx HLC4Yl8sgoLXmUuLejueKRNqxegOOx3oNJ5oYRbIVA4RswucLT2w8xNG8U7A4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732592654; a=rsa-sha256; cv=none; b=g0vkarGX5MT3GwtdEpHdXslS6/lHzOXtaudh7k9hALtHsyuT9QzKxeSsTlQ/hEYE9vkSSy FppLSmUwPsj4e9Jejlz7Dy2cA9aJvh8vB6BYL0fYvFvcrGrTLqd+BjSVheV1vKYuFdLebt 9p9EAZTvn5uSgGeikoktgLDXBQpBVaLURNPHgNlaRgfsJJ6bP4cKy+CCy15PP7hHA3eEwU NSeb4lRGF20j0erbWxqroJYyw72XXlQjlO1OugH6dseW+MgP8eVDghAjIGMoZ/45aafuzh 33os4Ke1EkFDvpAhysWuLtE3WXofJfVz9YNjAsdkqy3li4IhCUBdT363ZGXlrw== 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 4Xy7jV0Jqkz17gN; Tue, 26 Nov 2024 03:44:14 +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 4AQ3iDEK054410; Tue, 26 Nov 2024 03:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AQ3iDrd054407; Tue, 26 Nov 2024 03:44:13 GMT (envelope-from git) Date: Tue, 26 Nov 2024 03:44:13 GMT Message-Id: <202411260344.4AQ3iDrd054407@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: 5035db222e8f - main - amdiommu: Fix device table segment 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: 5035db222e8fa77d0b40fcd5a92c073dd1c590c2 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=5035db222e8fa77d0b40fcd5a92c073dd1c590c2 commit 5035db222e8fa77d0b40fcd5a92c073dd1c590c2 Author: Jason A. Harmening AuthorDate: 2024-11-25 23:24:41 +0000 Commit: Jason A. Harmening CommitDate: 2024-11-26 03:40:45 +0000 amdiommu: Fix device table segment base register offsets Segment base registers are at 8-byte intervals, while the register write helper takes a byte-aligned offset. This fixes DEV_TAB_HARDWARE_ERROR events and associated peripheral I/O failures on an Epyc-based system with 8-segment device tables. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47752 --- sys/x86/iommu/amd_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index d35c6c8dddc8..5820594691f7 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -277,7 +277,7 @@ amdiommu_create_dev_tbl(struct amdiommu_unit *sc) pmap_qenter(seg_vaddr, &m, 1); } reg = i == 0 ? AMDIOMMU_DEVTAB_BASE : AMDIOMMU_DEVTAB_S1_BASE + - i - 1; + ((i - 1) << 3); amdiommu_write8(sc, reg, rval); }