From nobody Tue Feb 10 10:03:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+68393+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68393+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1607363693; cv=none; d=zohomail.com; s=zohoarc; b=ddHGzvse5ljihUSg7WfsShy0RRXQk7gkXMk67mUbMtot3giEkodCis6Mw4Rm5uOV+5Wi2jnokxw+Vmj8+ldRUcawpHVgehY4uuR7mWt273IzOtOAZaRIF1yTn/tvldNfRAm4UxWDt9SlPwLt+4M1xb4BNULO73P7r0no0S8BcSg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607363693; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=yO3aQT8X/OIxBy4OL3KbyAyjI6275E4FaJpO4DlwtfI=; b=jFUKe9cuwbcyzzl06mpCjslIVTncJJiOma0Ax4V4tBjEppZUu0YYVk4+E2HiG9u12dye2kMMhecKrEtxOuFtXQyP/n1CCOPB2tAWSz4ujQL0b8SijnUbge+CmYhNc7VzdVLigNXL57KgpjGG6So5qo4R8aJDEJ2AjyOID2zh6QQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+68393+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1607363693290662.6318381607643; Mon, 7 Dec 2020 09:54:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id IBdlYY1788612xmI6x0FJxQg; Mon, 07 Dec 2020 09:54:52 -0800 X-Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by mx.groups.io with SMTP id smtpd.web11.155.1607363689437649703 for ; Mon, 07 Dec 2020 09:54:49 -0800 X-Received: by mail-pj1-f65.google.com with SMTP id l23so44044pjg.1 for ; Mon, 07 Dec 2020 09:54:49 -0800 (PST) X-Gm-Message-State: YmXKcBfixak1Gm7zmD6bcancx1787277AA= X-Google-Smtp-Source: ABdhPJx4O//OBp3H7qHFl0yADir79zPS01SHsUw4jlh0VM0zXezhtt91L4fpDCoEFbVwrJXrpPFI6w== X-Received: by 2002:a17:90a:73c2:: with SMTP id n2mr3757764pjk.37.1607363688642; Mon, 07 Dec 2020 09:54:48 -0800 (PST) X-Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id nm6sm2369pjb.25.2020.12.07.09.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 09:54:48 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Michael D Kinney , Liming Gao , Zhiguang Liu , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH v4 07/10] ArmPkg: Fix the return type of the ReadCCSIDR function Date: Mon, 7 Dec 2020 10:54:24 -0700 Message-Id: <20201207175427.28712-8-rebecca@nuviainc.com> In-Reply-To: <20201207175427.28712-1-rebecca@nuviainc.com> References: <20201207175427.28712-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1607363692; bh=3/W/wr5su63uveMbai6Sj998/XXsC/QfhMrzS1A/WrA=; h=Cc:Date:From:Reply-To:Subject:To; b=mGlSdNx2jhM+UR44s0CtgipAhcs7EGzfLeMJ3faQMmxUAuFlIOwHzVd3QLYbYu46irj WJwd9aMwFrQ8JXMeO9gU0vQR4DEQ4oofmtUv8FJsfhm8KCZyStWkpV5qmkvAkUOBdsjwh sSkdlMbe4tvSbzIZPjdQJ9KllXxIj+rxBt0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" When CCIDX is supported, the Current Cache Size ID Register contains data above 32 bits: namely the number of sets. Avoid truncating this by returning a UINTN instead of UINT32. On AARCH32, the expanded number of sets data can be read via the CCSIDR2 register. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm Reviewed-by: Sami Mujawar --- ArmPkg/Library/ArmLib/ArmLibPrivate.h | 2 +- ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S | 2 +- ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ArmPkg/Library/ArmLib/ArmLibPrivate.h b/ArmPkg/Library/ArmLib/= ArmLibPrivate.h index 2e90739eb858..5eecbc0e1c43 100644 --- a/ArmPkg/Library/ArmLib/ArmLibPrivate.h +++ b/ArmPkg/Library/ArmLib/ArmLibPrivate.h @@ -61,7 +61,7 @@ CPSRRead ( VOID ); =20 -UINT32 +UINTN ReadCCSIDR ( IN UINT32 CSSELR ); diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S b/ArmPkg/Libra= ry/ArmLib/AArch64/ArmLibSupportV8.S index 0e8d21e2264f..0ae75e4cb9f9 100644 --- a/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S +++ b/ArmPkg/Library/ArmLib/AArch64/ArmLibSupportV8.S @@ -84,7 +84,7 @@ ASM_FUNC(ArmDisableAllExceptions) ret =20 =20 -// UINT32 +// UINTN // ReadCCSIDR ( // IN UINT32 CSSELR // ) diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm b/ArmPkg/Library= /ArmLib/Arm/ArmLibSupportV7.asm index 1679b09b797a..81f3cb79994c 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm +++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm @@ -68,7 +68,7 @@ mrc p15,0,r0,c0,c2,6 ; Read ID_MMFR4 Register bx LR =20 -// UINT32 +// UINTN // ReadCCSIDR ( // IN UINT32 CSSELR // ) --=20 2.26.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#68393): https://edk2.groups.io/g/devel/message/68393 Mute This Topic: https://groups.io/mt/78784069/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-