From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by mx.groups.io with SMTP id smtpd.web08.2936.1606782879743234332 for ; Mon, 30 Nov 2020 16:34:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=t5lMjCf9; spf=pass (domain: nuviainc.com, ip: 209.85.215.180, mailfrom: rebecca@nuviainc.com) Received: by mail-pg1-f180.google.com with SMTP id e23so130437pgk.12 for ; Mon, 30 Nov 2020 16:34:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iwv3mALmjDAo0MhwqdefD8YPQ2SZQ09Jw9Uha1MyoA0=; b=t5lMjCf9v5HRnjUZ8KiEFIYJEbhpga+LyvYiHPrz/CGcGCgsBFvLidDUTCTzt5gSxF CSPqkRvOQ3VffEl9K3ITNWDF9c1luVXbIhouHL1HFYOvJbcOp0xj7zjhSHeKgHwtbi/P eOjqLXwrwNj81Rs7/CgOwHEQn7FxBACfX+V+6bGi2ZTuPzRDTIHjhLbBlqiW3VqX8jxL lcRLg/2LnDN+/mWUZa02R0Eaf7qPQ0EyzAMk3nyv8XArAMhyKtW6oA+nQ9IrywPTiKyl eWD2BUSmuuVClLwyXEwpw4PyMt1mOH4QvEzHhh3Xf01tDfFPCi5GRlpDetRD83pDOYfR +taw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iwv3mALmjDAo0MhwqdefD8YPQ2SZQ09Jw9Uha1MyoA0=; b=T4h8TffI/FzpTnuA6qbDvN3hXgFLkav+rTo7NxZrtGH+I5OALtWiozEwwy+S0e/uWQ biP10ERhOejUhb0aw+1GutywuNeJisyztINeYAOvCjj99eTafxDyHXuWgkMInpXiQlxK wdbqRqSNcGujxGNQsXENNRQoKAkN83lkYp4CiECQYyH4xSh7bLuVPXimWVrtpo1yKOLm DNvzzgD76y4Fbgn3uizx6o0E3rvO8nedzXtp2Rmqz0cYZU5PXzMHJp3bmxe9Y+dQgkE/ Vec6qKPfCZKlHeZ35Bx1voKAsrAV9UxhjVqjuCMGJlomtsZKAkjZMkxx2XhKreB9Viz9 kuaQ== X-Gm-Message-State: AOAM532Y09ivovPwJIZUl/6fu3JqJo3PKP5YyIXFQLN0kaACraCUFUNv gEMan7SIuLy2mtRxRbphoXeV7lElqErRyC6vrgPd/g4e/2kADaPgyZPYwlALJj4AxWIeIC0AiHW WmYRUamsxCyA9M54PAwnADGNxDaolj5gjeYzVmPSoZZqe9qQv9OulfqV2riXgC6UvUoBHyhMy X-Google-Smtp-Source: ABdhPJzuUbAcHVhHYWq9nnwNiQjVppefo+s2k3P8fRkddH4BI9XEgf8r6f1PA+YE4Dn4YNguZmxBcg== X-Received: by 2002:a63:1057:: with SMTP id 23mr20576372pgq.41.1606782878583; Mon, 30 Nov 2020 16:34:38 -0800 (PST) Return-Path: 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 22sm57899pjb.40.2020.11.30.16.34.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 16:34:37 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Michael D Kinney , Liming Gao , Zhiguang Liu , Leif Lindholm , Ard Biesheuvel , Sami Mujawar Subject: [PATCH v4 05/11] ArmPkg: Add helper function to read the Memory Model Feature Register 4 Date: Mon, 30 Nov 2020 17:33:52 -0700 Message-Id: <20201201003358.8780-6-rebecca@nuviainc.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201003358.8780-1-rebecca@nuviainc.com> References: <20201201003358.8780-1-rebecca@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In AARCH32, CCIDX support is indicated in the MMFR4 register - unlike under AARCH64 where it's in MMFR2. Add a helper function to read it. Signed-off-by: Rebecca Cran --- ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h | 6 ++++++ ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S | 4 ++++ ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h index 93183e67230e..3b331a3b2088 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h +++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h @@ -48,5 +48,11 @@ ArmCleanInvalidateDataCacheEntryBySetWay ( IN UINTN SetWayFormat ); +UINT32 +EFIAPI +ArmReadIdMmfr4 ( + VOID + ); + #endif // __ARM_V7_LIB_H__ diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S index 01c91b10fcb7..a60a2f634132 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S +++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.S @@ -60,6 +60,10 @@ ASM_FUNC(ArmDisableInterrupts) isb bx LR +ASM_FUNC(ArmReadIdMmfr4) + mrc p15,0,r0,c0,c2,6 @ Read ID_MMFR4 Register + bx lr + // UINT32 // ReadCCSIDR ( // IN UINT32 CSSELR diff --git a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm index 26ffa331b929..1679b09b797a 100644 --- a/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm +++ b/ArmPkg/Library/ArmLib/Arm/ArmLibSupportV7.asm @@ -64,6 +64,10 @@ isb bx LR + RVCT_ASM_EXPORT ArmReadIdMmfr4 + mrc p15,0,r0,c0,c2,6 ; Read ID_MMFR4 Register + bx LR + // UINT32 // ReadCCSIDR ( // IN UINT32 CSSELR -- 2.26.2