From nobody Sat May 07 09:25:50 2022 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 B11331ABAD88; Sat, 7 May 2022 09:25:50 +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 4KwMVk4cSZz4gbG; Sat, 7 May 2022 09:25:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651915550; 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=w0Z/JWrIZEA3jUnFyuE+odm8tFx5EXJOqo5yUWx3fMs=; b=a/2cKe0OZr0OBz4u5q5Qt1iceNCsPHvrsjGEc4/knLBrt5eQZUU7t/kZQp2HfQpveHCdzK J54DHAbfhXFsBdyxotUssGOrSrPZEMsie7FMCKInhCTmPqHCIe5GyVFVZORxckpJ08Uoat Ev8kw1KiD7KO8TN5eVn/vAOPZI1ucer/K253Z8emjbrpxvslCTancePdZ67Jw68kOFMGDm zL7Id+kSArXIfZc/X/dM/rxM+HtlvaFEH/Iiz9+csowVuG83pE5SZvvn1BHmQkhW0X23QB fLcl7f0zpae1rH86jkVOXoj1qCTPjRQEG471Vawh8p/HolrK1vS7QdJEoUO0VQ== 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 7EC9B5F9D; Sat, 7 May 2022 09:25:50 +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 2479Po2O088802; Sat, 7 May 2022 09:25:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2479PoVq088801; Sat, 7 May 2022 09:25:50 GMT (envelope-from git) Date: Sat, 7 May 2022 09:25:50 GMT Message-Id: <202205070925.2479PoVq088801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 6ff004272a1e - main - Return error code from IOMMU_MAP and fix build. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ff004272a1ebf4c326b2644a9e52e8c74a8254f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651915550; 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=w0Z/JWrIZEA3jUnFyuE+odm8tFx5EXJOqo5yUWx3fMs=; b=kkJ5ipGiaEt4vdkoenBb3cwH7c3tn4N/6XDplI9aj1C/zZYQ3ZxYzob5rNIZk6b2Ot+fUI iH/suWMLf8DkaDjzwLnSflBrBU/pMdw+OFiCahjx1XDB1LgMlqg/ETonLyd0AWTzhfiG89 9DXajZiDTvW+s3wCFPVlXsoslRRcQ9X/gPXGU/TkBUJm7q2o1vWrbo06+VUcawg1qpO8t2 5wcNfI+OM0hHQ5Xx6L/GKM75yutTwhSGtx3e62/RLvuEmvWJ4h4TzjPJcf90LLX3oPJ5ri n57Lb1vOiq4cmcF4zB2Ra45baXnBmMBiQMNsSs6RRfDwghakEqH60PaW+I44uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651915550; a=rsa-sha256; cv=none; b=Pbfb/5MM9o7eK0l7G8NxThlbM/e9rYNWoeIiykCcWJppa/1mBe/2ZwmN4nw+pM7KXZonwH il/igm60qZT5wXF3tY6ZwqBl3SsZbkoEUC3P/u4CMnpHRo/0m9gj+BQsWRn1S3yE49ACRR 69lhQ2JgTE1Dp9n++y4DVaPJ5ngiS14lLWF4ox0a6JRnRNP7iL0Qz5sbCLdmfSZJAEY6MD KQKeXFAAXWldtpvIptr2Ju93Ro5+fXs1EIkgV63RQqiZcs2ThcuQ+IKRzaUwG2ppuVR2TC f6aiZQRgCEp3cAKjFlz7YlduwTG0c5pMB/jyhLj7KS9FC04nu4pPzLMPhBiMFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=6ff004272a1ebf4c326b2644a9e52e8c74a8254f commit 6ff004272a1ebf4c326b2644a9e52e8c74a8254f Author: Ruslan Bukin AuthorDate: 2022-05-07 09:24:30 +0000 Commit: Ruslan Bukin CommitDate: 2022-05-07 09:24:30 +0000 Return error code from IOMMU_MAP and fix build. Sponsored by: UKRI --- sys/arm64/iommu/iommu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/arm64/iommu/iommu.c b/sys/arm64/iommu/iommu.c index 0fad03c7cd8e..e7f51e8693a1 100644 --- a/sys/arm64/iommu/iommu.c +++ b/sys/arm64/iommu/iommu.c @@ -112,7 +112,7 @@ iommu_domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, error = IOMMU_MAP(iommu->dev, iodom, va, ma, size, prot); - return (0); + return (error); } static const struct iommu_domain_map_ops domain_map_ops = { @@ -299,7 +299,9 @@ iommu_domain_unload(struct iommu_domain *iodom, struct iommu_map_entries_tailq *entries, bool cansleep) { struct iommu_map_entry *entry, *entry1; +#ifdef INVARIANTS int error; +#endif TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) { KASSERT((entry->flags & IOMMU_MAP_ENTRY_MAP) != 0,