From nobody Wed Sep 11 08:44:19 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 4X3Yyq4Hqbz5W7jw; Wed, 11 Sep 2024 08:44:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X3Yyq22NKz41lh; Wed, 11 Sep 2024 08:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726044259; 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=Nx0JdJd7I5nP6NQ6m3BDn+YNWpofdBNOyvjloafL9Pw=; b=WspFtJlztUFli6Xnk4at3ID7Emy2p2VJXMOz2X5tSJ45h1Cguk7kv0hNSlr/64cCFfDx1O uuhDYMVmjqyZM7JbaIRWJYbmt3kWGPlSlvyFkSNpelLgv3+OqX7uBAz3KdpIpsWTW/3mSQ JZ1xRb6AbAabQKZ4Gj1WOrjd5pwEG0Lr1IzqYmj2gPXOEbV32yE5YiiSSe0gvwiWyNyNjA zr+/oh32Q73BgPD1d9metDBlp6yw96Y5N8owq4waD8F39Aj5N5o1+BPfSx44RvhbynNuqq 3x3aq3E093DmuCiHibsyqe8oQ92iMciWL7jJ2+TI9eyC0Wo2LiOuqp/MezIN0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726044259; a=rsa-sha256; cv=none; b=IzXXXy5ZqCNu5SZVct/MQ4BXMnFk9jUKUbvmglTOv058G+eTbHidQVWfkJTPsj1Fyy81VK 1WJ7XB/Atl3f3KNPjJAnGMcgqYM4I9khwExaBKgK9to72jkv8GCudjZ3jLH1T6k8d+MkIP cahtCD5J/Zy1CxR5mHiH172taGrLNLnyAU9eDzb4TRIwMlBCO8wFqYyE5jrpjNcqLUdwoT eUwNlxvrnx6fZFtXjVh/gKdTDOZ+A8Mz6DJdGeoBEASZI6Yo2T/y9Ym/Bt6u93qR4mLpWc o6Hl6+StM5Uh3YZNd61KXooorC3ykDSmc8ar6BPPGj2ZFoGNPpyZW+38vDa2Nw== 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=1726044259; 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=Nx0JdJd7I5nP6NQ6m3BDn+YNWpofdBNOyvjloafL9Pw=; b=gDDyqzQ+Jzxr3/uGWcomwXoLXGP7IpzSgapiPmRur60m0qVc50hc4JbIdrtlwvdmIePP+s IfWcHWAnU/GQRZG6rBqYZusf+yrEy+YygN5KyFJXYLVi4LzLa0c4Qm14NSrtTFUW25aFMK x24ypPYkkkLXaF10L50oVVoqmaOkMl2tO5osy+hFmibNLkzGZD/7+uVDNaxznJuQgAuyoC AqwLUYHVXnJf6WKSuVUyFpmBFR9Wm+B86Iy2Z/GKx7xqL8Mh94TwL1RBIp6uo1Hagl+hBK 47sz/IifoMlopnwjYFXUwqw/xl0+S6PSLA2T3o+n4VlHkJIWJKuAu7tjEu0j3A== 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 4X3Yyq1btMzP9g; Wed, 11 Sep 2024 08:44:19 +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 48B8iJTQ007239; Wed, 11 Sep 2024 08:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B8iJgl007236; Wed, 11 Sep 2024 08:44:19 GMT (envelope-from git) Date: Wed, 11 Sep 2024 08:44:19 GMT Message-Id: <202409110844.48B8iJgl007236@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: b535995861e0 - stable/14 - Intel DMAR: improve X2X macros to fix failures in certain syntax contexts 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: b535995861e0ffd6e9567844455d268ab35d8d24 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b535995861e0ffd6e9567844455d268ab35d8d24 commit b535995861e0ffd6e9567844455d268ab35d8d24 Author: Konstantin Belousov AuthorDate: 2024-06-06 00:52:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-11 08:43:59 +0000 Intel DMAR: improve X2X macros to fix failures in certain syntax contexts (cherry picked from commit c47229ae66764fec85477e89d4f3861ac29abf48) --- sys/x86/iommu/intel_dmar.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index b7f0300e16f0..9eb87bcfdc35 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -87,15 +87,15 @@ struct dmar_ctx { #define DMAR_DOMAIN_UNLOCK(dom) mtx_unlock(&(dom)->iodom.lock) #define DMAR_DOMAIN_ASSERT_LOCKED(dom) mtx_assert(&(dom)->iodom.lock, MA_OWNED) -#define DMAR2IOMMU(dmar) &((dmar)->iommu) +#define DMAR2IOMMU(dmar) (&((dmar)->iommu)) #define IOMMU2DMAR(dmar) \ __containerof((dmar), struct dmar_unit, iommu) -#define DOM2IODOM(domain) &((domain)->iodom) +#define DOM2IODOM(domain) (&((domain)->iodom)) #define IODOM2DOM(domain) \ __containerof((domain), struct dmar_domain, iodom) -#define CTX2IOCTX(ctx) &((ctx)->context) +#define CTX2IOCTX(ctx) (&((ctx)->context)) #define IOCTX2CTX(ctx) \ __containerof((ctx), struct dmar_ctx, context)