From nobody Tue Apr 01 23:07:13 2025 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 4ZS3YF5LSCz5sG3g; Tue, 01 Apr 2025 23:07:13 +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 4ZS3YF3sGBz3dKb; Tue, 01 Apr 2025 23:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743548833; 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=L3Blpnpffj6uNAsFGDHusZrjl+scvwspN+uLO9GQHsk=; b=pRf7RywIoYNPU5RB+ccDPKO3Fl1jtK3bhaOk2hQyQIW7BleLazxc/MP3DfTT6RtC4MzSts jQVkB6chG6Y2M1n9GpQ7AHOuHdugSoECdJD1YdYEA+Mviue+AYzRvvIjTDslPikOYaDqpm 0IZYqeeRll+UmRKq6vlY0vuYrOXW1uxUgY/r4EKtPO34dohgQw9t8mJ9Gs1P16FASmCW+O fe7r85ZeWiEW23VxV7rCYCOeC/EbRALzrejjBMS/WCEAxRccQlb5mmXfzfhO1p1XLpM7Sm zbJHbNt1q9I4bvZZSmUvYXYoi2hxg1Tc7cWeTsBW1ro/qq9wXIYprQvAMRz1hQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743548833; a=rsa-sha256; cv=none; b=vLp/GKJ6mu37B71cN4qJqxc+pOtRNL0rjIbwiDOT80zFNxlMxevMwWVvhx/c9tfit+W9IR rEXt/9MY15Mct8nOkPe4o2V24k1YxSSywjkaYAP4axEpJSNN+AXMnfWFmUNz6ViKDypN/K 4QKyqdVnb42xdHpdS5vFvyIa1dYfubhrSqdxQp99TRujWkCCjGifwmLZ0/HcIyXz1QVEbd 062iv2NBQRT+pgcLhAspHvz0NxFkHk0Mr/W0luV7LBAUVzy5RTINLmyfyn0ZxSnXHn+22Z mEeW4NFZ4kYoPW6dUNEskgKVqedV8qbDAJ2y7YngVa4giDxr8W7lmG5BXQJbDA== 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=1743548833; 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=L3Blpnpffj6uNAsFGDHusZrjl+scvwspN+uLO9GQHsk=; b=aHEaOGYsUnmVjrQmc5MxTGvgLJJwYPCgTMtMW74YzekRGhAhZbDghV19VMlAm0kRExSC9S asKvWrVdu1+HxvRuyqn+QqC7z5ICfoxSi9HoccIIaH/OuHnvRGOudw/5SglGNz6ot6V1Kk SEYpiMXYuL6tW0FvqQsOmQYPnK8sYM8OAyUVck4IXYAUggrPF3VKTL+CfN8CdwmvIkGYis wEJXddi3mwNkCHyuQvgtkna+nKLAqxeky+lnnYFFsbpXGPaxC0OOUAwuX13psAsEOwTUPg ggE6gs4PmJC+eJlpkzO6nnRcupxa8IlMZDj5uSz4/1G8egZQ82tYRmczG8K8YQ== 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 4ZS3YF38cWzqw2; Tue, 01 Apr 2025 23:07:13 +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 531N7DRt050454; Tue, 1 Apr 2025 23:07:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531N7D7b050451; Tue, 1 Apr 2025 23:07:13 GMT (envelope-from git) Date: Tue, 1 Apr 2025 23:07:13 GMT Message-Id: <202504012307.531N7D7b050451@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: 512bb0da518b - main - x86/dmar: add dmar_is_running() 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: 512bb0da518be1dff3f937b7f653c6d3deb4b071 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=512bb0da518be1dff3f937b7f653c6d3deb4b071 commit 512bb0da518be1dff3f937b7f653c6d3deb4b071 Author: Konstantin Belousov AuthorDate: 2023-12-14 02:06:04 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-01 23:01:34 +0000 x86/dmar: add dmar_is_running() Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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. */