From nobody Thu Nov 02 13:40:07 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 4SLlP402Xfz50Lrj; Thu, 2 Nov 2023 13:40: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 4SLlP343Nmz4P6w; Thu, 2 Nov 2023 13:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932407; 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=FBH3RDTeuiCSuS+08K+Yed46V37QM2eKCY5243Il8P4=; b=KgVXa9h1Ra+iezwQzJ/BG4YnqUCkpJVT34OhSgozOuOvUUo+q6XGXdGp/NgdYwOK6ilLXY 5rbzuUiaVNc5nXvGincgaRDhPa45jXPwUuhrXuqUbE3/V3LVPzh+Pp/yQz6m0lrETOVozt ajtXKTHPnHVsL9AFKSTJdcKl/aDRoll4cMiXIdasnxto1OSbogPDEn9WXnh56c/Zo5UsZ2 rNXrlKzePwJgNbPxehaITCKzCTyedkyxZ7m7FYPjCyWIijQcg6jnDhk/VzY6z+oXO+dThh HbE1055V9jyE0KRezSalKiONc+ubzjnNZwK/ADxPmK5c603RKTerx4ISZeFDyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698932407; 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=FBH3RDTeuiCSuS+08K+Yed46V37QM2eKCY5243Il8P4=; b=M+qpulpW0XqXIrCibaQJfmjvJInoWy5mbNvX4VBDizCbbbWleghsFheEnE8lxMd0ja/Z+j ZylX0jEP81zZF5qkfmRxm/1zYiY/4/rCt2hPj/kIfPZ33cJ0ulKw7PaGXjthgrtObTFy0J yRePhFWlmxbuMdjlUr1sqRyZtg2nJ07eXr5U/vzZrRAg8quOv1ihPG2VWVulOzY+O5abZh L9c2Wiw8fWjBoKfOzHxSEKzM9aftwNP/g8c2/fZPU3PW9uZPwScwu9fWlrb5WqwB+4boo9 Y2liXT6+7+Zvqdks+hVPtf75++wjeBaytU6uHusFIb3ucNFxcYJCi2hZOS+7Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698932407; a=rsa-sha256; cv=none; b=OP7liYBp4u4yBzAxWW1ducwsdEQyYJ3yTJDE5KlzvmNAeoSMpE42erFs18mzQc7Ce+a0lD 1Yfwd3H0NZ6uJlcZe12zb6+5U23B01/Ga37w5Xjh9/pBli0JP+QRTuLBz/DlCGbFN+jRfq 8xInQCU5t2iWf+5+Rz7qbO80HSRvUZFIHu6bm3cpmhjz3U5t2f4WBzxtzeTeVaBNdeluRR Rob0khm7E4fVw7YiFoFYLi16vJXIPonlDS6XF/Zvxv6kIGiUSiCGMRe9uttdd1Rl8JMP62 IWxyUOXflSW8XloJ44wxyP5JDuQ/QtBltRKoWjOWdLs3CfLXSoa4drKxddbf6w== 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 4SLlP3380LzWvT; Thu, 2 Nov 2023 13:40:07 +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 3A2De7uC028466; Thu, 2 Nov 2023 13:40:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A2De7JH028462; Thu, 2 Nov 2023 13:40:07 GMT (envelope-from git) Date: Thu, 2 Nov 2023 13:40:07 GMT Message-Id: <202311021340.3A2De7JH028462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1bce6f951a90 - main - arm: Simplify get_cachetype_cp15() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bce6f951a902f03bfb354f5b11473a0d12b3d7d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1bce6f951a902f03bfb354f5b11473a0d12b3d7d commit 1bce6f951a902f03bfb354f5b11473a0d12b3d7d Author: Olivier Certner AuthorDate: 2023-10-13 12:22:14 +0000 Commit: Mark Johnston CommitDate: 2023-11-02 13:30:03 +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 --- 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; } /*