From nobody Thu Mar 16 16:46:08 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 4PctSJ4phnz3yK8P; Thu, 16 Mar 2023 16:46:08 +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 4PctSJ4Jmmz3n2w; Thu, 16 Mar 2023 16:46:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678985168; 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=ao0ljGAmdL07Uvnj7bFspwsZh6rw/LbMYcWubE/7ndc=; b=p4FmhF99OzAmG2Yv4eUxrDRIJw1n8LWFGHK8ggCacSFGA3pWad9WDqaEoOChafyoPe0fp/ W7OmcyYcxrzaL59H513ULCDLhl7eCZ1yB4Kzibp8RXGzcaJnO/9W5ibXKqUuERQX1r5Aml oF73wRG7ZeB+5GX6urtnEgWXEKoP++DfIauuUIORfJNmbQlPPUuJVK5A+Qa44F3oOW1rMz ObpQnGo410RsLSP6yYuUqXOjnP0oF32tyihEyKUIK1B+AkACne5n0DsrzQ9HTkfMLZOwsd JI9tr5Mb6KNz3crnJiYDALH6gXSlt8tu0VZ2kclALbXWjp3Aw2S6ANZzRlp6zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678985168; 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=ao0ljGAmdL07Uvnj7bFspwsZh6rw/LbMYcWubE/7ndc=; b=VQXEKqzwK6SlJwTydtrnLIeEsLYde5sv7pWLgdQ1yE/h98G/gskOAHFmncZLKKvm0YSm1h LwkUcq8amITFa5i1S0oJhFOm/MVRvf8y4F/n+S7pjLkGuHYWaROjjPv5Qohmb39cyk/V1Z JUu6XJxA5D6RbLRvd+38Qn2G+jUgNJFldboUFgTCfPqRbLCXfZ8P4yOz6Y/6BVPunTd6GZ sMQ97IKZE9QfTrRvep5g5eeiJVS9aO16JN3If9VUQIFn3NblQUyLEfdyVru3l4niACMfoJ A/q+T5P/zVkor96W/VZsiJFgVCWEIhauN/CR5PCTUifw2O6H1WqeaLdj1DJJmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678985168; a=rsa-sha256; cv=none; b=HIx1GGgG4CWfSzahKcQQ2MsKyrwwUcq190DOgEcTZ4UEV9YUmB149DqpWabowlmIyT25nV d54uR548io7mDF8izok3HLAXma2qt1TJXtYdj86JQ7KqCXceG2rM4VC4j6LpuM5P2wx4Qn qYm33hDtD2vLIDUnP4N6lFkKqpeGnQJPm5q0ulUvaf2wzM2uXSPA73cIKwLmcIXbvavWvR 4O9KS4788xHfcmXanvi+4kHnI2eYgqu8IMzlqhnc6esdfoWJWdgchLa2I9C62qOFb8xB0N Y1O+arj3SanQEuXZwekK/cJ0MYJws3qREAe5wLznvCvV0DKMZJQ6JAzkeg1q4Q== 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 4PctSJ2z4XzrHx; Thu, 16 Mar 2023 16:46:08 +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 32GGk87p022216; Thu, 16 Mar 2023 16:46:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32GGk80T022215; Thu, 16 Mar 2023 16:46:08 GMT (envelope-from git) Date: Thu, 16 Mar 2023 16:46:08 GMT Message-Id: <202303161646.32GGk80T022215@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: 9a5dddc94f5c - main - Remove unneeded arm64 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: 9a5dddc94f5cc5bd3c213f4afe2b147078e3bb6c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9a5dddc94f5cc5bd3c213f4afe2b147078e3bb6c commit 9a5dddc94f5cc5bd3c213f4afe2b147078e3bb6c Author: Andrew Turner AuthorDate: 2023-03-16 15:34:59 +0000 Commit: Andrew Turner CommitDate: 2023-03-16 16:45:42 +0000 Remove unneeded arm64 smmu macros These aren't used by the driver so can be removed. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D38950 --- sys/arm64/iommu/iommu_pte.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/arm64/iommu/iommu_pte.h b/sys/arm64/iommu/iommu_pte.h index 99f1ca30ec55..88800c15ba42 100644 --- a/sys/arm64/iommu/iommu_pte.h +++ b/sys/arm64/iommu/iommu_pte.h @@ -45,7 +45,6 @@ /* Level 1 table, 1GiB per entry */ #define IOMMU_L1_SHIFT 30 #define IOMMU_L1_SIZE (1 << IOMMU_L1_SHIFT) -#define IOMMU_L1_OFFSET (IOMMU_L1_SIZE - 1) #define IOMMU_L1_INVAL IOMMU_L0_INVAL #define IOMMU_L1_BLOCK 0x1 #define IOMMU_L1_TABLE IOMMU_L0_TABLE @@ -53,17 +52,13 @@ /* Level 2 table, 2MiB per entry */ #define IOMMU_L2_SHIFT 21 #define IOMMU_L2_SIZE (1 << IOMMU_L2_SHIFT) -#define IOMMU_L2_OFFSET (IOMMU_L2_SIZE - 1) #define IOMMU_L2_INVAL IOMMU_L1_INVAL #define IOMMU_L2_BLOCK IOMMU_L1_BLOCK #define IOMMU_L2_TABLE IOMMU_L1_TABLE -#define IOMMU_L2_BLOCK_MASK UINT64_C(0xffffffe00000) - /* Level 3 table, 4KiB per entry */ #define IOMMU_L3_SHIFT 12 #define IOMMU_L3_SIZE (1 << IOMMU_L3_SHIFT) -#define IOMMU_L3_OFFSET (IOMMU_L3_SIZE - 1) #define IOMMU_L3_SHIFT 12 #define IOMMU_L3_INVAL 0x0 /* 0x1 is reserved */