From nobody Thu Dec 21 13:43:55 2023 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 4Sws8q4QlYz54pg5; Thu, 21 Dec 2023 13:43:55 +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 4Sws8q2qB2z4P8G; Thu, 21 Dec 2023 13:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703166235; 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=rX0nnBeO3OgmMkgPX40lyUYRO6MG2WHjn9qFQKKBJF4=; b=GJiGN6FmUPSEc1pHYi2ViFEAeFeIL6VInOMfMDmjDdIDgCR7FvkrUzTXN36DSXvzHpSmSz nSHJH0jkwqSLsqVqmMqVJgKp7W0osIx/yR6FSt0P5Ln7SIqJPavyne9r8qyCoHvneOXP+s h2DCE7jROHlyuEvrkPz5iiWzhj6GuwkGK1DS4I3f4KQoegtA32O8X4NrQ3oH0OynAoENdw DQm/nZI39Iyue4FWadJ98gH4J+a+r6g9Ye80lYGuYE0AhhKkGIBWsDKI/O37AwdNJZ8MTc AHfcxjXa4j01oIHzVPix5hRzDWxb9rPVUl+d5CnjpHRXx+/PXLKP7vFHxd0uew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703166235; a=rsa-sha256; cv=none; b=VzuvHgY5hxxiqZsXNpqkdaxfeg6HNiQqtwklmrYuz2/biwyvKZzHlLYpm+LEl7u+SiswXI Zf0ghnt67rk99JfX1RLsZexaZ8/4FbnP3ZMuSyOz+dHnbw5ZoiJMrw6kSS9xXAl1APeMdK k5AZDbnDjU2qwdyeaPKdtGtIdrLcTjAsKtuR06Gpqu7EZClYXrASzuQ+SNlwv+8HvW4wGC 68JrJgcUQ3eB9PZbModZl/oRdtG60TqPeAhZPoYQJajt8bAygwP2EcM0V/Bwe53snsJFBC 7c3kLMCuPZ5lBZaX/O0SYNjRuq53D9GUu0LXkokT+AQxRzsxcvHhxX8u9b6bhw== 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=1703166235; 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=rX0nnBeO3OgmMkgPX40lyUYRO6MG2WHjn9qFQKKBJF4=; b=paHVRMBRuz988BMNpPA9wAmgXgfkPb2CIPIjuxseJmYSKVr4i+Rc9vaqI2/bBpb06GbwND az6p+2KcPSg6J3T33PR4XiOZViPaNsYfuR3SQPgudwoI14ZC9C1LL5b2QqI1ZUHnNTDIdz Q3WEqubbU6NJV4g5zk+oJTyBWjZE+C6DhKs7wFSxuoC3C8cOrcMxAWqfjohChFl8biTJZ3 oSkelkYMcSd7g450YvVH5bxwkYXxpOPnMN4GMOm7/yB3VQoD9rmoktrIKg0i90mmQAuOHW EUVJpG7fPA8iVKN9MH8IhZ6thTu7f3R9C7Z1LrIkbcKKqKbb2lNey31eH9wBmw== 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 4Sws8q1wGkzb4L; Thu, 21 Dec 2023 13:43:55 +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 3BLDhtKR079909; Thu, 21 Dec 2023 13:43:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLDhtlO079906; Thu, 21 Dec 2023 13:43:55 GMT (envelope-from git) Date: Thu, 21 Dec 2023 13:43:55 GMT Message-Id: <202312211343.3BLDhtlO079906@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f056e19abe20 - stable/13 - arm: Simplify get_cachetype_cp15() 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f056e19abe20d14234e24d927a847ea6e2a90c42 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f056e19abe20d14234e24d927a847ea6e2a90c42 commit f056e19abe20d14234e24d927a847ea6e2a90c42 Author: Olivier Certner AuthorDate: 2023-10-13 12:22:14 +0000 Commit: Olivier Certner CommitDate: 2023-12-21 13:39:43 +0000 arm: Simplify get_cachetype_cp15() There's no point in setting 'arm_dcache_align_mask' before the function's end. Reviewed by: markj, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42261 (cherry picked from commit 1bce6f951a902f03bfb354f5b11473a0d12b3d7d) Approved by: markj (mentor) --- sys/arm/arm/cpufunc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index f2845eb80f3b..42f718b9773e 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -172,7 +172,6 @@ get_cachetype_cp15(void) : "=r" (csize)); arm_dcache_align = 1 << (CPUV7_CT_xSIZE_LEN(csize) + 4); - arm_dcache_align_mask = arm_dcache_align - 1; } if (type == CACHE_ICACHE || type == CACHE_SEP_CACHE) { sel = (i << 1) | 1; @@ -195,10 +194,10 @@ get_cachetype_cp15(void) if (dsize & CPU_CT_xSIZE_M) arm_dcache_align = 0; /* not present */ } - - out: - arm_dcache_align_mask = arm_dcache_align - 1; } + +out: + arm_dcache_align_mask = arm_dcache_align - 1; } /*