From nobody Wed Sep 04 21:50:37 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 4WzblL0z9sz5VRyv; Wed, 04 Sep 2024 21:50:38 +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 4WzblL0Qbpz4gs1; Wed, 4 Sep 2024 21:50:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725486638; 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=t0Nj/MP5tohjVt3tT3AhCk71rud/RrHsEQX09n7dvmg=; b=eyg1BznvBeJjNprhaQo0Ou7ea4CfRsDTlgAkFzV2r7E1eQiFO88VJaB+LTzkNfU0ad98Wg UWRi4OobkSGHekVFlci7ojUmpY7AKz7SNzSYHnEt3IMDvEUBWYbU+Rz6fnLyjNFKd53FVb Z+W485MOaoMsCN1IAcygR6rhaAepnFFuhO10J17I2dSGlmB+EGNMH8bB72nA1YMVZ62ddk gb6K1oL0/6/FRAwwWcd/MNK/sYThYEayoVrQu2Z1MXGanBaeOhPR5RRyP42sKsElgtBjeb uITaOK3RlHizeUc5N5FO1SVAP+GR3sul+WceXqzMj3L0MC37GcMVtUUgHY6f/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486638; a=rsa-sha256; cv=none; b=UVC25F9SJE060mZtMvnZvVMCHejhzDDO8bh8VATcWPevq9cAZvExv0UM0hc2Gno+f4Myf4 e80WkpI1vKtMCP3JtQe4+taESoL4RANCT6IpRDF9JmundiHvO/LVhWqlr6oG6KpVArheGP lLFfhIBikDCuCbuf2/uAI33KLO4C1SsgbRbYn9RDXZv7Stycmm+3jOs+7uA5H172JDH95y czj3jv3AAYUQbNi/k1shqGsKOK3xOCL+EdLZgm6+YEnCjfUWili0110R0OdHxlqLaUedWs /t/yqJu8y2DdSs8mPFOU9vWpIRs2okwc2MDtWxfC1Z3canduHqzI0lKNhTDEMQ== 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=1725486638; 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=t0Nj/MP5tohjVt3tT3AhCk71rud/RrHsEQX09n7dvmg=; b=ugnFj4dNcMW7ZJwar7xSpmx7rL3K8Eq0hpk0EMoHT5UfxTr1GK0mwUlmdNUCtiU61Uno5I 5KFDIif+g2AdGF9vHAWDOUYoWYgvOTiU2iUJDv/reHYhP951JDTTH5a4nYiUeSgJBB3/f/ 5vKxJdyLFoVAKw4HHo57cNgAuB6tApAOadAQRGnE3BCloRvw06I2Wq50reppatPsW5c5Hd E8nU0M1H2KyGudWVq3TyjhR4WU+OIh8aP8fo59Ne5mPGAz4VMuA71v9ebLad8ZPaynlRuo NE2aGeAb7gJYkzh1r7Z4riqgcPcCeQZTBmkyqfQb5ImEukB9uuD/UZLNg7uGfg== 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 4WzblL01zPzhN7; Wed, 4 Sep 2024 21:50:38 +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 484LobPr031387; Wed, 4 Sep 2024 21:50:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LobGE031384; Wed, 4 Sep 2024 21:50:37 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:50:37 GMT Message-Id: <202409042150.484LobGE031384@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c47229ae6676 - main - Intel DMAR: improve X2X macros to fix failures in certain syntax contexts 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c47229ae66764fec85477e89d4f3861ac29abf48 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c47229ae66764fec85477e89d4f3861ac29abf48 commit c47229ae66764fec85477e89d4f3861ac29abf48 Author: Konstantin Belousov AuthorDate: 2024-06-06 00:52:39 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-04 21:50:18 +0000 Intel DMAR: improve X2X macros to fix failures in certain syntax contexts Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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)