From nobody Thu Nov 16 20:54:41 2023 X-Original-To: dev-commits-src-all@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 4SWXN20QvMz5155S; Thu, 16 Nov 2023 20:54:42 +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 4SWXN174cLz4GrD; Thu, 16 Nov 2023 20:54:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700168082; 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=Y/L2vCGMLpYVq493T9/gFbMjIh7lgF2HZbtCjz1k8AI=; b=TnwHURTkFe4wWpf4/CzCph4kzKtftbN9SaL2czaYwC9T7cgfkF/j0lEIz6OAUtJVeG6JO7 nXrVI6fNUIBGEA+7t0XUx67pmwug5BRK6Kg3EN7IKdoi6vKDzpGFjyCjP2/67d56GaEBAR j3KzkgGLcYZA0wf4v4uRgbWLj57W9UuNBFmvJPsyQMP8S8iODghdk5qIi//0pAf47p/50u 9TL0XmDWm793nZzLxAlx8A3SwahRT84O9r0cuFIym/GHaCU/MHmZKrVp5bO22TUXSdHlvQ uhpuDX5uYDVqT8f/dBOdHAZ8utbOrDlnTCxB9Kd8aql/GB0qhNpe/Dqw3zEPHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700168082; 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=Y/L2vCGMLpYVq493T9/gFbMjIh7lgF2HZbtCjz1k8AI=; b=L04nFWsIAf2OwyidcI5IWP4VPGtWf6cVbdEmbrnmHpGhMBJSILzoGUvwCKp0RgX5OKietF PMpNaC00YYBl26PbpREoL1M2wmdLZdsduZMJ3tUj5Q6tnt3/wR91aq+TX11ft7L7oxQRd2 S+DhYEHlKRcAXqQ8iiYMaXneCT8wy2hHA61a2EhBTKtldb5TXH4jA1obDgN+gXEttIGu5h Mco7aM+5ZVbW4NKeoBCKm0VO/H0dgfRvgsRWnOquuNW8C+d1wI40zfEubwJZfJK/a+djKm u7jFshDplOxiDxSEJ5Tu0j+9o8UNsCU2C8Fly1GpdlI0v7tMPiQfJ4OEpwHNFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700168082; a=rsa-sha256; cv=none; b=FBs+/g4sZoDGkb2TPlxua2iFoHmzLqZtKhulHoNVTH1v7z8rDMZLxzfI4+WmLpuogvqnvh V/YSM8vX/2tAQfElFCa0lGACXFTrjESSfOq0XLcZh5KmxGk5VKpNHq5xl84JwFactl9Pdp KeJzK3MAT/3+jO5FMnJYdvW8a5n01cw5kOSDJl6QjjXI+xarL8ZwR5BCQV8PnLqaXW/pjB NQ1JGuif6NwTl6LZjvk8QLhKaeuWzm+4Ckn+CpQG6bHtLQpH00y9sSn/qEqoTdibQ9Ew52 VyfT3xTgIRtEpfsmTtZDI0KP7Nu3L4Mjh4bxiZ/GEgWGHLJLdvqMv91iakJjeQ== 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 4SWXN1696Zz1KX; Thu, 16 Nov 2023 20:54:41 +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 3AGKsfLh053753; Thu, 16 Nov 2023 20:54:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGKsfEr053750; Thu, 16 Nov 2023 20:54:41 GMT (envelope-from git) Date: Thu, 16 Nov 2023 20:54:41 GMT Message-Id: <202311162054.3AGKsfEr053750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0c7a1e66f137 - stable/14 - arm: Simplify get_cachetype_cp15() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0c7a1e66f1376bf8ffb507a674396e4d221fe797 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0c7a1e66f1376bf8ffb507a674396e4d221fe797 commit 0c7a1e66f1376bf8ffb507a674396e4d221fe797 Author: Olivier Certner AuthorDate: 2023-10-13 12:22:14 +0000 Commit: Mark Johnston CommitDate: 2023-11-16 15:07:13 +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 MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42261 (cherry picked from commit 1bce6f951a902f03bfb354f5b11473a0d12b3d7d) --- 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; } /*