From nobody Mon Apr 24 11:52:13 2023 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 4Q4k5B26xQz46kMH; Mon, 24 Apr 2023 11:52:14 +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 4Q4k5B1C41z3jNw; Mon, 24 Apr 2023 11:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682337134; 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=nu1mmYlNQcb/Lc6EO7EUJwB/PBrtNZX27J80TFOJ6n4=; b=n1jIw+W3KsPfTE8CzbUzL83BFjdWEDxZMpv5TYRjnj4GfntFMPxFvII6tyobyTzw63f9pv REmrN3cvsfr/N1nH7V+UupJFiqVSyC4WlMTgpDO2m4WA+iCMvgiQqP9RjNGky1MUQZ+tBE PmsvlGiphHRH9o3irruoP9BtqYw8dRQuFu9Wn4f5ix7fEw0KHN+IhRP+bycAFJV4NEJ2Fm +E666hXW2745owUNefau/PhXzjXL7LQKuU/GWek/91TUvrG8M9BT50o11Xv7XkX+InTLnH JviV3C2HO+BrebM2rgI/r8CUcwQdPhcRLUPUduegnoXstYAUbbVyv5pZgHZiIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682337134; 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=nu1mmYlNQcb/Lc6EO7EUJwB/PBrtNZX27J80TFOJ6n4=; b=bkp2dHq+33xHZLaxH7Lw/0EpL+bsx3OIn+9l7vwPJRe5DxsQaE9q+iTj+WNdWefBh1IhE2 4RA4PbEqWDx1cXg3An7eXc+c8GzjDOY9EcLCD3kgG4RpJ48g+VOqe72P7hfgVFvxM1fSh3 OYsLVxevbpfufqeLknOB/KaaOzQXVeLWHxrImpiuW+KAeWeyn4qxj0ELq9ciyhtwctWO0R MYZ0YYCgdnuhWj+cgHf+WkLCcsq63gw9j2V2hGzkkUHPcNob1WSLOR7zW90wwvDe8HLRGY dZ28fmP4q+xCCgFZ21PqdzGFanjqGShL+4qsuglXlkvZUcN3uxBn0PVx9vLoiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682337134; a=rsa-sha256; cv=none; b=STTM6ZefSIJ0EbspFAexXsbEpabngx/Y0ZNPRcs6Y7xVjB5ZQY4ElDd/QIe3yMMSBsui2s chSElV8Z61X8Y0YIxoJoWZLMz5vxb9ITKdoslvj1fzI1uQyJ+Q/OWeQBINgwanctKtzi1L HGtMRUy1S4oBWnIygs6UuMYrQBe8mvMYhIOi+ShEX1dddGc0NvmqxEevFE1fEa323mpZW8 pY+WC3SZfbyW914hs1wt9erLgVh2yW70IJZDjx/5IBpKz63tR/iBoVNymEBE50am4Ebvoa hA4I8Zib4r84CEDuyB3t46PeZ1L6tt/imEdOO5LeeJmk9Iw7o2aUG8zSpJfAmA== 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 4Q4k5B0DP3zPKp; Mon, 24 Apr 2023 11:52:14 +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 33OBqDsi003253; Mon, 24 Apr 2023 11:52:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OBqDSp003252; Mon, 24 Apr 2023 11:52:13 GMT (envelope-from git) Date: Mon, 24 Apr 2023 11:52:13 GMT Message-Id: <202304241152.33OBqDSp003252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c3785c3eb0e3 - main - Remove unneeded SMMU macros 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3785c3eb0e3971a366ff4ee1e264ab316eb191f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c3785c3eb0e3971a366ff4ee1e264ab316eb191f commit c3785c3eb0e3971a366ff4ee1e264ab316eb191f Author: Andrew Turner AuthorDate: 2023-04-24 11:48:01 +0000 Commit: Andrew Turner CommitDate: 2023-04-24 11:48:01 +0000 Remove unneeded SMMU macros Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D39186 --- sys/arm64/iommu/iommu_pte.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/arm64/iommu/iommu_pte.h b/sys/arm64/iommu/iommu_pte.h index 88800c15ba42..5ddbc487642b 100644 --- a/sys/arm64/iommu/iommu_pte.h +++ b/sys/arm64/iommu/iommu_pte.h @@ -35,8 +35,6 @@ /* Level 0 table, 512GiB per entry */ #define IOMMU_L0_SHIFT 39 -#define IOMMU_L0_SIZE (1ul << IOMMU_L0_SHIFT) -#define IOMMU_L0_OFFSET (IOMMU_L0_SIZE - 1ul) #define IOMMU_L0_INVAL 0x0 /* An invalid address */ /* 0x1 Level 0 doesn't support block translation */ /* 0x2 also marks an invalid address */ @@ -44,14 +42,12 @@ /* Level 1 table, 1GiB per entry */ #define IOMMU_L1_SHIFT 30 -#define IOMMU_L1_SIZE (1 << IOMMU_L1_SHIFT) #define IOMMU_L1_INVAL IOMMU_L0_INVAL #define IOMMU_L1_BLOCK 0x1 #define IOMMU_L1_TABLE IOMMU_L0_TABLE /* Level 2 table, 2MiB per entry */ #define IOMMU_L2_SHIFT 21 -#define IOMMU_L2_SIZE (1 << IOMMU_L2_SHIFT) #define IOMMU_L2_INVAL IOMMU_L1_INVAL #define IOMMU_L2_BLOCK IOMMU_L1_BLOCK #define IOMMU_L2_TABLE IOMMU_L1_TABLE