From nobody Tue Apr 01 23:07:14 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 4ZS3YH3w7rz5sG9g; Tue, 01 Apr 2025 23:07:15 +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 4ZS3YG4nJYz3d8S; Tue, 01 Apr 2025 23:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743548834; 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=o/NZZ3RYyNlKY/Ay+b3ZVANCROMduM/gIVf2uI+z9Ks=; b=yny2Sc0tmqPzsXHAXw63YggRvpT/qxwodVUnQD0CNoep5Uhs526Np1pB1vi5N2FPERZYmo SOMtTfwQ8h6ElbQGFV2ZY1+EdilTx195XmZTiWUFbc7ymt13DfpLRDmqfDAqnh/MZwqCkZ CxpG9G/5KJX2RR21Wm4U2X4OLp3Q8aixXAYQ3yOEods/nzopdKHQLDfyX9bOS4TxS9oPbr G4XvbegY2M3MRPAKgr6GQOu/nYOxe3M50WGZkfVjV+OVDWGrHVjsX+xtDcwhVsi+Iem+Pz Mt6HoqQCkEvbJZjBV2Rvp7gzItjxSoN1Bhh4Tl5Ag36w/4QKYdoODSlJRScGwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743548834; a=rsa-sha256; cv=none; b=v0hGedQhOM45MDLtn5PJM1konLjFuMVgujQxJQGBBaQyESEd7K+AYEDxjf+KQ8lpo7fgAO PsW6d4x+LUSLhTCnzIN8zU9dlBYgcuXipHV7sXEqeHw7TDxY/vp/TUX+KJ25XERoLhHDqS raW6Kg2FnKArMy9/KsEtOrhnvbSZMBFCLznIeIMTumqHT1DF03Hs3J/LsS9YalbnOYKcuX Ac0MawKQab9e2XW8YiMYSYRGIIkSKucUmCubgBgbtejdpFaHo6r2x1Emo3RwCe2o6Od43f KyUPvi5YkVgVKqGavr8vcZ5VVJISQUGTBoNGfaleVFlvgKlXZ6orAHdcMJMECg== 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=1743548834; 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=o/NZZ3RYyNlKY/Ay+b3ZVANCROMduM/gIVf2uI+z9Ks=; b=agLkO30liVoVBlAMK8hRlM/jccAi9g42N89e4vKyGqrR535hwx+1CkXTSosiid9YO/S1IF Pi5IKW8MZPE+RIF3bXemGEYGViPKGdFWu235t9EEEMYSN9UZyx95csEryUguboIUBo7t81 oV1JsElDov1K0Ot1aCZnVC9kRAdRLeSUSUVkEIe3DK+K5MPdFOKSGd5xVE//U1JU72aplN 9T4KAeo8G27QUt7jlkvhAzLpEOruf/g3g9Adz4yMVVBaSN+JzbYUipz1AqwtuOFz5lHWGN 46NKo+PDQscSOHopBTxpy3jnuACtLdeM97eZkJyPvBIz1hwx8/t46YkVW4mARQ== 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 4ZS3YG4NfVzqw3; Tue, 01 Apr 2025 23:07:14 +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 531N7Ero050486; Tue, 1 Apr 2025 23:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 531N7EgE050483; Tue, 1 Apr 2025 23:07:14 GMT (envelope-from git) Date: Tue, 1 Apr 2025 23:07:14 GMT Message-Id: <202504012307.531N7EgE050483@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: 3b1093e2562a - main - x86/amdiommu: add amdiommu_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/main X-Git-Reftype: branch X-Git-Commit: 3b1093e2562a62c96d8e80a306e19f4ac2d2a2f4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3b1093e2562a62c96d8e80a306e19f4ac2d2a2f4 commit 3b1093e2562a62c96d8e80a306e19f4ac2d2a2f4 Author: Konstantin Belousov AuthorDate: 2025-01-25 09:58:35 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-01 23:01:42 +0000 x86/amdiommu: add amdiommu_is_running() Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/iommu/amd_drv.c | 8 ++++++++ sys/x86/iommu/amd_iommu.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 77c4c68765c9..bf7ac4b157c4 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -71,6 +71,7 @@ #include static int amdiommu_enable = 0; +static bool amdiommu_running = false; /* * All enumerated AMD IOMMU units. @@ -555,6 +556,7 @@ amdiommu_attach(device_t dev) AMDIOMMU_UNLOCK(sc); TAILQ_INSERT_TAIL(&amdiommu_units, sc, unit_next); + amdiommu_running = true; return (0); errout8: @@ -617,6 +619,12 @@ static driver_t amdiommu_driver = { EARLY_DRIVER_MODULE(amdiommu, pci, amdiommu_driver, 0, 0, BUS_PASS_SUPPORTDEV); MODULE_DEPEND(amdiommu, pci, 1, 1, 1); +int +amdiommu_is_running(void) +{ + return (amdiommu_running ? 0 : ENXIO); +} + static struct amdiommu_unit * amdiommu_unit_by_device_id(u_int pci_seg, u_int device_id) { diff --git a/sys/x86/iommu/amd_iommu.h b/sys/x86/iommu/amd_iommu.h index 64dd13db9745..b9f07418ca9d 100644 --- a/sys/x86/iommu/amd_iommu.h +++ b/sys/x86/iommu/amd_iommu.h @@ -239,4 +239,6 @@ int amdiommu_domain_alloc_pgtbl(struct amdiommu_domain *domain); void amdiommu_domain_free_pgtbl(struct amdiommu_domain *domain); extern const struct iommu_domain_map_ops amdiommu_domain_map_ops; +int amdiommu_is_running(void); + #endif