From nobody Sat May 18 12:05:11 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+74855+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+74855+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620633218; cv=none; d=zohomail.com; s=zohoarc; b=XgqnvncdPuyXuWKTf/cqu2Ue3zZvZiTK8vcbWgwIC371QUfeZTD0faRLWUW/niVBAIl60EOzUDuaMjgLzCvFUpWUNQcLzAeBC5/dWDDqx87Tigm+wGVY3qCyWcD2xqje5fthufN8j9PlSpAcGKBq4ltmzoRB0p/nlVHu6zx1cZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620633218; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=sErUCBq1zpQ2O46dZe2GrOT42MFJi+AgYLu2GUgY3wE=; b=eowf7WbgwDdlMelmQdGVI+jGmLCSRT6yB0qhn2OWOKCAdd70TLg5TqppqapXKz0xiPcGYBejbDugl+oaH4KRQie3hSx7AiEMAV36ayGNyuRt8p9/G7D1UDE9xEY6LDXh9PwQxd4h4E3fBPm6/C6UCihwDTM9Aq8BcevInLoT68s= 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+74855+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1620633218177486.8287744095993; Mon, 10 May 2021 00:53:38 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id XaWtYY1788612xb5WFeCyQ1h; Mon, 10 May 2021 00:53:37 -0700 X-Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web08.28714.1620633210333224447 for ; Mon, 10 May 2021 00:53:30 -0700 X-Received: by mail-wr1-f41.google.com with SMTP id m9so15539360wrx.3 for ; Mon, 10 May 2021 00:53:30 -0700 (PDT) X-Gm-Message-State: zvNhtIFfhFtasBCgCjhUbtWgx1787277AA= X-Google-Smtp-Source: ABdhPJyCC9a4pAHSctwtNoAxJ7g5vkQuOaCKZGpxfuhTEBqVu1S3pynoGGWWRVqwuTpUTCDBBE44xw== X-Received: by 2002:adf:c541:: with SMTP id s1mr28511871wrf.370.1620633208807; Mon, 10 May 2021 00:53:28 -0700 (PDT) X-Received: from lmecxl0524.home (2a01cb058b850800452ff0effb46d5f4.ipv6.abo.wanadoo.fr. [2a01:cb05:8b85:800:452f:f0ef:fb46:d5f4]) by smtp.gmail.com with ESMTPSA id o13sm18237660wmh.34.2021.05.10.00.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 00:53:28 -0700 (PDT) From: "Etienne Carriere" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Ilias Apalodimas , Leif Lindholm , Sami Mujawar , Sughosh Ganu , Thomas Abraham , Etienne Carriere Subject: [edk2-devel] [edk2-platforms][PATCH 1/4] sync with edk2 where StandaloneMmCpu moved to AArch64/ parent directory Date: Mon, 10 May 2021 09:53:01 +0200 Message-Id: <20210510075304.9125-2-etienne.carriere@linaro.org> In-Reply-To: <20210510075304.9125-1-etienne.carriere@linaro.org> References: <20210510075304.9125-1-etienne.carriere@linaro.org> Precedence: Bulk List-Unsubscribe: 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,etienne.carriere@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1620633217; bh=ZnHl1Mue6UL0U+B5sDi/i3vSMEHIlvAwgbTfX8NHiAQ=; h=Cc:Date:From:Reply-To:Subject:To; b=Q3UqWMaYqe0bkxzEPwd+VZPMx0cCih/K+4A7lM0t88qEcws9nepwnHBjCKXbTPL9YGT 1DBd9xpueg1ibzyM5XQ/yc6WqSksBUeQhR/tkKu0xIw+UuScyEu48sP3Ceoo+Ra2WO8sT uogzUs89fZJCVqSgQ68h/h6PVQuuGoxokyM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Synchronize with edk2 package where StandaloneMmCpu component has moved from StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf to StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf Cc: Ard Biesheuvel Cc: Ilias Apalodimas Cc: Leif Lindholm Cc: Sami Mujawar Cc: Sughosh Ganu Cc: Thomas Abraham Signed-off-by: Etienne Carriere Acked-by: Ard Biesheuvel Reviewed-by: Sami Mujawar --- Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc = | 2 +- Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf = | 2 +- Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc = | 2 +- Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf = | 2 +- Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc= | 2 +- Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.fdf= | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc b/Platform/ARM/Sg= iPkg/PlatformStandaloneMm.dsc index e281d54909..1e0af23711 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.dsc @@ -122,7 +122,7 @@ StandaloneMmPkg/Core/StandaloneMmCore.inf =20 [Components.AARCH64] - StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf =20 ##########################################################################= ######################### # diff --git a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf b/Platform/ARM/Sg= iPkg/PlatformStandaloneMm.fdf index 5a0772cd85..96b4272dd6 100644 --- a/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf +++ b/Platform/ARM/SgiPkg/PlatformStandaloneMm.fdf @@ -49,7 +49,7 @@ READ_LOCK_CAP =3D TRUE READ_LOCK_STATUS =3D TRUE =20 INF StandaloneMmPkg/Core/StandaloneMmCore.inf - INF StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + INF StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf =20 ##########################################################################= ###### # diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc b/Platform/= Socionext/DeveloperBox/DeveloperBoxMm.dsc index e078de4bbb..b5524f87a6 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.dsc @@ -80,7 +80,7 @@ gEfiMdePkgTokenSpaceGuid.PcdMaximumGuidedExtractHandler|0x2 } =20 - StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006StandaloneMm.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandalon= eMm.inf MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf { diff --git a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf b/Platform/= Socionext/DeveloperBox/DeveloperBoxMm.fdf index 33de03c8e7..89453477c9 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf +++ b/Platform/Socionext/DeveloperBox/DeveloperBoxMm.fdf @@ -111,7 +111,7 @@ READ_LOCK_STATUS =3D TRUE INF Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/Fip006StandaloneMm.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStand= aloneMm.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf - INF StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + INF StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf =20 ##########################################################################= ###### # diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandalo= neMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStanda= loneMmRpmb.dsc index f99a47ebf6..cb3f1ddf52 100644 --- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpm= b.dsc +++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpm= b.dsc @@ -133,7 +133,7 @@ # Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFv.inf StandaloneMmPkg/Core/StandaloneMmCore.inf - StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandalon= eMm.inf { NULL|Drivers/OpTee/OpteeRpmbPkg/FixupPcd.inf diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandalo= neMmRpmb.fdf b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStanda= loneMmRpmb.fdf index e175dc7b2d..c4295a3e63 100644 --- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpm= b.fdf +++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpm= b.fdf @@ -68,7 +68,8 @@ READ_LOCK_STATUS =3D TRUE INF Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFv.inf INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStand= aloneMm.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf - INF StandaloneMmPkg/Drivers/StandaloneMmCpu/AArch64/StandaloneMmCpu.inf + INF StandaloneMmPkg/Drivers/StandaloneMmCpu/StandaloneMmCpu.inf + ##########################################################################= ###### # # Rules are use with the [FV] section's module INF type to define --=20 2.17.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 (#74855): https://edk2.groups.io/g/devel/message/74855 Mute This Topic: https://groups.io/mt/82714632/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- From nobody Sat May 18 12:05:11 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+74856+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+74856+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620633218; cv=none; d=zohomail.com; s=zohoarc; b=XVSYvwN5i2j5J1pKsIE3Rs+GB83WxqXW9/M7upGkGlwkkVR/kCKjU1iz+rn5t4JE2twZoPBWC0OvPGKkYCBQqsJR0Cw8/IML/5DZmwB31zdU9yvI5OTQKu4jjp4UXeaYOL3C9SK3OJnDKwfyGsg7cuui76aV84SOCqTHOC95kEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620633218; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=PulXXFihbgbVh5XxC27JiYDHvC0JbcYOwKVOE5OadeI=; b=iM/mgcYRmLBeWlECfJ0Qq3U0dhskPIzBHLumVMhVtNSPpZC8y4XceJYmJcMKrTErL/o8qjIHtJfNv4EBnrZkF0zasvpLS5F0uJMzcKHIkUg5JyAIFpZ2+3GFoC55daAKOt9bONwDzssBd2sGfiQxXw7JgTkIoVa4Agh0OUfQOgs= 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+74856+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1620633218653573.8545254824801; Mon, 10 May 2021 00:53:38 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UXHuYY1788612xe2ucDlRB3V; Mon, 10 May 2021 00:53:38 -0700 X-Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.28613.1620633210967283213 for ; Mon, 10 May 2021 00:53:31 -0700 X-Received: by mail-wr1-f47.google.com with SMTP id l14so15532278wrx.5 for ; Mon, 10 May 2021 00:53:30 -0700 (PDT) X-Gm-Message-State: RaVwkqkWMXbP5YEsvxomzzG1x1787277AA= X-Google-Smtp-Source: ABdhPJxqj0ZLHubmggcr4BZD8Tzd2WXIypwJZKvLFKRjIPqotiwXfbdZAQlCV6ieuXb+JLrruErQpA== X-Received: by 2002:adf:fd0d:: with SMTP id e13mr29162394wrr.56.1620633209447; Mon, 10 May 2021 00:53:29 -0700 (PDT) X-Received: from lmecxl0524.home (2a01cb058b850800452ff0effb46d5f4.ipv6.abo.wanadoo.fr. [2a01:cb05:8b85:800:452f:f0ef:fb46:d5f4]) by smtp.gmail.com with ESMTPSA id o13sm18237660wmh.34.2021.05.10.00.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 00:53:29 -0700 (PDT) From: "Etienne Carriere" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Ilias Apalodimas , Leif Lindholm , Sami Mujawar , Sughosh Ganu , Thomas Abraham , Etienne Carriere Subject: [edk2-devel] [edk2-platforms][PATCH 2/4] Drivers/OpTee: Add Aarch32 SVC IDs for 32bit Arm targets Date: Mon, 10 May 2021 09:53:02 +0200 Message-Id: <20210510075304.9125-3-etienne.carriere@linaro.org> In-Reply-To: <20210510075304.9125-1-etienne.carriere@linaro.org> References: <20210510075304.9125-1-etienne.carriere@linaro.org> Precedence: Bulk List-Unsubscribe: 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,etienne.carriere@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1620633218; bh=6McoheS+QAaO9+zgBs71J9iGmfW7Ph89UhzbAhmSLPA=; h=Cc:Date:From:Reply-To:Subject:To; b=qw2q59hdVOwjZkShgTfaFVNw0pZpnynP1mu3QO6ofCGTF1w1MYvwsGAPmp/P84gfvXE Gi/hI/xui1yLlDGB/kTY9LBZQ15w1gzxXtH8C+ck5C07QGTngnwMXZlOYVrP2nf/LtBJb qE3Gm2PeDA6vnlvsnm2NACUVWZ7chK1Ial0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add SMCCC function IDs for RPMB read/write service on 32bit architectures. Define generic SP_SVC_RPMB_READ/SP_SVC_RPMB_WRITE IDs for native target architecture (32b or 64b). Changes OpTeeRpmbFvb.c to use architecture agnostic macro ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ for 32b and 64b support. Cc: Ard Biesheuvel Cc: Ilias Apalodimas Cc: Leif Lindholm Cc: Sami Mujawar Signed-off-by: Etienne Carriere Acked-by: Ard Biesheuvel Reviewed-by: Sami Mujawar --- Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c | 2 +- Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.h | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c b/Drivers/OpTee/Opte= eRpmbPkg/OpTeeRpmbFvb.c index 5197c95abd..6eb19bed0e 100644 --- a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c +++ b/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c @@ -68,7 +68,7 @@ ReadWriteRpmb ( =20 ZeroMem (&SvcArgs, sizeof (SvcArgs)); =20 - SvcArgs.Arg0 =3D ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ_AARCH64; + SvcArgs.Arg0 =3D ARM_SVC_ID_FFA_MSG_SEND_DIRECT_REQ; SvcArgs.Arg1 =3D mStorageId; SvcArgs.Arg2 =3D 0; SvcArgs.Arg3 =3D SvcAct; diff --git a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.h b/Drivers/OpTee/Opte= eRpmbPkg/OpTeeRpmbFvb.h index c17fc287ef..bf4a39b9db 100644 --- a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.h +++ b/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.h @@ -13,8 +13,20 @@ contract between OP-TEE and EDK2. For more details check core/arch/arm/include/kernel/stmm_sp.h in OP-TEE **/ -#define SP_SVC_RPMB_READ 0xC4000066 -#define SP_SVC_RPMB_WRITE 0xC4000067 +#define SP_SVC_RPMB_READ_64 0xC4000066 +#define SP_SVC_RPMB_WRITE_64 0xC4000067 + +#define SP_SVC_RPMB_READ_32 0x84000066 +#define SP_SVC_RPMB_WRITE_32 0x84000067 + +#ifdef MDE_CPU_AARCH64 +#define SP_SVC_RPMB_READ SP_SVC_RPMB_READ_64 +#define SP_SVC_RPMB_WRITE SP_SVC_RPMB_WRITE_64 +#endif +#ifdef MDE_CPU_ARM +#define SP_SVC_RPMB_READ SP_SVC_RPMB_READ_32 +#define SP_SVC_RPMB_WRITE SP_SVC_RPMB_WRITE_32 +#endif =20 #define FLASH_SIGNATURE SIGNATURE_32 ('r', 'p', 'm', 'b') #define INSTANCE_FROM_FVB_THIS(a) CR (a, MEM_INSTANCE, FvbProtocol, \ --=20 2.17.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 (#74856): https://edk2.groups.io/g/devel/message/74856 Mute This Topic: https://groups.io/mt/82714633/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- From nobody Sat May 18 12:05:11 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+74857+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+74857+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620633218; cv=none; d=zohomail.com; s=zohoarc; b=TXsk7QtCMMMWIFkBONYFlpNUE/0Y0yiR0zZtg+5dH/9X6Q6C6k2jToYn9cithO30DYc2lSnjq095KDD4FRlioh6XwZpUyQn6P621Ozxpy6iwtNBbDYkzAIzoJrfFLb5Vl8A/8Q4IkkO1xxtRW4qVFNRZZH9NF8ZsIIzRHOiJmn4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620633218; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=LlcNhCnytEkxzvfqgTvINNLlltCa9nJvPNpsJcCoP4U=; b=n6udPSWuKmv1paxTKdzochDupbF2xtZXSPeKloTLp9b3OjCqSJDLea/QljAvdIq8cFHGhxnVtQybyvkbrDQApEt8WfcwIU8dG0Hrdxt5gjwKYzQVp4ynAZEslEjk8S+RGaIrI9rnXh+2UrFy+pyIhPgJpRSbPmzvU26gSCYiEo0= 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+74857+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1620633218951769.4512007200493; Mon, 10 May 2021 00:53:38 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6E3MYY1788612xJfIlzmfukX; Mon, 10 May 2021 00:53:38 -0700 X-Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web10.28614.1620633211534822794 for ; Mon, 10 May 2021 00:53:31 -0700 X-Received: by mail-wm1-f50.google.com with SMTP id s5-20020a7bc0c50000b0290147d0c21c51so8290659wmh.4 for ; Mon, 10 May 2021 00:53:31 -0700 (PDT) X-Gm-Message-State: Tu10q6VxZElzAMb0lAKJHsQ0x1787277AA= X-Google-Smtp-Source: ABdhPJx9CFO76TZ6yWx07KE0oDYiSaYRoDp5YvnLdU2IdfqLfcR+OyAPn/GPUoBIm38Gh5TyJyPUCQ== X-Received: by 2002:a7b:cbc2:: with SMTP id n2mr24829341wmi.69.1620633209991; Mon, 10 May 2021 00:53:29 -0700 (PDT) X-Received: from lmecxl0524.home (2a01cb058b850800452ff0effb46d5f4.ipv6.abo.wanadoo.fr. [2a01:cb05:8b85:800:452f:f0ef:fb46:d5f4]) by smtp.gmail.com with ESMTPSA id o13sm18237660wmh.34.2021.05.10.00.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 00:53:29 -0700 (PDT) From: "Etienne Carriere" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Ilias Apalodimas , Leif Lindholm , Sami Mujawar , Sughosh Ganu , Thomas Abraham , Etienne Carriere Subject: [edk2-devel] [edk2-platforms][PATCH 3/4] Drivers/OpTee: address cast build warning issue in 32b mode Date: Mon, 10 May 2021 09:53:03 +0200 Message-Id: <20210510075304.9125-4-etienne.carriere@linaro.org> In-Reply-To: <20210510075304.9125-1-etienne.carriere@linaro.org> References: <20210510075304.9125-1-etienne.carriere@linaro.org> Precedence: Bulk List-Unsubscribe: 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,etienne.carriere@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1620633218; bh=ei4iJvdCf+kaEALdb7XvrQUxxDVZ+RxnBXpduC/KbLU=; h=Cc:Date:From:Reply-To:Subject:To; b=UXNrAjkPnQHxIHWZu0YwYLm/nTVPpxmmaDKv2Ng1pGE8xQ3EUIHb48LEovOt/OD6MsT Od/5/fzvBKZlfMdkGekzGLMgThv29/GQJyIRnA1VkIpyOzjC+9i/h4GKvqTGafzAJxVlJ Q7XDvVf2X5IP2rxfcil40ob8eJBGJppmkus= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use (UINTN) cast to cast physical or virtual address values to the pointer size before casting from/to a pointer value. Cc: Ard Biesheuvel Cc: Ilias Apalodimas Cc: Leif Lindholm Cc: Sami Mujawar Signed-off-by: Etienne Carriere Acked-by: Ard Biesheuvel Reviewed-by: Sami Mujawar --- Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c b/Drivers/OpTee/Opte= eRpmbPkg/OpTeeRpmbFvb.c index 6eb19bed0e..83c2750368 100644 --- a/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c +++ b/Drivers/OpTee/OpteeRpmbPkg/OpTeeRpmbFvb.c @@ -305,7 +305,8 @@ OpTeeRpmbFvbRead ( } } =20 - Base =3D (VOID *)Instance->MemBaseAddress + (Lba * Instance->BlockSize) = + Offset; + Base =3D (VOID *)(UINTN)Instance->MemBaseAddress + (Lba * Instance->Bloc= kSize) + + Offset; // We could read the data from the RPMB instead of memory // The 2 copies should already be identical // Copy from memory image @@ -387,7 +388,8 @@ OpTeeRpmbFvbWrite ( return Status; } } - Base =3D (VOID *)Instance->MemBaseAddress + Lba * Instance->BlockSize + = Offset; + Base =3D (VOID *)(UINTN)Instance->MemBaseAddress + (Lba * Instance->Bloc= kSize) + + Offset; Status =3D ReadWriteRpmb ( SP_SVC_RPMB_WRITE, (UINTN)Buffer, @@ -477,7 +479,8 @@ OpTeeRpmbFvbErase ( return EFI_INVALID_PARAMETER; } NumBytes =3D NumLba * Instance->BlockSize; - Base =3D (VOID *)Instance->MemBaseAddress + Start * Instance->BlockSiz= e; + Base =3D (VOID *)(UINTN)Instance->MemBaseAddress + + (Start * Instance->BlockSize); Buf =3D AllocatePool (NumLba * Instance->BlockSize); if (Buf =3D=3D NULL) { return EFI_DEVICE_ERROR; @@ -689,7 +692,7 @@ InitializeFvAndVariableStoreHeaders ( goto Exit; } // Install the combined header in memory - CopyMem ((VOID*)Instance->MemBaseAddress, Headers, HeadersLength); + CopyMem ((VOID*)(UINTN)Instance->MemBaseAddress, Headers, HeadersLength); =20 Exit: FreePool (Headers); @@ -747,14 +750,18 @@ FvbInitialize ( // Read the file from disk and copy it to memory ReadEntireFlash (Instance); =20 - FwVolHeader =3D (EFI_FIRMWARE_VOLUME_HEADER *)Instance->MemBaseAddress; + FwVolHeader =3D (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)Instance->MemBaseAd= dress; Status =3D ValidateFvHeader (FwVolHeader); if (EFI_ERROR (Status)) { // There is no valid header, so time to install one. DEBUG ((DEBUG_INFO, "%a: The FVB Header is not valid.\n", __FUNCTION__= )); =20 // Reset memory - SetMem64 ((VOID *)Instance->MemBaseAddress, Instance->NBlocks * Instan= ce->BlockSize, ~0UL); + SetMem64 ( + (VOID *)(UINTN)Instance->MemBaseAddress, + Instance->NBlocks * Instance->BlockSize, + ~0UL + ); DEBUG ((DEBUG_INFO, "%a: Erasing Flash.\n", __FUNCTION__)); Status =3D ReadWriteRpmb ( SP_SVC_RPMB_WRITE, @@ -827,7 +834,7 @@ OpTeeRpmbFvbInit ( mInstance.FvbProtocol.Write =3D OpTeeRpmbFvbWrite; mInstance.FvbProtocol.Read =3D OpTeeRpmbFvbRead; =20 - mInstance.MemBaseAddress =3D (EFI_PHYSICAL_ADDRESS)Addr; + mInstance.MemBaseAddress =3D (EFI_PHYSICAL_ADDRESS)(UINTN)Addr; mInstance.Signature =3D FLASH_SIGNATURE; mInstance.Initialize =3D FvbInitialize; mInstance.BlockSize =3D EFI_PAGE_SIZE; --=20 2.17.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 (#74857): https://edk2.groups.io/g/devel/message/74857 Mute This Topic: https://groups.io/mt/82714634/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- From nobody Sat May 18 12:05:11 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+74858+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+74858+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1620633217; cv=none; d=zohomail.com; s=zohoarc; b=QvvZ9ehyaX9VyfqBzJZZhiYc5O5uPOjewN8Z0Awn8o7g0wRDST1THpZrwFCD7OWQiYH6qZTfzEOS6wpRMoAhzoAeAW6LrP3kj1VAkm5ZzPPWMMp+x3LsZzSzyvPdRmz8dHwjrgGcyF/16pT6nHIjPzJkK9YpgckNLRRPvMdCXRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620633217; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=GiMsgKT4IpPfYvJEWlZYzEV6UcsVdlbeKXso5yD/9bc=; b=IlcgoZ4nYbLeS2vuv8OyOxCw0BmGKvm26CSLgC95jQx+3S3LsphWMFiLPU++N8mqb27jvu4K9kD/PmQVSaKM/1og7iwP+ymnTSC7V2AD/mceY9fC3bbsm/rqT8NUAcI7I/veGTvZine8urFPFtSpTsydx4+nRRn26pvghHTdAxY= 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+74858+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1620633217725330.6772001675429; Mon, 10 May 2021 00:53:37 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zSxVYY1788612xm4d7enZAMy; Mon, 10 May 2021 00:53:37 -0700 X-Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.groups.io with SMTP id smtpd.web12.28946.1620633212064373501 for ; Mon, 10 May 2021 00:53:32 -0700 X-Received: by mail-wr1-f43.google.com with SMTP id l13so15504972wru.11 for ; Mon, 10 May 2021 00:53:31 -0700 (PDT) X-Gm-Message-State: 7m9dHlb9X0nfoqQcw7psTghVx1787277AA= X-Google-Smtp-Source: ABdhPJxqKEfC5Hxtew3L9zXoODc/qYspRNMPlj4jyLVFpVuVFbRFaATYQMjvv8dYHl/XG3KVuBP/7Q== X-Received: by 2002:adf:e611:: with SMTP id p17mr29571321wrm.161.1620633210617; Mon, 10 May 2021 00:53:30 -0700 (PDT) X-Received: from lmecxl0524.home (2a01cb058b850800452ff0effb46d5f4.ipv6.abo.wanadoo.fr. [2a01:cb05:8b85:800:452f:f0ef:fb46:d5f4]) by smtp.gmail.com with ESMTPSA id o13sm18237660wmh.34.2021.05.10.00.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 00:53:30 -0700 (PDT) From: "Etienne Carriere" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Ilias Apalodimas , Leif Lindholm , Sami Mujawar , Sughosh Ganu , Thomas Abraham , Etienne Carriere Subject: [edk2-devel] [edk2-platforms][PATCH 4/4] Platform/StandaloneMm: build StandaloneMmRpmb for 32bit architectures Date: Mon, 10 May 2021 09:53:04 +0200 Message-Id: <20210510075304.9125-5-etienne.carriere@linaro.org> In-Reply-To: <20210510075304.9125-1-etienne.carriere@linaro.org> References: <20210510075304.9125-1-etienne.carriere@linaro.org> Precedence: Bulk List-Unsubscribe: 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,etienne.carriere@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1620633217; bh=XDfj0aRez9kF6WpSDa+vq+IEh4QuZDnqhBpC40wAphM=; h=Cc:Date:From:Reply-To:Subject:To; b=o0PGQLn2erdv7xkuxaYYh87XaZBeKXcm+lbHIm2RR0utI/JrXuxaaSw50v1sMVYDyO5 rqdPVRQjrilJ4bFBRMTEEV5OzlpZ4xthuQ2S18N8Qp6vBFFzZZHZZvnBNf2zAqzq3DpxH KnXB+zz4hg9lqfwadAS5UPF2bM92DpuAguA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Build PlatformStandaloneMmRpmb for ARM architecture (32bit arm machine). The generated image targets an execution environment similar to AArch64 StMM secure partition in OP-TEE but in 32bit mode. GCC flag -fno-stack-protector added. The stack protection code bring GOT dependencies we prefer avoid when StMM runs in OP-TEE. Cc: Ard Biesheuvel Cc: Ilias Apalodimas Cc: Leif Lindholm Cc: Sami Mujawar Signed-off-by: Etienne Carriere Acked-by: Ard Biesheuvel Reviewed-by: Sami Mujawar --- Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc= | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandalo= neMmRpmb.dsc b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStanda= loneMmRpmb.dsc index cb3f1ddf52..996d4e4ba9 100644 --- a/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpm= b.dsc +++ b/Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpm= b.dsc @@ -16,7 +16,7 @@ PLATFORM_VERSION =3D 1.0 DSC_SPECIFICATION =3D 0x0001001C OUTPUT_DIRECTORY =3D Build/$(PLATFORM_NAME) - SUPPORTED_ARCHITECTURES =3D AARCH64 + SUPPORTED_ARCHITECTURES =3D ARM|AARCH64 BUILD_TARGETS =3D DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/StandaloneMm/PlatformStandal= oneMmPkg/PlatformStandaloneMmRpmb.fdf @@ -68,6 +68,12 @@ # NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 +[LibraryClasses.ARM] + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf + NULL|ArmPkg/Library/ArmSvcLib/ArmSvcLib.inf + RegisterFilterLib|MdePkg/Library/RegisterFilterLibNull/RegisterFilterLib= Null.inf + [LibraryClasses.common.MM_STANDALONE] HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/Standalon= eMmServicesTableLib.inf @@ -160,3 +166,7 @@ [BuildOptions.AARCH64] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 -march=3Darmv8-a+no= fp GCC:*_*_*_CC_FLAGS =3D -mstrict-align + +[BuildOptions.ARM] +GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 -march=3Darmv7-a +GCC:*_*_*_CC_FLAGS =3D -fno-stack-protector --=20 2.17.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 (#74858): https://edk2.groups.io/g/devel/message/74858 Mute This Topic: https://groups.io/mt/82714635/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-