Date: Wed, 11 Sep 2024 08:44:20 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1d5630b11628 - stable/14 - DMAR: use DMAR2IOMMU() for DMAR_LOCK() and related macros Message-ID: <202409110844.48B8iKmJ007287@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d5630b11628f0c3bffc92fb0a4dc4b8c64fafb5 commit 1d5630b11628f0c3bffc92fb0a4dc4b8c64fafb5 Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2024-06-06 00:39:52 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409110844.48B8iKmJ007287>