From nobody Sat May 18 18:13:08 2024 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+109330+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+109330+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1696444475; cv=none; d=zohomail.com; s=zohoarc; b=SKdokVIuu3BvYrf9IrL1HGRqwbMVUhN7QwLrUWyRDY440zeVpDN+YKfGg1M+72o61Pxzy227z6WQfbL3ZZJswT2odA41KECB8iTlcysxKYLHQOivJXYo1/kvY9p3rI5G/YUyCExPufc4ZmirJ74yWL1Ghjd/BybafZwCxMiZkSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696444475; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Sender:Subject:Subject:To:To:Message-Id; bh=cnQVYsBYf5qRpECO0X2sSBoxzu5Yt2P26v0BDDt+NT0=; b=R4fMVou81C7MjTrI9ayfQLWwrbR5fQS+SN2H3BnQP6riXC6WHwfKP7ZaRVwyc7OO2gQG+zE64qv00lJm6l7+xqvwxu5we1oUiQX0lJGB+kjGl4CGcvp/XwuF7DqxsUc3c3A2jE3IrnixWQlmJdvwQ8BFeP6ivW1RTZXJNTg/Cqo= 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+109330+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 169644447544396.46731472308784; Wed, 4 Oct 2023 11:34:35 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=ihdDwnEC9Mzpi4he/pGH6y+a/J6vZttvdMG2mb+WQPI=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1696444475; v=1; b=X2j+TWS3IKHX6Ql6qtRHm1S0o7Q0VYBqOmsNLf4FcvS9e2D1M7GVGkGhvFobnAO55V8Y/p/z S6iyVdp5IQwNogigoYuSuUSvi9y3g/Qv941osl5ckkDubUuL4ZOsecipaEiW+ditCJXa+Yfgd9H Qjg1THKSfJpA9uXFs1GuIRo8= X-Received: by 127.0.0.2 with SMTP id 0z0NYY1788612xas0lP77utK; Wed, 04 Oct 2023 11:34:35 -0700 X-Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.1422.1696444474413029117 for ; Wed, 04 Oct 2023 11:34:34 -0700 X-Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-692b2bdfce9so77807b3a.3 for ; Wed, 04 Oct 2023 11:34:34 -0700 (PDT) X-Gm-Message-State: aiBY4hNH3vEb8GAwXOmmVfCLx1787277AA= X-Google-Smtp-Source: AGHT+IGzLCOW1DpSFyu6jRkPAlSW6cHV/YjE15BmfzWGCMoIy1ERlVUtHSpHE2qoBXKpdlIu6waZ6g== X-Received: by 2002:a17:90a:4ec3:b0:274:84a2:f0d8 with SMTP id v3-20020a17090a4ec300b0027484a2f0d8mr3148167pjl.25.1696444473355; Wed, 04 Oct 2023 11:34:33 -0700 (PDT) X-Received: from localhost.localdomain (c-76-20-53-72.hsd1.ca.comcast.net. [76.20.53.72]) by smtp.gmail.com with ESMTPSA id b8-20020a17090a010800b00256799877ffsm2026752pjb.47.2023.10.04.11.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 11:34:32 -0700 (PDT) From: "Tuan Phan" To: devel@edk2.groups.io Cc: michael.d.kinney@intel.com, gaoliming@byosoft.com.cn, zhiguang.liu@intel.com, sunilvl@ventanamicro.com, git@danielschaefer.me, andrei.warkentin@intel.com, ardb+tianocore@kernel.org, eric.dong@intel.com, kraxel@redhat.com, rahul1.kumar@intel.com, ray.ni@intel.com, Tuan Phan , Dhaval Sharma Subject: [edk2-devel] [PATCH v2] UefiCpuPkg: RISC-V: MMU: Introduce a PCD for SATP mode Date: Wed, 4 Oct 2023 11:34:26 -0700 Message-Id: <20231004183426.5803-1-tphan@ventanamicro.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: 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,tphan@ventanamicro.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1696444477797100001 Content-Type: text/plain; charset="utf-8" Introduce a PCD to control the maximum SATP mode that MMU allowed to use. This PCD helps RISC-V platform set bare or minimum SATP mode during bring up to debug memory map issue. Signed-off-by: Tuan Phan Reviewed-by: Dhaval Sharma Reviewed-by: Sunil V L --- Changes: V2 - Changed default mode to SV57=20 UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.c | 6 +++++- UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.inf | 3 +++ UefiCpuPkg/UefiCpuPkg.dec | 8 ++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.c b/UefiCpu= Pkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.c index 9cca5fc128af..826a1d32a1d4 100644 --- a/UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.c +++ b/UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.c @@ -36,7 +36,7 @@ #define PTE_PPN_SHIFT 10 #define RISCV_MMU_PAGE_SHIFT 12 =20 -STATIC UINTN mModeSupport[] =3D { SATP_MODE_SV57, SATP_MODE_SV48, SATP_MO= DE_SV39 }; +STATIC UINTN mModeSupport[] =3D { SATP_MODE_SV57, SATP_MODE_SV48, SATP_MO= DE_SV39, SATP_MODE_OFF }; STATIC UINTN mMaxRootTableLevel; STATIC UINTN mBitPerLevel; STATIC UINTN mTableEntryCount; @@ -590,6 +590,10 @@ RiscVMmuSetSatpMode ( UINTN Index; EFI_STATUS Status; =20 + if (SatpMode > PcdGet32 (PcdCpuRiscVMmuMaxSatpMode)) { + return EFI_DEVICE_ERROR; + } + switch (SatpMode) { case SATP_MODE_OFF: return EFI_SUCCESS; diff --git a/UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.inf b/UefiC= puPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.inf index 9b28a98cb346..51ebe1750e97 100644 --- a/UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.inf +++ b/UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.inf @@ -25,3 +25,6 @@ =20 [LibraryClasses] BaseLib + +[Pcd] + gUefiCpuPkgTokenSpaceGuid.PcdCpuRiscVMmuMaxSatpMode ## CONSUMES diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec index 68473fc640e6..0b5431dbf70a 100644 --- a/UefiCpuPkg/UefiCpuPkg.dec +++ b/UefiCpuPkg/UefiCpuPkg.dec @@ -396,6 +396,14 @@ # @Prompt Access to non-SMRAM memory is restricted to reserved, runtime = and ACPI NVS type after SmmReadyToLock. gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmRestrictedMemoryAccess|TRUE|BOOLEAN|0= x3213210F =20 +[PcdsFixedAtBuild.RISCV64] + ## Indicate the maximum SATP mode allowed. + # 0 - Bare mode. + # 8 - 39bit mode. + # 9 - 48bit mode. + # 10 - 57bit mode. + gUefiCpuPkgTokenSpaceGuid.PcdCpuRiscVMmuMaxSatpMode|10|UINT32|0x60000021 + [PcdsDynamic, PcdsDynamicEx] ## Contains the pointer to a CPU S3 data buffer of structure ACPI_CPU_DA= TA. # @Prompt The pointer to a CPU S3 data buffer. --=20 2.25.1 -=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 (#109330): https://edk2.groups.io/g/devel/message/109330 Mute This Topic: https://groups.io/mt/101761642/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-