From nobody Wed Sep 11 08:44:20 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 4X3Yyr3tlFz5W7Y5; Wed, 11 Sep 2024 08:44:20 +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 4X3Yyr31d5z41nW; Wed, 11 Sep 2024 08:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726044260; 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=0VoEDLIEkjvE1+MsBue8yzs946n9pBK68GBa56R1/8w=; b=vSL92I92MxyZGSpKveAxxM6k7BOri5ayFOD4CLnj7PTOwB8YLBUR30+yiKYVevi0gJLkX/ 2IM83VaN10X5L+kWfeD7h/dQ1KWjC8nhUlmbq/2usxgPjycoEYx5Qp/oBpnah0GMil+1ky O3mdT0HETQh2f+qX+QGlSaL2H7W/OnL3YQlDUmKGvRD3js+pM2PnEwNJaPDCU6j2/3p1Fx 6aHfXgaUoQMPC1qkT3LVxtEE2IxnMDpeAJ5mzMBsTjMrn0L4UkQC70RE2tMtetxAk9lfw8 LR3kz4aBHKm7r9cnYVXHptIbPNaQoz9HeNejbEunHMwJtFM2W1TELKnz5/7WKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726044260; a=rsa-sha256; cv=none; b=t0dQvPMU3PsL2igEJjglMno2APjRBV/8H/VF0Gd5zRvyseh4vQLH+4qGvVLMysfRuUGnWW SGFkG5bnbbQL2zZDq3hdFH4K3DMnWjd/dNHV0WX5LlKraFYPvvwoagS9/gJxS1MoII16IZ kp+UzetIZcvMEgO/6ieCW1wYOViy8zvGm1DYJhfpZh8Y07fi9nvEm9xEbyYXdzt+ZUJVFV 02fUlhXdXnUaOdJcH1BauOJ5Xt8TIVKaGuE4PkKMaXroTrVgdK+5xRGIBhThoLHIxPrH8Q C7qNl3EDaHNhx8t6D4ZnyLJ0orNLtcSQGPeXXfBQuhVVynrODEe5Msqfr71bcw== 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=1726044260; 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=0VoEDLIEkjvE1+MsBue8yzs946n9pBK68GBa56R1/8w=; b=vnasSUJetRkvA0iVViIj8lJK5pYzkAFBVaDaffhme+Z5s+iP88WgMuCrk7nJmRJCYWNaG/ OaszW3iom7FKMd0w+pt3jHT3CjoCF/S6agJ//pdK3lTrTcDMtTTCGOf5YuJDjmwFkE6xXO by0HegZlRim5oO6aO+xETg+eH9Ytp2hzScBWp3G55/iyNxcwrunhfmS8lG0SkRotFvmqh7 OVU5WY67Vxa9Laiae0zp7K8eGt2VsxIy8PthwvX4FBc+XS6drRVGFSQrLmod8+Pxcfr7ow d9uC/26rfsNdzTwLQ2kMg1ZDGsckAaS2s9fPI6ixKeP1ZiLHdOgw5X/cQGeRAA== 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 4X3Yyr2Zv5zP5J; Wed, 11 Sep 2024 08:44:20 +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 48B8iKl6007290; Wed, 11 Sep 2024 08:44:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B8iKmJ007287; Wed, 11 Sep 2024 08:44:20 GMT (envelope-from git) Date: Wed, 11 Sep 2024 08:44:20 GMT Message-Id: <202409110844.48B8iKmJ007287@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: 1d5630b11628 - stable/14 - DMAR: use DMAR2IOMMU() for DMAR_LOCK() and related macros 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1d5630b11628f0c3bffc92fb0a4dc4b8c64fafb5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d5630b11628f0c3bffc92fb0a4dc4b8c64fafb5 commit 1d5630b11628f0c3bffc92fb0a4dc4b8c64fafb5 Author: Konstantin Belousov AuthorDate: 2024-06-06 00:39:52 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-11 08:43:59 +0000 DMAR: use DMAR2IOMMU() for DMAR_LOCK() and related macros (cherry picked from commit 0fcbf4944cb9865c6db0154c2f479fdd05b115c1) --- 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 9eb87bcfdc35..4ae005238074 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -205,9 +205,9 @@ struct dmar_unit { struct taskqueue *qi_taskqueue; }; -#define DMAR_LOCK(dmar) mtx_lock(&(dmar)->iommu.lock) -#define DMAR_UNLOCK(dmar) mtx_unlock(&(dmar)->iommu.lock) -#define DMAR_ASSERT_LOCKED(dmar) mtx_assert(&(dmar)->iommu.lock, MA_OWNED) +#define DMAR_LOCK(dmar) mtx_lock(&DMAR2IOMMU(dmar)->lock) +#define DMAR_UNLOCK(dmar) mtx_unlock(&DMAR2IOMMU(dmar)->lock) +#define DMAR_ASSERT_LOCKED(dmar) mtx_assert(&DMAR2IOMMU(dmar)->lock, MA_OWNED) #define DMAR_FAULT_LOCK(dmar) mtx_lock_spin(&(dmar)->fault_lock) #define DMAR_FAULT_UNLOCK(dmar) mtx_unlock_spin(&(dmar)->fault_lock)