From nobody Wed Sep 04 21:50:39 2024 X-Original-To: dev-commits-src-main@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 4WzblM2ZqNz5VRmG; Wed, 04 Sep 2024 21:50:39 +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 4WzblM1Ngzz4gts; Wed, 4 Sep 2024 21:50:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725486639; 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=7Vpfvu93QbeNVrzQepgLS6K2rwgAfDZ+qfIHwAg1w9c=; b=BJnDHsfnw0ZjaZFtN+LIaLb2IfUQAlDDMUDxv3rcejKY9z+Ii8gZfx9BUHaIBaVg8FJfRE TnoQgnsThP7yU9D5hipF9P0ag+Pk0qnBVz1Hzv6Q6KwHihM1jNUpJXVpTJZFSVU1Pk3Usu NKE9rTFSiHrESUvmpVUZP6zyQHRZ/IsHXx/keNG7KCBdowITPTKLzpofdZJrEJAZjFPz8Y oAKPsz6f6RrNMyBj8ytj7JLGmoVYGkTPl5NA2Yea1H0MpIMwslNRXvIEEAoc+SpEesiIKG 2gpXnyJKvMBC3F6EJsu97WUpBlSK9Oenf2Uiu2e/aK1HYkaz6GnRV8eg0Qxkdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486639; a=rsa-sha256; cv=none; b=OrgHHVGAHDsm7yiXMIOhhMckWjWsV2FsQPzg9SBhSMUovnzwZEHryVTrq9iaBJuqkmikUX Hvc6QAsCBOXKRql+MW9nEb7mzih4SW+sF70fEGMj0ImwgV6TeyC1jVzJh008j8zk/VqHvA IcQiB3AYyEfuiXVQp7BT+CoPBOn4zzZcXxgC+A2FK0Y9dy+rxz3ZRC20mEh91nb1cSKFW4 Ih9H1IPk43OnF9HXV04EfrnIU99p3ayWxbG2giXkzDTIFLdTEvSYQzCVVs/1DcjBnQ/AtO GtPHtICfwB60Gx0ULtH945RxPu3VCdJ1GvuJGXb9p+tA8RmnSo/oDu5dj6u/6Q== 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=1725486639; 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=7Vpfvu93QbeNVrzQepgLS6K2rwgAfDZ+qfIHwAg1w9c=; b=mkLrJTMTFMczcrw32lrkmRGM/fRtFCgVDBemon5PywEMJLNs1jQmrd5IriGh7riKV1ueYz zOVWe8OYrZC/IDE2TCcxcMzfHduiwUkmm4YtpRzaSwaQ11VGXiphJyApnHU+T5xMil6Zh7 nTuStk01H1+W4uUxwFFFNw25w3PgznMbVrjz2bUeZKblcrzPgrqum+tJMY0epEaJGsK/C8 3M9sg/t1ryow+GD3/E8ywsVrb811w0t3VDsNppOLrwPJPfDj8cwCGJkXuQ683vhUk3ezTw bGVaZEqy/1v64rC/MM/c2Ew4fbGVpBY7IZVXmOzzDReSo/cwqzaRuQj6YAhXxQ== 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 4WzblM1182zhN8; Wed, 4 Sep 2024 21:50:39 +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 484LodEg031438; Wed, 4 Sep 2024 21:50:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LodTe031435; Wed, 4 Sep 2024 21:50:39 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:50:39 GMT Message-Id: <202409042150.484LodTe031435@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: 0fcbf4944cb9 - main - DMAR: use DMAR2IOMMU() for DMAR_LOCK() and related macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 0fcbf4944cb9865c6db0154c2f479fdd05b115c1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0fcbf4944cb9865c6db0154c2f479fdd05b115c1 commit 0fcbf4944cb9865c6db0154c2f479fdd05b115c1 Author: Konstantin Belousov AuthorDate: 2024-06-06 00:39:52 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-04 21:50:18 +0000 DMAR: use DMAR2IOMMU() for DMAR_LOCK() and related macros 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 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)