From nobody Fri Jun 07 10:15:26 2024 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 4VwcXH24Xjz5NFPZ; Fri, 07 Jun 2024 10:15:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwcXH0qJbz4DXl; Fri, 7 Jun 2024 10:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717755327; 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=neydbADnaKz03luf0UjotTrDKmFWDzGX/u7hTPgEfYk=; b=hKxfY+mn3kJUr5drh+QlOB/lCOw/0YEUV9RCP/yn9AJI6aKePKC5h5enGEIu3/+hpw1eOO e2Na8/ButogHsxR+N3zQ/tLYMSELeG32io5liuM9GfAv+gTko8o2sZbt740HwQRyx5lxZc 6tInvvzemT+0r3hy9L7+mB0DV2Iy7OqRJiCyTFjQ19kSQE17XYOI/wAC0O9OJYYeMynH+/ 97er3Wwy5YDPlAEsv6+zARY+qg6ccHYbg15uaDyQk4emt+XRofCPBbMaQoUkHEMLw9+gaW DvKL3oqZyh0IH2Xoa8MT9Be1R6St5g047fUUBfabJva+K6DSey8wrZ28GJm15A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717755327; a=rsa-sha256; cv=none; b=EU2wrxEPsTJfGxy6iSt/rcI/vYy02BuyX9qiQaxKpZEGwflJYzfDqXf5gtkiLxPziB0eAk DnxclT+5TVkMfWIukBUFAvIGmC20a+pEy/nFOGEk4ctT3g102ZxANyjYHMumHtRUhcDYVD FM8RHYbAVtUGuoCcP9clzxmM0ubEuIJoV0wivwVuPclH4leV76v5bvqn/DwyoAWQZaVIBx X/uITHNIs+OKA4K+G232pCI8K7e77o0HxakSnfQgziauYnVv8dDnulT7FvWBYm6kUgeuQj cH8htFmfO5ovHjyrAK5uNZBwX9zzOyTrdrB+FdpZUVEbYr9RnTfTRbP9wk7Faw== 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=1717755327; 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=neydbADnaKz03luf0UjotTrDKmFWDzGX/u7hTPgEfYk=; b=cMosgloUnV0Igh1JEpZy4yltkEu4Rb/G5v7fLjXhNFw6esIyElvIFbhdSszwsh0NFYxtSc 9e9z16yfzgB4114kmzhCRQL+b9xcyeCnd+XxFvVkqS54JSknavaYnvzNnLqPXNuchm/XvN okRB4vMHoof5P+ITj/dzag8Rk/z0HzmDhEDcLX+PLhz0iyOwqYKADpZOUDWvSw3slUBVAk +b6pyrbEJ6+ij6ddmWsgrTWznsaApF12a+DyZ8mUEvVNb9NivNYuPtFMgy4PMGHbbphvwF bYFgdY13SLhwJDvtskaOWy0d+M/TmpLblYZNKyf7Gds1aDREaNlS9iW9UZdrJQ== 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 4VwcXH0P8zz1PGp; Fri, 7 Jun 2024 10:15:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 457AFQSC013511; Fri, 7 Jun 2024 10:15:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 457AFQJa013508; Fri, 7 Jun 2024 10:15:26 GMT (envelope-from git) Date: Fri, 7 Jun 2024 10:15:26 GMT Message-Id: <202406071015.457AFQJa013508@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: 66b62c07fb91 - stable/14 - Intel DMAR: remove the 'dev' member 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: 66b62c07fb9187abe14c2f84a7e1f3d858fb863e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=66b62c07fb9187abe14c2f84a7e1f3d858fb863e commit 66b62c07fb9187abe14c2f84a7e1f3d858fb863e Author: Konstantin Belousov AuthorDate: 2024-05-30 14:05:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-06-07 10:15:11 +0000 Intel DMAR: remove the 'dev' member (cherry picked from commit 164fdee11164e9a43e279f9e45117e7573ddc15f) --- sys/x86/iommu/intel_dmar.h | 1 - sys/x86/iommu/intel_drv.c | 1 - sys/x86/iommu/intel_intrmap.c | 4 ++-- sys/x86/iommu/intel_quirks.c | 7 ++++--- sys/x86/iommu/intel_utils.c | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 8289478aed19..b7f0300e16f0 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -123,7 +123,6 @@ struct dmar_msi_data { struct dmar_unit { struct iommu_unit iommu; - device_t dev; uint16_t segment; uint64_t base; diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c index 9a2fedf90b6a..0b25620114cd 100644 --- a/sys/x86/iommu/intel_drv.c +++ b/sys/x86/iommu/intel_drv.c @@ -410,7 +410,6 @@ dmar_attach(device_t dev) int i, error; unit = device_get_softc(dev); - unit->dev = dev; unit->iommu.unit = device_get_unit(dev); unit->iommu.dev = dev; dmaru = dmar_find_by_index(unit->iommu.unit); diff --git a/sys/x86/iommu/intel_intrmap.c b/sys/x86/iommu/intel_intrmap.c index 02bf58dde299..137801125c38 100644 --- a/sys/x86/iommu/intel_intrmap.c +++ b/sys/x86/iommu/intel_intrmap.c @@ -272,7 +272,7 @@ dmar_ir_program_irte(struct dmar_unit *unit, u_int idx, uint64_t low, high = DMAR_IRTE2_SVT_RID | DMAR_IRTE2_SQ_RID | DMAR_IRTE2_SID_RID(rid); if (bootverbose) { - device_printf(unit->dev, + device_printf(unit->iommu.dev, "programming irte[%d] rid %#x high %#jx low %#jx\n", idx, rid, (uintmax_t)high, (uintmax_t)low); } @@ -336,7 +336,7 @@ dmar_init_irt(struct dmar_unit *unit) if (!unit->qi_enabled) { unit->ir_enabled = 0; if (bootverbose) - device_printf(unit->dev, + device_printf(unit->iommu.dev, "QI disabled, disabling interrupt remapping\n"); return (0); } diff --git a/sys/x86/iommu/intel_quirks.c b/sys/x86/iommu/intel_quirks.c index 486bd1bc9496..b405a24c4c8c 100644 --- a/sys/x86/iommu/intel_quirks.c +++ b/sys/x86/iommu/intel_quirks.c @@ -109,7 +109,7 @@ dmar_match_quirks(struct dmar_unit *dmar, (nb_quirk->rev_no == rev_no || nb_quirk->rev_no == QUIRK_NB_ALL_REV)) { if (bootverbose) { - device_printf(dmar->dev, + device_printf(dmar->iommu.dev, "NB IOMMU quirk %s\n", nb_quirk->descr); } @@ -117,7 +117,8 @@ dmar_match_quirks(struct dmar_unit *dmar, } } } else { - device_printf(dmar->dev, "cannot find northbridge\n"); + device_printf(dmar->iommu.dev, + "cannot find northbridge\n"); } } if (cpu_quirks != NULL) { @@ -136,7 +137,7 @@ dmar_match_quirks(struct dmar_unit *dmar, (cpu_quirk->stepping == -1 || cpu_quirk->stepping == stepping)) { if (bootverbose) { - device_printf(dmar->dev, + device_printf(dmar->iommu.dev, "CPU IOMMU quirk %s\n", cpu_quirk->descr); } diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c index b0f2d167658a..a66682b68a2b 100644 --- a/sys/x86/iommu/intel_utils.c +++ b/sys/x86/iommu/intel_utils.c @@ -137,7 +137,7 @@ domain_set_agaw(struct dmar_domain *domain, int mgaw) return (0); } } - device_printf(domain->dmar->dev, + device_printf(domain->dmar->iommu.dev, "context request mgaw %d: no agaw found, sagaw %x\n", mgaw, sagaw); return (EINVAL);