From nobody Sun Mar 9 00:23:02 2025 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 4Z9LMq1Qt8z5qDcr; Sun, 09 Mar 2025 00:23:03 +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 4Z9LMq0y4Rz49hK; Sun, 09 Mar 2025 00:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741479783; 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=IW7/7pjiRpUCYXj9mNbAYMvCimxpF6rkZBy/CdjfdGE=; b=qqPgPYIRJva5VYg0H0K5KX2zCfFSmUFZj/gBmPh/8l2F6/cE4Sif/9pcYM7gbkCVJ1Dbq3 d41f5ReoyaeHTyxIDlhd8xGZ7ldM7QDNGA/VKWXoX1OWKoovj4UuxRietmwz+LQYDJ3LCq y11FZMBVGqllwJkufEgGaw35HkE3B005nfIBjjepk05InyBXDsDqcrXmrRKPu2Gy/nM28O xJV2Ef6OnFf9yrtpKF4ygz1WdGLskNE4owu5GFeztQjK/pWYbOsWc3HIP5hzsPMuJXtY96 jb4iXPdBNn581LFGEW5kQrOq4Av6Kg5laXD+wmSwrxYUWdIAXbuwxE9m9mh6QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741479783; a=rsa-sha256; cv=none; b=xkFzSqn1Ii8US9yZPhPHLrQwaYrmhXiPoVsTLa9rXyDwIk1EJhOcXAW9PQFE/yiZrl1tyB P8gb7koU/s2F/0XkR36FXIiH2muE6wVNf29bjA9v2ZSVvNVHJN44xYjZxdbi5ADo3gFMGl HjUyT8vTIPQYVh3aKFuILUd1eaErB+CMh3ik5VmyY34gLp87ph8+YB1JvQmeRFGa9TYKVM JbJw9D2J4vJMez5ekzDB1YYA+QrB3jVP+yHmLbSoGRDS6GL3aTQBOwG5t0Zm8bB7WliJCq H4pW0AsIE7dI3ToHy1qXwiFiiWhWk/dt42MSjTtTWwgd+qMIUpyepgVUE700zQ== 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=1741479783; 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=IW7/7pjiRpUCYXj9mNbAYMvCimxpF6rkZBy/CdjfdGE=; b=Ue7kqAHxcQW/NJz/BK9jIn8cuMKcQbbfJeejG8n4RkvRVnWk5J/0l2Y8gQnHRG+IhFDs5V xAoSXrCQGulXZuFzMScnrNsQ37vivS3BLeAvaspZm7s6vOh323VHcVhqzs5OnWfHRz09eV uxUALTDz2/4XWpBCzxS+1ku4YcVR+3iNfwucGl50WZp+XWKA+aAf6Dk2XXdjnIk7ZpUE9C lVcnpy4FxtusrqRhbe9RhlCq3MrReJryx3BanyfcxZEkOQ+DJWo3ZvPdBS/pwKUe/hfNlb BXXRQf1pmt7HFUcBNSzVf0Dtz/geNOsARoUGEkk16vKN7EJQcHaJonBRNM8+3A== 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 4Z9LMp6zmszmmp; Sun, 09 Mar 2025 00:23: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 5290N2H7009687; Sun, 9 Mar 2025 00:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5290N2G7009684; Sun, 9 Mar 2025 00:23:02 GMT (envelope-from git) Date: Sun, 9 Mar 2025 00:23:02 GMT Message-Id: <202503090023.5290N2G7009684@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: 21c2ba96815c - stable/14 - amdiommu: add register definitions from IOMMU spec 48882 rev. 3.10 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: 21c2ba96815cb01d6aaa8f47e267b547bbf46dbf Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21c2ba96815cb01d6aaa8f47e267b547bbf46dbf commit 21c2ba96815cb01d6aaa8f47e267b547bbf46dbf Author: Konstantin Belousov AuthorDate: 2025-03-02 01:23:41 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-09 00:22:41 +0000 amdiommu: add register definitions from IOMMU spec 48882 rev. 3.10 (cherry picked from commit 43fa7b907e9cc5ce365afd05775349d199fc2eb4) --- sys/x86/iommu/amd_reg.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/x86/iommu/amd_reg.h b/sys/x86/iommu/amd_reg.h index 37375b3fa7b5..53b8b0cb42fc 100644 --- a/sys/x86/iommu/amd_reg.h +++ b/sys/x86/iommu/amd_reg.h @@ -186,6 +186,9 @@ #define AMDIOMMU_CTRL_MARC_EN 0x0000010000000000ull /* Memory Addr Routing En */ #define AMDIOMMU_CTRL_BLKSTOPMRK_EN 0x0000020000000000ull /* Block StopMark En */ #define AMDIOMMU_CTRL_PPRAUTORESPA_EN 0x0000040000000000ull /* PPR Auto Resp Always En */ +#define AMDIOMMU_CTRL_NUMINTRREMAP_MASK 0x0000180000000000ull /* Remapping MSI mode */ +#define AMDIOMMU_CTRL_NUMINTRREMAP_512 0x0000000000000000ull /* 512 max */ +#define AMDIOMMU_CTRL_NUMINTRREMAP_2048 0x0000080000000000ull /* 2048 max */ #define AMDIOMMU_CTRL_EPH_EN 0x0000200000000000ull /* Enh PPR Handling En */ #define AMDIOMMU_CTRL_HADUP_MASK 0x0000c00000000000ull /* Access and Dirty in host PT */ #define AMDIOMMU_CTRL_GDUP_DIS 0x0001000000000000ull /* Dis Dirty in guest PT */ @@ -256,6 +259,21 @@ #define AMDIOMMU_CMDEVS_PPROVRFLWEB 0x00020000 #define AMDIOMMU_CMDEVS_PPROVRFLWE 0x00040000 +/* + * IOMMU Extended Feature2 register fields. + * All currently defined bits are RO. + */ +#define AMDIOMMU_EFR2_TMPMSUP 0x0000000000000004ull /* Tired Mem Migration */ +#define AMDIOMMU_EFR2_GCR3TRPM 0x0000000000000008ull /* GPA based GCR3 pointer in DTE */ +#define AMDIOMMU_EFR2_GAPPID 0x0000000000000010ull /* masking of GAPIC PPI */ +#define AMDIOMMU_EFR2_SNPAVIC_MASK 0x00000000000000e0ull /* SNP-enabled Adv intr features */ +#define AMDIOMMU_EFR2_SNPAVIC_NO 0x0000000000000000ull /* No features supported */ +#define AMDIOMMU_EFR2_SNPAVIC_REMAPV 0x0000000000000020ull /* Intr remapping with GVAPIC */ +#define AMDIOMMU_EFR2_NUMINTRREMAP_MASK 0x0000000000000300ull /* Number of remapped intr per dev */ +#define AMDIOMMU_EFR2_NUMINTRREMAP_512 0x0000000000000000ull /* 512 */ +#define AMDIOMMU_EFR2_NUMINTRREMAP_2048 0x0000000000000100ull /* 2048 */ +#define AMDIOMMU_EFR2_HTRANGEIGN 0x0000000000000800ull /* HT range is regular GPA */ + /* * Device Table Entry (DTE) */