From nobody Wed Apr 9 00:53:44 2025 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 4ZXPZx0n5Lz5sF4F; Wed, 09 Apr 2025 00:53:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZXPZw6dpNz3LYZ; Wed, 09 Apr 2025 00:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744160024; 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=SoSr34ElpNE3lR/ruQuYkoWnG+oPKRmA88SFYYBvGiQ=; b=h71senbVWmxrRggeZ/zNI0sGJ5hT7MhasegkbjZQZjA8yzHVTGPjMbOa4PditK53ujbDLj CP+IZxZ2HIb6IIcoEGXTMH5o7rOj/gYxjcKNJ72zf6tpKIkec6DgoS+U82gz5UYOoS/66l GFNS4u4HVUvgCbMvUCh9cOxsHmF67Xk84KM0KXRKfByoZgMf0fbm/M/JsbD3T4oJ3kF2TU MOshQh1FnhhBmcOdeL4CQrKndy00mkRk4fEbbye4q5tz9wrPXMp1Mp1p4octqL9G/QCM2d RyTkT3flCbDRyCU/sBRSsIWHkRhC0891Bz/7sqwwQKw6RtwWK+47D/6lI+UmBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744160024; a=rsa-sha256; cv=none; b=urCE452a6VlAdH3tw8ks8qSEopLXD2Czuf56VWtHdaqnKCPKMu/ql8vp3aBPAXvr4VxO23 z2zI3K1IdBjuuDRFPHSccU5QSyjS5BC3ejq8NgFs5FQtetg9BKJUa0fSqMY3O2Ag9mnpYG SDkb6NzPevMsmA0hWqGxWPGzlWDHCfktnlr5SRcwyQ6MsuVz98LX3MlHaELg0cduOHxTzL M/ULLYI8ZNy0D5UEduDMxiOoxqG+YIyaaLBcS3Aquc6tK4gMMJ+tCMGmS2g8IZbWaBlNE9 dSATX3Xh0Lm2sLrUukdYJ9QiPOPpwn04h26VlE3zFXsYKdJt02k3B7ul6vYksw== 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=1744160024; 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=SoSr34ElpNE3lR/ruQuYkoWnG+oPKRmA88SFYYBvGiQ=; b=OXOLQBI6TtqZoRNP8oeZ02RyS4B6eCk190dPrpumSHOQmzztgxTCozANmB5Lc5hkcvm/xj KZOdwQzHFSq34tX+f5SsRSTGvNrbjjVnQdWX3QjKsJR7aguN7Xnf894dFeBA1j5p48YN8W kWWSXnBp1Ii9ARJ1B6jc2tq61f4Y8O42vE6vWS3scoxgxIJvxz7h55dzOoxNEi37hIemKm aX885an3l1d2URgzK9vCFxdLL8/P6Izx2hjtmt3bdStDVxJ++Si0ttN61YSKDLLutvXSYb ceA2mPv2nBTY0FE3VzRZl/1A5SUn7APR+0UEWMcFewown/5tbP3tff7G3KZ5Bg== 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 4ZXPZw6174zvwS; Wed, 09 Apr 2025 00:53:44 +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 5390ri5r088343; Wed, 9 Apr 2025 00:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5390riJP088340; Wed, 9 Apr 2025 00:53:44 GMT (envelope-from git) Date: Wed, 9 Apr 2025 00:53:44 GMT Message-Id: <202504090053.5390riJP088340@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: 053856c0b59b - stable/14 - x86/dmar: add dmar_is_running() 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: 053856c0b59bd962ecbcc3522127e1203ba7e3d5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=053856c0b59bd962ecbcc3522127e1203ba7e3d5 commit 053856c0b59bd962ecbcc3522127e1203ba7e3d5 Author: Konstantin Belousov AuthorDate: 2023-12-14 02:06:04 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-09 00:53:17 +0000 x86/dmar: add dmar_is_running() (cherry picked from commit 512bb0da518be1dff3f937b7f653c6d3deb4b071) --- sys/x86/iommu/intel_dmar.h | 2 ++ sys/x86/iommu/intel_drv.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 57a66aae69b2..018501082dd2 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -263,6 +263,8 @@ int dmar_map_ioapic_intr(u_int ioapic_id, u_int cpu, u_int vector, bool edge, bool activehi, int irq, u_int *cookie, uint32_t *hi, uint32_t *lo); int dmar_unmap_ioapic_intr(u_int ioapic_id, u_int *cookie); +int dmar_is_running(void); + extern int haw; extern int dmar_rmrr_enable; diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index dd2a3d1a631f..28db14bba95b 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -86,6 +86,7 @@ static device_t *dmar_devs; static int dmar_devcnt; +static bool dmar_running = false; typedef int (*dmar_iter_t)(ACPI_DMAR_HEADER *, void *); @@ -539,6 +540,7 @@ dmar_attach(device_t dev) DMAR_UNLOCK(unit); #endif + dmar_running = true; return (0); } @@ -1055,6 +1057,13 @@ dmar_inst_rmrr_iter(ACPI_DMAR_HEADER *dmarh, void *arg) } +int +dmar_is_running(void) +{ + + return (dmar_running ? 0 : ENXIO); +} + /* * Pre-create all contexts for the DMAR which have RMRR entries. */