From nobody Mon Aug 08 03:22:04 2022 X-Original-To: dev-commits-src-branches@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 4M1M251Wxsz4YjbX; Mon, 8 Aug 2022 03:22:05 +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 4M1M250p6Nz44Q0; Mon, 8 Aug 2022 03:22:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659928925; 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=mDRMnTXpdHxSazR5zBlFXXhuV78YyGulILxLv6h605w=; b=OW56dkFKz7igYUOPRF2XQshaPcmhAwjiJ0JMPjAA8qQbZAZsv3o2IICYTk1o/zxEPuIuZ8 E1/OujPRYIoCpEDdGjgy2li9spX+oDIvh1ddc579h6JRyfZq0jWnMwHUEjw+QxIGMZQnO/ VDhojGVwu3Ei5sydr2CMz8YUEVxF8Co2p3GXB1MjXWsrrxLIGc7824jUpQRpkqylKjDhnp HtNwsD4loU6ln6yRTd7iqmvp5H/jY/rUQ1OeJEg4ZxB477mPaeeA5JccndhjZIrhPo0N05 ytsYaWWLlc6YMtMvwlGaVzwF+TTffOnrHeEqcXaTGwV08Y+L1v3E+KkWv2TgwA== 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 4M1M246yGGzcwH; Mon, 8 Aug 2022 03:22:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2783M4ie017670; Mon, 8 Aug 2022 03:22:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2783M4nK017669; Mon, 8 Aug 2022 03:22:04 GMT (envelope-from git) Date: Mon, 8 Aug 2022 03:22:04 GMT Message-Id: <202208080322.2783M4nK017669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 63440d34ad65 - stable/13 - x86/iommu: Eliminate redundant wrappers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 63440d34ad65dfb22394e63d9827671c5804b279 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659928925; 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=mDRMnTXpdHxSazR5zBlFXXhuV78YyGulILxLv6h605w=; b=QjL2ZcoweDSbwKhsHAOtA8YpD44bTql4VrW3FpVLcqVXXnt2uI8laAHEKGx9fsC9pYJY+g QGuEH64+CgbydOjmAPn3gKFfe4+DUgQXuGWUHeypvIUSWMqFvxACrh7psnf1bbaPkMt+vy FO4dFbxIrwgDUhdaU8YIl1RP8g5Tlbgfiw8eAAOpkM5WdWXUaNRb964TngKEDJu4gA0DD1 AEhKwx+6vr575aE5UMFkSZM5+17kkznkd787g4lqhTYp2vl9sBfWZPnzCtfT9RQ1rY9n3Z i2xv74j5az+FufjwPSiZpSkRbPQnAwM8wYXmHM9l+hPGjYlCSJ+s1hnIkXcBoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659928925; a=rsa-sha256; cv=none; b=WjNSKRe9O2PMJqcZ53GQrwUueBu4KTV0NOmj9KJtM+RlXoL5ABpjytlzLeql0I0kR6ZP/U 85xNDp5tvu4WjydqC7lkK/8akM7ZABpNgnVCNobsZdj8I5l/5O7eoEHxPORN2RbGeMfKda 38Cdk7QgFOVOaQqIm0lowjw7svJ7AAbDu/FlitrmOYS9OLnSrEcAeNOeIf2f4zdIL9rOYt Leda4eeotmQvJqrjB4jOhomDq3eXx5m0oIYP9MqsWdNm03nVlz+7/apEok9h3z5BSb9czc NnrG2bEWG5TzItYMyejdrPAM9Nc8BDs33qYiCBQxeqaGXMY/PXBs0Z3rIMXZSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=63440d34ad65dfb22394e63d9827671c5804b279 commit 63440d34ad65dfb22394e63d9827671c5804b279 Author: Alan Cox AuthorDate: 2022-07-16 04:25:11 +0000 Commit: Doug Moore CommitDate: 2022-08-08 03:17:28 +0000 x86/iommu: Eliminate redundant wrappers Reviewed by: kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35832 (cherry picked from commit da55f86c61462b119fd1306d12411989d6610650) --- sys/x86/iommu/intel_ctx.c | 26 ++++---------------------- sys/x86/iommu/intel_dmar.h | 3 --- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c index 34730306000b..b3573712de32 100644 --- a/sys/x86/iommu/intel_ctx.c +++ b/sys/x86/iommu/intel_ctx.c @@ -864,7 +864,7 @@ dmar_domain_free_entry(struct iommu_map_entry *entry, bool free) } void -dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free) +iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free) { struct dmar_domain *domain; struct dmar_unit *unit; @@ -898,15 +898,15 @@ dmar_domain_unload_emit_wait(struct dmar_domain *domain, } void -dmar_domain_unload(struct dmar_domain *domain, +iommu_domain_unload(struct iommu_domain *iodom, struct iommu_map_entries_tailq *entries, bool cansleep) { + struct dmar_domain *domain; struct dmar_unit *unit; - struct iommu_domain *iodom; struct iommu_map_entry *entry, *entry1; int error __diagused; - iodom = DOM2IODOM(domain); + domain = IODOM2DOM(iodom); unit = DOM2DMAR(domain); TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) { @@ -971,21 +971,3 @@ iommu_free_ctx(struct iommu_ctx *context) dmar_free_ctx(ctx); } - -void -iommu_domain_unload_entry(struct iommu_map_entry *entry, bool free) -{ - - dmar_domain_unload_entry(entry, free); -} - -void -iommu_domain_unload(struct iommu_domain *iodom, - struct iommu_map_entries_tailq *entries, bool cansleep) -{ - struct dmar_domain *domain; - - domain = IODOM2DOM(iodom); - - dmar_domain_unload(domain, entries, cansleep); -} diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h index 0ad94dbf4123..e49f96bf93e1 100644 --- a/sys/x86/iommu/intel_dmar.h +++ b/sys/x86/iommu/intel_dmar.h @@ -276,9 +276,6 @@ int dmar_move_ctx_to_domain(struct dmar_domain *domain, struct dmar_ctx *ctx); void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx); void dmar_free_ctx(struct dmar_ctx *ctx); struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, uint16_t rid); -void dmar_domain_unload_entry(struct iommu_map_entry *entry, bool free); -void dmar_domain_unload(struct dmar_domain *domain, - struct iommu_map_entries_tailq *entries, bool cansleep); void dmar_domain_free_entry(struct iommu_map_entry *entry, bool free); void dmar_dev_parse_rmrr(struct dmar_domain *domain, int dev_domain,