From nobody Sun Feb 8 11:49:36 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+71529+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+71529+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1612885478757231.53507909745235; Tue, 9 Feb 2021 07:44:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 2L7ZYY1788612xoMc0sWPLZE; Tue, 09 Feb 2021 07:44:38 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web12.12203.1612885472637222912 for ; Tue, 09 Feb 2021 07:44:32 -0800 X-Received: from pps.filterd (m0134421.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 119Fc3K8010056; Tue, 9 Feb 2021 15:44:17 GMT X-Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 36kmy9v1wp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Feb 2021 15:44:16 +0000 X-Received: from G9W8453.americas.hpqcorp.net (exchangepmrr1.us.hpecorp.net [16.216.160.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g2t2353.austin.hpe.com (Postfix) with ESMTPS id 169DC84; Tue, 9 Feb 2021 15:44:16 +0000 (UTC) X-Received: from G4W9119.americas.hpqcorp.net (2002:10d2:14d6::10d2:14d6) by G9W8453.americas.hpqcorp.net (2002:10d8:a0d3::10d8:a0d3) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Feb 2021 15:44:15 +0000 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (15.241.52.10) by G4W9119.americas.hpqcorp.net (16.210.20.214) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 9 Feb 2021 15:44:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ps8Fr1QkpXkRI3sPwqJksyakKhnzYkVzlOJuTuO+djgdRzrLQVn76IYfwCV6V9GjdhdCPDkkfoLoNLEXCaVgwQrffXzzaLlS9AYXJFlyroXHvfaizqjC83RiTvQAc33RkJQMkTrgVTpKJntTYDdWL6jai6j7h1pxfuhUP+6kusbDnsdhLDO6KfaTJT/B1UvWeADOogxRCIB5dlFFHN2TpbkwN858O96nNZOW8uuSibrqdffj3E/FJq5gga8CWEHjctPUHiRH2d/LLgVRxJ1i1ePuf02QZ/91esdEQYqjMngOZywKypMxbEXxMhLWrf9LpYK3UzYby96LsiVqwflVnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QQzoRuQUQJY5Z9/djxRR4/oHB+bnvZB4zfCdqLj2k1Q=; b=JWRO8Hl+VX5x01s6rdvJQqnaKhz7UacBGfq3ZR6pCvD75dxLmmujwNuRXQZwwsVvchzSJKhEngO5jtqHKnqmwUzQKKJhzDNajYNu32R5VGqYZ/e08XGdHhelduOPfm17tcoSTzoxa2RLGkbm9xRUF/1I/2vxbV9mye6mHV7dYaDFXIlk3oDO4oiA5nmHTq0r5n3kHB/mOtqxcDHqQuiTcxqw/bYD1SCg8IgJgIKn59VUmrNwt7y+H+MmS3F9RPs5sdp3k0BZmOyXIy8c5JYCz6meDfyYNFH1mqp31/MWpIsczc1QaS2XTcx2JRZThRVmXNcX4xLkrn3CcVJ83C+xaQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) by DF4PR8401MB0508.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.20; Tue, 9 Feb 2021 15:44:13 +0000 X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0]) by DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0%9]) with mapi id 15.20.3825.030; Tue, 9 Feb 2021 15:44:13 +0000 From: "Daniel Schaefer" To: CC: G Edhaya Chandran , Barton Gao , Samer El-Haj-Mahmoud , Eric Jin , Arvin Chen , Leif Lindholm , Heinrich Schuchardt , Abner Chang Subject: [edk2-devel] [edk2-test PATCHv2 1/5] SctPkg: Add RISCV64 support by using Aarch64 sources Date: Tue, 9 Feb 2021 23:43:50 +0800 Message-ID: <20210209154354.30234-2-daniel.schaefer@hpe.com> In-Reply-To: <20210209154354.30234-1-daniel.schaefer@hpe.com> References: <20210209154354.30234-1-daniel.schaefer@hpe.com> X-Originating-IP: [123.193.51.23] X-ClientProxiedBy: HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) To DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from x360-nix.hitronhub.home (123.193.51.23) by HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.23 via Frontend Transport; Tue, 9 Feb 2021 15:44:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d90dbbce-48da-45ca-9da8-08d8cd118cc9 X-MS-TrafficTypeDiagnostic: DF4PR8401MB0508: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: CBQVJRJq9EHBthzp+VUS4XHaw8JoXutBh4wj7pm1oIeLy/ko5KYyTgQk260JBKNdlGcc1UqqY16vLGlQPGcwBecaIHPZZh4j/AwZWFIN3+U4W3HBOyR7nLKMDv3gsZnomoN7El60DKu71wG2wl1YJjlnSGZyrMViwlnOF96yZixNlZ0JZgpLjy7ILmkh5wBut0Q+s+z9IEQREViKrO4APSApuuIBaXeHC91rKmMuVC9rx1vUljIZ+S1tZ1zvxXxRDU/IOk3npEIzhiI+61toTP13j0M625EFBoYs/+KYrywRaPsUxv+Pa7s+Vd8u7uwUrTg2YPUVV59LEkytjGQ0QYISCBHidQpuMlLYeIOJtarwii2oVz9+a12hBaOm/xDQjLINKz9nFaLxaBayaIi6Pv+RJWcSDofwwMaMJj8q3Sy8y2uJHIdyINvueXj+Hwbv+mxIzaXyOm5XPStsmm6SyYzoc5RPtnqeXQBnqGOs6WTv6T3PxQqo6xuJ33dYF7vndwHG/K5RQgzv0vxckWl7lKoOgqdw3YYE+5I4obk7GBSQ8gbHe3S79i0EX1l6Pum2QbkM+3Jxu2JPXK+EdyXqDtw/mvv+X9V/Y+TfOZSNwQ0= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Lz2wNEltknB4poVA1WTdHEnx654qM4LWSbPisWC6U/cUz0yi6gPj7xo0OjaG?= =?us-ascii?Q?eDdPISMgpIrOHuyJTIwPda+XaOi7ys46Gp+3mVU7jLe7J/165x8qquQ/xnDy?= =?us-ascii?Q?XQ2H7l2YiFu+ZBRtH2yDfU3m97XDLhG3whhk7T79ttK2YDo966SrKIfPX9SW?= =?us-ascii?Q?p/ot2x511QZY2iO9fz4aNBbpR1gAUc9RXtIC3CVRZ+1PX8YnIvtFIV81oiFU?= =?us-ascii?Q?Bk47/AXMQ76MA/kAYad/C51cIijiNzYsRv1re68W3z4kJN5Hwp75ADfHrabQ?= =?us-ascii?Q?iRQ3ij/Im5oNG7ps9jKPrbSYu9Aq36UR/TmQ1nRs7NJqqGWXv+Ha6MgUEWvu?= =?us-ascii?Q?mhAwlLpCm7uVb5slt/LEVRmhiLkeQm2z/cnghDo7YQ60mh7z2J8+4rrLcmXX?= =?us-ascii?Q?Ru1XTMK7KEPU7TffYeREZHJxmQPBS8G262hJtY+UGZD2b7TkQ4JmK95XN8kA?= =?us-ascii?Q?pE5VIAyGOBZ3fY6k84jCOZlPgRAO86lwdridHiqyBg79P4haiiUAk3zakly0?= =?us-ascii?Q?7jTcisCvlHlg47cuiB59jpZbhQmhGYUXzKfl9AoeSyDAGTMLbndH80tRc+J1?= =?us-ascii?Q?7GuT/Gv13SrB+0KzVFH0JkGzrJUX0V87azyQpsp8BHWra3YjXbppwbl5wyQ2?= =?us-ascii?Q?UbEMijaVd3p73QnRk3ObDx5HCFeh4CHB1cGQ59w3o0jgRkBehb8Sxsw0VMm/?= =?us-ascii?Q?l8a5m/1t1o9EaY+yHkVPXBD5tM4ORTfl6KIBbRu61C0x84k7zVPCB0nMCakO?= =?us-ascii?Q?EbbxgJlD4KIhCvo3XE4J8DcdIFNPB8CYq4P2ioajG0dveWJ2/tvzNhjpEInN?= =?us-ascii?Q?uKFvrAyLsHgRdKP45o952+JMZNG8QyvfYsLbZQDck5HSdqfBSITfIzJpwm6H?= =?us-ascii?Q?gqXiT3WhJtiQIvjjlJsgq4yi5TG6XTjn1kW3lUBGpBzdupm9fSKmZMWtwVj0?= =?us-ascii?Q?JVe+0owI0k1HvXGdG02zocDQ/cFDOQU8GWxot0x8JCyngZPCxGRyDNhJXW8Y?= =?us-ascii?Q?F1Wl50Jt1uLeuDVucB+HQRdM7SQq6b7Dk/6h9/3PXUmmyBj5rBYHj0KSiOeD?= =?us-ascii?Q?KVOyF8evD8D1XN6TTGhjfeDm26qNDXtf6KDzE7HQpTAw6gKnmxs+4msTWMRv?= =?us-ascii?Q?zZxh9QgndLuSe5lZb5Uzlu03uOuN9lISLvt5w7aXHwPWg8R2fMf/srxPpjw6?= =?us-ascii?Q?uDpHOtgQUcUYgX6xznppkth3gYB9PQhKFVG9PI8rCfgZTjz2DS7/pwoWKaB8?= =?us-ascii?Q?VCsQhEfId8uWzLIunugsbDi9MHS8F4YrVtoNJ2vIhvIRTnA9G9T5YlZQQJco?= =?us-ascii?Q?NhiBzr91mN9YKf52sCj4McEt?= X-MS-Exchange-CrossTenant-Network-Message-Id: d90dbbce-48da-45ca-9da8-08d8cd118cc9 X-MS-Exchange-CrossTenant-AuthSource: DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2021 15:44:13.6924 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: I1Q19gpltQmAeaKXgpyjF1gFWib0y/MTDTqBEbW16cJNaw3qwWYYJ3hVfWmX18qmC/PhBnAtl7N5aRUxob7Nnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DF4PR8401MB0508 X-OriginatorOrg: hpe.com X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,daniel.schaefer@hpe.com X-Gm-Message-State: ycZFPIijcR5jhZDihDu3SKVCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1612885478; bh=7aRUFoPjsh5qNmKLwlS06b03cS1KJgwF9NwK3VodZhw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=lvW1MoIGk1r+brb3W+fO1j0hO2kSxpCW0DouUieSDsViIdL2DnMjy+hfvoSbsOsX0ZJ NZYJBqFR93h4THJT/nBkpiCn9NkFBvUn0XMH9hNaW6ODesicig5YfDQOBz6bCteEDdlGp 5S0DeesdBpF4n8i5mJWBz9FuUuU1Voeoxf8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The sources were copied from Aarch64. Follow-up commit will adapt them for Riscv64. REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3042 Cc: G Edhaya Chandran Cc: Barton Gao Cc: Samer El-Haj-Mahmoud Cc: Eric Jin Cc: Arvin Chen Cc: Leif Lindholm Cc: Heinrich Schuchardt Cc: Abner Chang Signed-off-by: Daniel Schaefer Reviewed-by: Abner Chang --- uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h = | 32 +++ uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c = | 45 ++++ uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S = | 44 ++++ uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c = | 182 +++++++++++++ uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c = | 88 +++++++ uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c = | 68 +++++ uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c = | 134 ++++++++++ uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.h = | 48 ++++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/DebugSupportBBTestCacheFunction.c | 137 ++++++++++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/DebugSupportBBTestExceptionCallbackFunction.c | 276 ++++++++++++++++++++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/PlatformIsa.c | 30 +++ uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/EntsL= ibPlat.h | 55 ++++ uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/InitP= lat.c | 55 ++++ 13 files changed, 1194 insertions(+) diff --git a/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h b/uefi-sct= /SctPkg/Library/SctLib/Riscv64/SctLibPlat.h new file mode 100644 index 00000000..ee7c656b --- /dev/null +++ b/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h @@ -0,0 +1,32 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + SctLibPlat.h + +Abstract: + + AArch64 specific defines + +--*/ + +#ifndef _EFI_LIB_PLAT_H_ +#define _EFI_LIB_PLAT_H_ + +#define MIN_ALIGNMENT_SIZE 8 + +#endif diff --git a/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c b/uefi-sct/S= ctPkg/Library/SctLib/Riscv64/initplat.c new file mode 100644 index 00000000..a48bb2f3 --- /dev/null +++ b/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c @@ -0,0 +1,45 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + initplat.c + +Abstract: + + Math routines for compatibility with native EFI library routines. + +--*/ + +#include "SctLibInternal.h" + +VOID +InitializeLibPlatform ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) + +{ + // No platform-specific initializations +} + +UINT64 +SctReadTsc ( + VOID + ) +{ + return 0; +} diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S b/uefi-sct/Sc= tPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S new file mode 100644 index 00000000..d223b36b --- /dev/null +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S @@ -0,0 +1,44 @@ +## @file +# +# Copyright 2010 - 2012 Unified EFI, Inc.
+# Copyright (c) 2012, ARM Ltd. All rights reserved.
+# +# This program and the accompanying materials +# are licensed and made available under the terms and conditions of the B= SD License +# which accompanies this distribution. The full text of the license may = be found at=20 +# http://opensource.org/licenses/bsd-license.php +#=20 +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. +#=20 +## +# +# +#/*++ +# +# Module Name: +# +# GoVirtual.S +# +#--*/ +#start of the code section +.text +/* FIXME: Should alignment be different on Aarch64? */ +.align 3 + +.global JumpToTestFunc +.type JumpToTestFunc, %function + +#-------------------------------------------------------------------------= ----- +# VOID +# JumpToTestFunc ( +# IN UINTN FuncPointer, +# IN UNITN ConfigInfo +# ) +# +JumpToTestFunc: + mov x2, x0 + mov x0, x1 + + // Jump to Virtual function + blr x2 diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c b/uefi-sc= t/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c new file mode 100644 index 00000000..397b3514 --- /dev/null +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c @@ -0,0 +1,182 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2012, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + VirtualMemory.c + +--*/ + +#include "SCRTApp.h" + +#define VIRT_TO_PHYS_OFFSET (0x80000000) //2G + +BOOLEAN HighAddress =3D FALSE; +UINTN PageTable =3D 0; + + +VOID +ConvertRuntimeFuncPtr ( + IN OUT UINTN *VirtualFunc + ) +/*++ + +Routine Description: + + Change RuntimeTestFunc physical address to virtual address + +Arguments: + + VirtualFunc - On input, RuntimeTestFunc physical address. + On output, RuntimeTest virtual address. + +Returns: + + NONE + +--*/ +{ + /*Note: It is presumed that on ARM v5, V6 and V7 architectures + * the MMU is configured and enabled in PEI phase. As VirtualFunc + * is already mapped to virtual memory, don't have to do anything here. + */ + /* FIXME: Is it the same on ARM v8? */ +} + + +EFI_STATUS +DoMemoryAllocation ( + IN UINTN PhysicalFunc + ) +/*++ + +Routine Description: + + Allocate memory and create the PageTable to set up physical-virtual map. + +Arguments: + + PhysicalFunc - Physical address where RuntimeTestFunc locates. + +Returns: + + EFI_STATUS + +--*/ +{ + EFI_STATUS Status; + EFI_PHYSICAL_ADDRESS AllocateMemory; + + //create new page tables or use existing page tables. + // + // Allocate PageTable memory close to this Application image location in + // the system memory. In this way, it is safe for page table memory. + // + AllocateMemory =3D PhysicalFunc; + + Status =3D tBS->AllocatePages ( + AllocateMaxAddress, + EfiRuntimeServicesData, + 1, + &AllocateMemory + ); + + if (EFI_ERROR(Status)) { + return Status; + } + + PageTable =3D (UINTN)AllocateMemory; + return EFI_SUCCESS; +} + + +VOID +PrepareVirtualAddressMap ( + IN UINTN MemoryMapSize, + IN UINTN DescriptorSize, + IN EFI_MEMORY_DESCRIPTOR *MemoryMap, + IN EFI_MEMORY_DESCRIPTOR *VirtualMemoryMap, + IN OUT UINTN *VirtualMapSize + ) +/*++ + +Routine Description: + + Construct VirtualAddressMap from physical address to virtual address + +Arguments: + + MemoryMapSize - The size, in bytes, of the MemoryMap buffer + DescriptorSize - The size, in bytes, of an individual EFI_MEMORY_DESC= RIPTOR + MemoryMap - A pointer to the current memory map + VirtualMemoryMap - A pointer to the modified virtual memory map + VirtualMapSize - A pointer to the size, in bytes, of the VirtualMemor= yMap buffer + +Returns: + + NONE + +--*/ +{ + UINTN Index; + *VirtualMapSize =3D 0; + + // + // Copy entries that need runtime mapping to construct virtualMemoryMap + // + for (Index =3D 0; Index < (MemoryMapSize / DescriptorSize); Index++) { + if ((MemoryMap->Attribute & EFI_MEMORY_RUNTIME) =3D=3D EFI_MEMORY_RUNT= IME) { + SctCopyMem ((VOID *) VirtualMemoryMap, (VOID *) MemoryMap, Descripto= rSize); + VirtualMemoryMap->VirtualStart =3D VirtualMemoryMap->PhysicalStart; + *VirtualMapSize +=3D DescriptorSize; + VirtualMemoryMap =3D NextMemoryDescriptor (VirtualMemoryMap, Descrip= torSize); + } + + MemoryMap =3D NextMemoryDescriptor (MemoryMap, DescriptorSize); + } +} + + + +VOID +JumpVirtualMode( + IN UINTN VirtualFunc, + IN UINTN HandOffAddr + ) +/*++ + +Routine Description: + + Enable virtual addressing mode, and jump to RuntimeTestFunc in virtual a= ddress + +Arguments: + + VirtualFunc - RuntimeTestFunc virtual address + HandOffAddr - Configuration Data Address + +Returns: + + NONE + +--*/ +{ + // + // Note: It is assumed that the MMU and page tables are configured on AR= M platforms + // based on ARM v5 v6 and v7 architecture. + // + /* FIXME: Is it the same on ARM v8? */ + JumpToTestFunc(VirtualFunc, HandOffAddr); +} diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c b/uefi-sct/Sct= Pkg/SCRT/SCRTDriver/Riscv64/Debug.c new file mode 100644 index 00000000..6161d596 --- /dev/null +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c @@ -0,0 +1,88 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ + +/*++ + +Module Name: + + Debug.c + +--*/ + +#include "SCRTDriver.h" + +UINTN mHandOffPtr =3D 0; +EFI_PHYSICAL_ADDRESS mIoPortSpaceAddress =3D 0; + + +EFI_STATUS +ConsumeHandOff ( + IN UINTN HandOffAddr, + OUT CONF_INFO *ConfigData + ) +{ + RUNTIME_HANDOFF *HandOffPtr; + // + // First fix the memory address of hand off data. + // + FixAddress(&HandOffAddr); + mHandOffPtr =3D HandOffAddr; + HandOffPtr =3D (RUNTIME_HANDOFF*)mHandOffPtr; + *ConfigData =3D HandOffPtr->ConfigureInfo; + + if (!HandOffPtr->DebuggerInfo.MmioFlag){ + // + // If debug port is I/O mapped, fix IoBase Address. + // + FixAddress(&HandOffPtr->DebuggerInfo.IoBase); + mIoPortSpaceAddress =3D HandOffPtr->DebuggerInfo.IoBase; + } else { + // + // If debug port is MMIO, fix MmioBase Address. + // + FixAddress(&HandOffPtr->DebuggerInfo.MmioBase); + } + + return EFI_SUCCESS; +} + + +EFI_STATUS +Send2UART ( + CHAR8 *String + ) +{ + // + // TODO: On ARM platforms use platform specific functions to + // write the data to UART. + // + return EFI_SUCCESS; +} + + + +EFI_STATUS +DebugWorker ( + IN CHAR8 *String + ) +{ + EFI_STATUS Status; + + // + // Send text message to registered UART. + // + Status =3D Send2UART(String); + return Status; +} diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c b/uefi-sct/SctP= kg/SCRT/SCRTDriver/Riscv64/Dump.c new file mode 100644 index 00000000..cc8d9869 --- /dev/null +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c @@ -0,0 +1,68 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ + +/*++ + +Module Name: + + Dump.c + +--*/ + +#include "SCRTDriver.h" + +VOID +DumpRuntimeTable() +{ + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DDump Runti= me Table=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("Header Signature =3D 0x%x\n", VRT->Hdr.Signature); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DGetTime Se= rvice=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("GetTime @ 0x%x\n", VRT->GetTime); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DSetTime Se= rvice=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("SetTime @ 0x%x\n", VRT->SetTime); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DGetWakeupT= ime Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("GetWakeupTime @ 0x%x\n", VRT->GetWakeupTime); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DSetWakeupT= ime Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("SetWakeupTime @ 0x%x\n", VRT->SetWakeupTime); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DGetVariabl= e Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("GetVariable @ 0x%x\n", VRT->GetVariable); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DGetNextVar= iableName Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("GetNextVariableName @ 0x%x\n", VRT->GetNextVariableName); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DSetVariabl= e Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("SetVariable @ 0x%x\n", VRT->SetVariable); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DGetNextHig= hMonotonicCount Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("GetNextHighMonotonicCount @ 0x%x\n", VRT->GetNextHighMonoton= icCount); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DResetSyste= m Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("ResetSystem @ 0x%x\n", VRT->ResetSystem); +#if 0 + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DUpdateCaps= ule Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("UpdateCapsule @ 0x%x\n", VRT->UpdateCapsule); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DQueryCapsu= leCapabilities Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("QueryCapsuleCapabilities @ 0x%x\n", VRT->QueryCapsuleCapabil= ities); + + SctAPrint ("\n=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DQueryVaria= bleInfo Service=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"); + SctAPrint ("QueryVariableInfo @ 0x%x\n", VRT->QueryVariableInfo); +#endif +} diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c b/uefi-sct/SctPkg= /SCRT/SCRTDriver/Riscv64/Io.c new file mode 100644 index 00000000..b925e151 --- /dev/null +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c @@ -0,0 +1,134 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ + +/*++ + +Module Name: + + Io.c + +--*/ + +#include "Io.h" + +EFI_STATUS +EFIAPI +CpuIoServiceWrite ( + IN EFI_PEI_CPU_IO_PPI_WIDTH Width, + IN UINT64 UserAddress, + IN UINTN Count, + IN VOID *UserBuffer + ) +/*++ + +Routine Description: + + Perform the port I/O write service + +Arguments: + + Width - Width of the port I/O operation + Address - Base address of the port I/O operation + Count - Count of the number of accesses to perform + Buffer - Pointer to the source buffer from which to write data + +Returns: + + EFI_SUCCESS - The data was written. + EFI_INVALID_PARAMETER - Width is invalid. + EFI_INVALID_PARAMETER - Buffer is NULL. + EFI_UNSUPPORTED - The Buffer is not aligned for the given Width. + EFI_UNSUPPORTED - The address range specified by Address, Width, + and Count is not valid. + +--*/ +{ + return EFI_UNSUPPORTED; +} + + +EFI_STATUS +EfiIoWrite ( + IN EFI_PEI_CPU_IO_PPI_WIDTH Width, + IN UINT64 Address, + IN UINTN Count, + IN OUT VOID *Buffer + ) +/*++ + +Routine Description: + Perform an IO write into Buffer. + +Arguments: + Width - Width of write transaction, and repeat operation to use + Address - IO address to write + Count - Number of times to write the IO address. + Buffer - Buffer to write data from. size is Width * Count + +Returns: + Status code + +--*/ +{ + return CpuIoServiceWrite(Width, Address, Count, Buffer); +} + + +EFI_STATUS +EfiIoRead ( + IN EFI_PEI_CPU_IO_PPI_WIDTH Width, + IN UINT64 Address, + IN UINTN Count, + IN OUT VOID *Buffer + ) +/*++ + +Routine Description: + Perform an IO read into Buffer. + +Arguments: + Width - Width of read transaction, and repeat operation to use + Address - IO address to read + Count - Number of times to read the IO address. + Buffer - Buffer to read data into. size is Width * Count + +Returns: + Status code + +--*/ +{ + return EFI_UNSUPPORTED; +} + + +VOID +FixAddress ( + IN UINTN *PhyAddress + ) +{ + // + //Note: On ARM platforms don't have to do this as all the functions are = virtually mapped. + // +} + +// Quick port to ARM + +VOID +Port80 ( + UINT8 Number + ) +{ + //EFI_SCT_DEBUG ((EFI_SCT_D_ERROR, L"Port80 %02x", Number)); +} diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.h b/uefi-sct/SctPkg= /SCRT/SCRTDriver/Riscv64/Io.h new file mode 100644 index 00000000..1e78b3e4 --- /dev/null +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.h @@ -0,0 +1,48 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ + +/*++ + +Module Name: + + Debug.h + +--*/ + +#ifndef _IA32_IO_ACCESS_H +#define _IA32_IO_ACCESS_H + +#include "SCRTDriver.h" + +#define IA32_MAX_IO_ADDRESS 0xFFFF + +#define IA32API + + +typedef union { + UINT8 VOLATILE *buf; + UINT8 VOLATILE *ui8; + UINT16 VOLATILE *ui16; + UINT32 VOLATILE *ui32; + UINT64 VOLATILE *ui64; + UINTN VOLATILE ui; +} PTR; + +// This address is assuming a pure PC architecture. Not required? +#define VIRT_TO_PHYS_OFFSET (0x80000000) //2G + + + +#endif diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase= /UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCach= eFunction.c new file mode 100644 index 00000000..96ee7b57 --- /dev/null +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestCacheFunction.c @@ -0,0 +1,137 @@ +/** @file + + Copyright 2006 - 2016 Unified EFI, Inc.
+ Copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + DebugSupportBBTestCacheFunction.c + +Abstract: + + Interface Function Test Cases of Debug Support Protocol + +--*/ + + +#include "DebugSupportBBTestMain.h" + +/** + * Entrypoint for EFI_DEBUG_SUPPORT_PROTOCOL.InvalidateInstructionCache()= Function Test. + * @param This a pointer of EFI_BB_TEST_PROTOCOL. + * @param ClientInterface a pointer to the interface to be tested. + * @param TestLevel test "thoroughness" control. + * @param SupportHandle a handle containing protocols required. + * @return EFI_SUCCESS Finish the test successfully. + */ +// +// TDS 3.5 +// +EFI_STATUS +BBTestInvalidateInstructionCacheFunctionAutoTest ( + IN EFI_BB_TEST_PROTOCOL *This, + IN VOID *ClientInterface, + IN EFI_TEST_LEVEL TestLevel, + IN EFI_HANDLE SupportHandle + ) +{ + EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; + EFI_STATUS Status; + EFI_DEBUG_SUPPORT_PROTOCOL *DebugSupport; + EFI_TEST_ASSERTION AssertionType; + UINT64 Start; + UINT64 Length; + UINTN MaxProcessorIndex; + UINTN ProcessorIndex; + + // + // Get the Standard Library Interface + // + Status =3D gtBS->HandleProtocol ( + SupportHandle, + &gEfiStandardTestLibraryGuid, + (VOID **) &StandardLib + ); + + if (EFI_ERROR(Status)) { + StandardLib->RecordAssertion ( + StandardLib, + EFI_TEST_ASSERTION_FAILED, + gTestGenericFailureGuid, + L"BS.HandleProtocol - Handle standard test library", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + return Status; + } + + DebugSupport =3D (EFI_DEBUG_SUPPORT_PROTOCOL *)ClientInterface; + + if (DebugSupport->Isa !=3D PlatformIsa) { + return EFI_SUCCESS; + } + + Status =3D DebugSupport->GetMaximumProcessorIndex (DebugSupport, &MaxPro= cessorIndex); + if (EFI_ERROR(Status)) { + StandardLib->RecordAssertion ( + StandardLib, + EFI_TEST_ASSERTION_FAILED, + gTestGenericFailureGuid, + L"EFI_DEBUG_SUPPORT_PROTOCOL.GetMaximumProcessorIndex", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + return Status; + } + + for (ProcessorIndex =3D 0; ProcessorIndex <=3D MaxProcessorIndex; Proces= sorIndex++) { + + // + // Assertion Point 3.5.2.1 + // Invoke InvalidateInstructionCache and verify interface correctness. + // + + // The Physical base of the memory range to be invalidated. + Start =3D 0x0; + + // The minimum number of bytes in the processor's instruction cache to= be invalidated. + Length =3D 0x0; + + Status =3D DebugSupport->InvalidateInstructionCache (DebugSupport, Pro= cessorIndex, (VOID*)&Start, Length); + + if (EFI_ERROR(Status)) { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gDebugSupportBBTestFunctionAssertionGuid015, + L"EFI_DEBUG_SUPPORT_PROTOCOL.InvalidateInstructionCache -= Invoke this function and verify interface correctness", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + } + + return EFI_SUCCESS; +} + diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/Sct= Pkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSuppo= rtBBTestExceptionCallbackFunction.c new file mode 100644 index 00000000..c27c0c0c --- /dev/null +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestExceptionCallbackFunction.c @@ -0,0 +1,276 @@ +/** @file + + Copyright 2006 - 2016 Unified EFI, Inc.
+ Copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + DebugSupportBBExceptionCallbackFunction.c + +Abstract: + + Interface Function Test Cases of Debug Support Protocol + +--*/ + + +#include "DebugSupportBBTestMain.h" + +extern volatile UINTN InvokedExceptionCallback; +extern volatile UINTN InvokedPeriodicCallback; + +extern EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa; + +void +SoftwareBreak ( + void + ) +{ + // Not ported to ARM yet + ASSERT (FALSE); +} + +/** + * Entrypoint for EFI_DEBUG_SUPPORT_PROTOCOL.RegisterExceptionCallback() = Function Test. + * @param This a pointer of EFI_BB_TEST_PROTOCOL. + * @param ClientInterface a pointer to the interface to be tested. + * @param TestLevel test "thoroughness" control. + * @param SupportHandle a handle containing protocols required. + * @return EFI_SUCCESS Finish the test successfully. + */ +// +// TDS 3.4 +// +EFI_STATUS +BBTestRegisterExceptionCallbackFunctionManualTest ( + IN EFI_BB_TEST_PROTOCOL *This, + IN VOID *ClientInterface, + IN EFI_TEST_LEVEL TestLevel, + IN EFI_HANDLE SupportHandle + ) +{ + EFI_STANDARD_TEST_LIBRARY_PROTOCOL *StandardLib; + EFI_STATUS Status; + EFI_DEBUG_SUPPORT_PROTOCOL *DebugSupport; + EFI_TEST_ASSERTION AssertionType; + + DebugSupport =3D (EFI_DEBUG_SUPPORT_PROTOCOL *)ClientInterface; + + if (DebugSupport->Isa !=3D PlatformIsa) { + return EFI_SUCCESS; + } + + // + // Get the Standard Library Interface + // + Status =3D gtBS->HandleProtocol ( + SupportHandle, + &gEfiStandardTestLibraryGuid, + (VOID **) &StandardLib + ); + + if (EFI_ERROR(Status)) { + StandardLib->RecordAssertion ( + StandardLib, + EFI_TEST_ASSERTION_FAILED, + gTestGenericFailureGuid, + L"BS.HandleProtocol - Handle standard test library", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + return Status; + } + + // + // Assertion Point 3.4.2.1 + // Invoke RegisterExceptionCallback() to install an interrupt handler fu= nction. + // + InvokedExceptionCallback =3D FALSE; + // FIXME: Is it normal that we use EXCEPT_IA32_BREAKPOINT here? + // Shouldn't we define proper constants for ARM exceptions in DebugSuppo= rtProtocol.h file? + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback, EXCEPT_IA32_BREAKPOINT); + + if ((Status =3D=3D EFI_SUCCESS) || (Status =3D=3D EFI_ALREADY_STARTED)) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gDebugSupportBBTestFunctionAssertionGuid009, + L"EFI_DEBUG_SUPPORT_PROTOCOL.RegisterExceptionCallback - = Invoke this function and verify interface correctness", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + + // + // If the callback function is already registed, return + // + if (EFI_ERROR(Status)) { + return EFI_SUCCESS; + } + + // + // Test the callback function registed. + // + + // + // Call SoftwareBreak to invoke the interrupt handler function. + // + SoftwareBreak (); + + if (InvokedExceptionCallback =3D=3D FALSE) { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gDebugSupportBBTestFunctionAssertionGuid010, + L"EFI_DEBUG_SUPPORT_PROTOCOL.RegisterExceptionCallback - = Verify the callback function was invoked.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + + // + // Assertion Point 3.4.2.2 + // Invoke RegisterPeriodicCallback() to install the Periodic interrupt h= andler function. + // Verify the two callback functions can be both invoked. + // + InvokedExceptionCallback =3D FALSE; + InvokedPeriodicCallback =3D FALSE; + + Status =3D DebugSupport->RegisterPeriodicCallback (DebugSupport, 0, Peri= odicCallback); + if (EFI_ERROR(Status)) { + return Status; + } + + // + // Wait the PeriodicCallback to be invoked. + // + gtBS->Stall (500000); + + // + // Call SoftwareBreak to invoke the interrupt handler function. + // + SoftwareBreak (); + + if ((InvokedExceptionCallback =3D=3D TRUE) && (InvokedPeriodicCallback = =3D=3D TRUE)) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gDebugSupportBBTestFunctionAssertionGuid011, + L"EFI_DEBUG_SUPPORT_PROTOCOL.RegisterExceptionCallback - = Verify the two callback functions can be both invoked.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + + // + // Uninstall the Periodic callback function. + // + Status =3D DebugSupport->RegisterPeriodicCallback (DebugSupport, 0, NULL= ); + if (EFI_ERROR(Status)) { + return Status; + } + + // + // Assertion Point 3.4.2.3 + // Invoke RegisterExceptionCallback() to install another interrupt handl= er function. + // + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback1, EXCEPT_IA32_BREAKPOINT); + + if (Status !=3D EFI_ALREADY_STARTED) { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gDebugSupportBBTestFunctionAssertionGuid012, + L"EFI_DEBUG_SUPPORT_PROTOCOL.RegisterExceptionCallback - = Register another callback function.", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + + // + // Assertion Point 3.4.2.4 + // Invoke RegisterExceptionCallback() to unstall the interrupt handler f= unction. + // + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, NUL= L, EXCEPT_IA32_BREAKPOINT); + + if (EFI_ERROR(Status)) { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gDebugSupportBBTestFunctionAssertionGuid013, + L"EFI_DEBUG_SUPPORT_PROTOCOL.RegisterExceptionCallback - = Invoke this function to uninstall the interrupt handler function", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + + InvokedExceptionCallback =3D FALSE; + + // + // Call SoftwareBreak to invoke the interrupt handler function. + // + SoftwareBreak (); + + if (InvokedExceptionCallback !=3D FALSE) { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } + + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gDebugSupportBBTestFunctionAssertionGuid014, + L"EFI_DEBUG_SUPPORT_PROTOCOL.RegisterExceptionCallback - = Verify the callback function wasn't invoked", + L"%a:%d:Status - %r", + __FILE__, + (UINTN)__LINE__, + Status + ); + + return EFI_SUCCESS; +} + diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/PlatformIsa.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/D= ebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c new file mode 100644 index 00000000..8334f601 --- /dev/null +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/PlatformIsa.c @@ -0,0 +1,30 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + PlatformIsa.c + +Abstract: + + Platform related Isa definition. + +--*/ + +#include "DebugSupportBBTestMain.h" + +EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa =3D IsaAArch64; + diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/R= iscv64/EntsLibPlat.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENT= S/EasLib/Riscv64/EntsLibPlat.h new file mode 100644 index 00000000..ff781aee --- /dev/null +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= EntsLibPlat.h @@ -0,0 +1,55 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2010 - 2012, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + EntsLibPlat.h + +Abstract: + + AArch64 specific defines + +--*/ + +#ifndef _EFI_LIB_PLAT_H_ +#define _EFI_LIB_PLAT_H_ + +#define MIN_ALIGNMENT_SIZE 8 + +VOID +EntsInitializeLibPlatform ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +/*++ + +Routine Description: + + Initialize platform. + +Arguments: + + ImageHandle - The image handle. + SystemTable - The system table. + +Returns: + + None. + +--*/ +; + +#endif diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/R= iscv64/InitPlat.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/E= asLib/Riscv64/InitPlat.c new file mode 100644 index 00000000..70a509a4 --- /dev/null +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= InitPlat.c @@ -0,0 +1,55 @@ +/** @file + + Copyright 2006 - 2012 Unified EFI, Inc.
+ Copyright (c) 2010 - 2012, ARM Ltd. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BS= D License + which accompanies this distribution. The full text of the license may b= e found at=20 + http://opensource.org/licenses/bsd-license.php +=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. +=20 +**/ +/*++ + +Module Name: + + InitPlat.c + +Abstract: + + Math routines for compatibility with native EFI library routines. + +--*/ + +#include "Efi.h" +#include "EntsLibPlat.h" + +VOID +EntsInitializeLibPlatform ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +/*++ + +Routine Description: + + Initialize platform. + +Arguments: + + ImageHandle - The image handle. + SystemTable - The system table. + +Returns: + + None. + +--*/ +{ + // + // No platform-specific initializations + // +} --=20 2.30.0 -=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 (#71529): https://edk2.groups.io/g/devel/message/71529 Mute This Topic: https://groups.io/mt/80507443/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 Sun Feb 8 11:49:36 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+71527+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+71527+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1612885470896641.8354957632448; Tue, 9 Feb 2021 07:44:30 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id VgEtYY1788612x4xStb5ApHO; Tue, 09 Feb 2021 07:44:30 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web12.12200.1612885466965344570 for ; Tue, 09 Feb 2021 07:44:27 -0800 X-Received: from pps.filterd (m0134420.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 119FdIK2032708; Tue, 9 Feb 2021 15:44:19 GMT X-Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 36k6wt2hx5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Feb 2021 15:44:19 +0000 X-Received: from G1W8107.americas.hpqcorp.net (g1w8107.austin.hp.com [16.193.72.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3426.houston.hpe.com (Postfix) with ESMTPS id 9878459; Tue, 9 Feb 2021 15:44:18 +0000 (UTC) X-Received: from G4W9120.americas.hpqcorp.net (2002:10d2:150f::10d2:150f) by G1W8107.americas.hpqcorp.net (2002:10c1:483b::10c1:483b) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Feb 2021 15:44:18 +0000 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (15.241.52.13) by G4W9120.americas.hpqcorp.net (16.210.21.15) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 9 Feb 2021 15:44:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fVS0V7hta1QGHAlV6mMpm8g+C3WqcXE9qUz83B0yqPBpFy1ld/9oZtWZLJqLT0o6NSf3n48QZGtzqZDoQ0lxvlIZE8KKFSbnEJ2NfCkSWNooQKp/Jlc7JYre4iVM6b+8EqTWJButpeGabiYVY7hUnt6TV8SG9yoMpIElx5bl8Gsyya5QSiZaMQcHuygoU3XHxGbbaEaoZl22B93fOErIg84/EYY/h9QSvCgIEJZQpMXI7hE+S1RgLFhlAtJVRC8bAMLzM15pifdSqC2gJ5jjLP35fZ5Kl+4gKuKH55rHbFOo9nhbNqycK/SIni6gqT2CVQUKCjfcAP0DItabQ6wg4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6OlcG+U99k6cTKErFqHZOJ9nRiTzGuLpNTXqOILUtiQ=; b=NLUJKGsEQETJIgypYKgSiaTC1TMvflYhhtDwxMvbd7PAU4gb/aAKspg6R60MmiJjpUvG2NmWchz7S8VOAvkDNAIhNWygp6ju+aJfz6xgkltTfF3Zpj38uvDjS7kBFHQwzPjWPDp+/0kwCsRDkKOixnvHGcpywCo8+DRIZeHHjCzUrE94C70yngvEnm6pqTSRyVYD1QxNYo5C3WQ1AT2Rnw7gwCvjOEPJmhHmR8srRDzFIhPnO/5FjBxhacsHSA8NR7KodrMIaa8WehR+ziBc18e6dQ2ZzmdwCd0FUP377mgMg2d3mpPowYpk3210a8zUFxwixHTOpH5hsiTYhPvQiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) by DF4PR8401MB0508.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.20; Tue, 9 Feb 2021 15:44:16 +0000 X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0]) by DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0%9]) with mapi id 15.20.3825.030; Tue, 9 Feb 2021 15:44:16 +0000 From: "Daniel Schaefer" To: CC: G Edhaya Chandran , Barton Gao , Samer El-Haj-Mahmoud , Eric Jin , Arvin Chen , Leif Lindholm , Heinrich Schuchardt , Abner Chang Subject: [edk2-devel] [edk2-test PATCHv2 2/5] SctPkg: Adapt Aarch64 sources for Riscv64 Date: Tue, 9 Feb 2021 23:43:51 +0800 Message-ID: <20210209154354.30234-3-daniel.schaefer@hpe.com> In-Reply-To: <20210209154354.30234-1-daniel.schaefer@hpe.com> References: <20210209154354.30234-1-daniel.schaefer@hpe.com> X-Originating-IP: [123.193.51.23] X-ClientProxiedBy: HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) To DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from x360-nix.hitronhub.home (123.193.51.23) by HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.23 via Frontend Transport; Tue, 9 Feb 2021 15:44:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 51ea6aad-fa9a-4a33-539c-08d8cd118e9c X-MS-TrafficTypeDiagnostic: DF4PR8401MB0508: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: JP+yd77Z4LBOlcqpTw8XblledNgFnCCvwVbXQH9NQI+kjdpJg29W2s7R6FwXVle1Xamyys5xxLE0bal6PjYgGws6THu9LRJXQm+iOH7bevzwpCPCrud6qibCvFVQWE9YuxwaLmwmTKpcM1sn43sTxUpljCHVgmtVbcR9qAL2Nbwk+jCkS8ti1799b7Qv3xB5Me/5OKntG4qBiNft7mt6KbonVHq3+3QCTew3l0i23fCuo11h3xZj4TIrJT7Nzih04MKlCGOx/tzS+ZwUniC0w9AfU+B2S77HmxlGbfkoNZy3K4NCPqL04gPYtC1gKVNyWtf2gFfKCIUu/2O+I9slwQgz+bd64fNCwmSTKEaL76PUVKUhk0CK9bclwcvIDbaFyirqsakT/gy1PB0VC+OyAJ5Vo+czHagv3ng4OkakOBON6rvfPD1c0HqPqfcUWBXp/uhM4/rt5gUcZLDwc/7U210KRFQ8BFXG+/dj8B1PIuUiQwIPz0wAcUUXDEsROVCpdx0Nmaq3BcSNmC9Mx9noPYmTfznxBQqh+UzbZT9gCynpMVfTdMuWfxtlzCt4/+ppZI2beOc6PGkNVdoPGvOfgHFYsfnsT2f8Hi0OMsAr0ks= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?kacvWCfbbWBpXtEVw66f/M+WFtBG7PkEW41W+u4gi/5p4XEdxI0N7uJQWUz/?= =?us-ascii?Q?pR93cmJ8dFOldeebH1xgKB9TbVOmaldJb23G17e3LudSZ1HZshD6MwsLYfIx?= =?us-ascii?Q?sqpnlZBWCcKJNY8+HjuP+ai5zhf8530m7l3RouFcY66pS7CUoeA9gm+HRFdF?= =?us-ascii?Q?e3NzWMdmWWXehHnWQuYSMzHMzE8hY+9uuvgFlzgHUsz0KmKjdAW4sL6S31bc?= =?us-ascii?Q?Z9Z1cLR0cR0JslL7v6vTSx/kCjAT4ShHzPsoK4Dj2JD97BqEMVS3TD8u/bws?= =?us-ascii?Q?8EgIPXQ0lc35+/sn5gVQmFF96g3mEKAOKl1epMcW2xuJ71GT4MdMNR0wfsjJ?= =?us-ascii?Q?FKCqTgfOq4VsSr3Ir3iGVAlP7iAx7e9rQMz5QJ5EWmBNNIfk+tKEI6O2Wl9M?= =?us-ascii?Q?4QdMHSOfIlaV7e8q/DLZDK7IdEdbOM6HuWRnh/qCHXIblDMMnPY7wVLlSwTi?= =?us-ascii?Q?MJJOJd5JCtQtSm0SY85nGa8BfFZGuMTO4Nu+T/HwBu+vhkLHWcLHrjMo1SXQ?= =?us-ascii?Q?ayevBYkNWDZlREUZSRhHb4BI/ILHYeCwv0yWjjZmupWARpDf99NTi4vKh5Ui?= =?us-ascii?Q?ODhES/QG3tPm8skgzca6eHFOHneJBQiJznva1ybIXbdDRu9rQYjco164RH1i?= =?us-ascii?Q?O+7xJu6LEJ2u1zqTCgWIcL0QNRBtwj1wmJgdD6HG7NEQWwkm2VfEBtoyCS5u?= =?us-ascii?Q?u05rHRTgtJ5TgTQ4kOzWpnXVGP7BYCXpPPZtK7Dcq1h3Fth8BOUVeDOs4/0I?= =?us-ascii?Q?at0eGZYG2VizXUDMOd5RKm2gxqCs5/kLD/EpTqesdrJyYJ9HS4hrBOaXwxBy?= =?us-ascii?Q?0miqa3C8887UFoWfbMVplx2tsXi7lZpOL64Yy4plrFq5fqzpoxfd92nYg6LQ?= =?us-ascii?Q?vMrqhOPbYgdGXI+ZEsd2PJjNUI0WpV50fkKle8CGb8QNN5KAtEn3ViGYU3aC?= =?us-ascii?Q?vjIFWcF+lhLCGJcNh9fa4FFB8wHm1k2iGBuiqEEj8S6tbjSqKgNZ7pn72Gt9?= =?us-ascii?Q?TiTPyOqWYzwdqrNDdiWn2pkrSSnE1KcfwL6/nt8AjjGKkWDk5AYSy9+i5jUz?= =?us-ascii?Q?TbSFb6AVAABTqmgDs5Sfb46sxr4r46BTfNlPsVJgIBsxAKBbgzlMKFVaUHIv?= =?us-ascii?Q?MbXHti2lOXOvk/lavCHih7eBAehpGFFDa17M9JY9m4wqjasaERkH0GhwTy7g?= =?us-ascii?Q?QHAZ4lh8kC0Ag7OAxRREd97scR7Sx+icVSoN15fZxELDtwx6YzPMnInuUwzY?= =?us-ascii?Q?0PfTXuLZF+Y422XPOct0vN33LK/9DYSUfcs76B9eLB5tYGgLpCK26j+oces7?= =?us-ascii?Q?WVUq05eSILtFW8X78d3lJwVW?= X-MS-Exchange-CrossTenant-Network-Message-Id: 51ea6aad-fa9a-4a33-539c-08d8cd118e9c X-MS-Exchange-CrossTenant-AuthSource: DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2021 15:44:16.7601 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CCXqyiaiSzuVZT2R3RuVBe8GeIJNtLD15iIflFJucLUgM7v8LpwmPb3Ibtd0dxum5jc3hg40qDV3/EneGAQxdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DF4PR8401MB0508 X-OriginatorOrg: hpe.com X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,daniel.schaefer@hpe.com X-Gm-Message-State: HubaEEjZ28pV8h2zcLI9tnIOx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1612885470; bh=ECNrE/hoP3sbxeUwnz7meXoVK2zUFFh+Xq8/aRHaUOA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Ael7d+6Sm3UPP8gnDUOq41RZl5x9hBx07DG3WMxLuZrjH0xQYvs59jcy4BqxIVqh748 CXYEg2Cbzrpn67fqXmbeuQe1fczpEx/bKCiMMh03YPhHofppYotVa6pBikF7NaM/umlis XJQp8BzjFRydHx4l5Kj1XX6h00NdLUc8x+4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3042 Cc: G Edhaya Chandran Cc: Barton Gao Cc: Samer El-Haj-Mahmoud Cc: Eric Jin Cc: Arvin Chen Cc: Leif Lindholm Cc: Heinrich Schuchardt Cc: Abner Chang Signed-off-by: Daniel Schaefer Reviewed-by: Abner Chang --- uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h = | 3 +- uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S = | 9 ++-- uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c = | 16 +++---- uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c = | 22 +++------ uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c = | 7 +-- uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.h = | 48 -------------------- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/DebugSupportBBTestExceptionCallbackFunction.c | 12 ++--- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/PlatformIsa.c | 4 +- uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/EntsL= ibPlat.h | 2 +- 9 files changed, 31 insertions(+), 92 deletions(-) diff --git a/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h b/uefi-sct= /SctPkg/Library/SctLib/Riscv64/SctLibPlat.h index ee7c656b..69e7f904 100644 --- a/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h +++ b/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h @@ -2,6 +2,7 @@ =20 Copyright 2006 - 2012 Unified EFI, Inc.
Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -20,7 +21,7 @@ Module Name: =20 Abstract: =20 - AArch64 specific defines + RISCV64 specific defines =20 --*/ =20 diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S b/uefi-sct/Sc= tPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S index d223b36b..ae33da18 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S @@ -2,6 +2,7 @@ # # Copyright 2010 - 2012 Unified EFI, Inc.
# Copyright (c) 2012, ARM Ltd. All rights reserved.
+# Copyright (c) 2021, Hewlett Packard Enterprise Development LP.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -23,8 +24,6 @@ #--*/ #start of the code section .text -/* FIXME: Should alignment be different on Aarch64? */ -.align 3 =20 .global JumpToTestFunc .type JumpToTestFunc, %function @@ -37,8 +36,8 @@ # ) # JumpToTestFunc: - mov x2, x0 - mov x0, x1 + mv x2, x0 + mv x0, x1 =20 // Jump to Virtual function - blr x2 + jalr x2 diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c b/uefi-sc= t/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c index 397b3514..00b59594 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c @@ -2,6 +2,7 @@ =20 Copyright 2006 - 2012 Unified EFI, Inc.
Copyright (c) 2012, ARM Ltd. All rights reserved.
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -22,9 +23,6 @@ Module Name: =20 #include "SCRTApp.h" =20 -#define VIRT_TO_PHYS_OFFSET (0x80000000) //2G - -BOOLEAN HighAddress =3D FALSE; UINTN PageTable =3D 0; =20 =20 @@ -49,11 +47,10 @@ Returns: =20 --*/ { - /*Note: It is presumed that on ARM v5, V6 and V7 architectures - * the MMU is configured and enabled in PEI phase. As VirtualFunc - * is already mapped to virtual memory, don't have to do anything here. + /* Note: It is presumed that on RISCV architectures the MMU is configure= d and + * enabled in PEI phase. As VirtualFunc is already mapped to virtual mem= ory, + * don't have to do anything here. */ - /* FIXME: Is it the same on ARM v8? */ } =20 =20 @@ -174,9 +171,8 @@ Returns: --*/ { // - // Note: It is assumed that the MMU and page tables are configured on AR= M platforms - // based on ARM v5 v6 and v7 architecture. + // Note: It is assumed that the MMU and page tables are configured on RI= SC-V + // platforms. // - /* FIXME: Is it the same on ARM v8? */ JumpToTestFunc(VirtualFunc, HandOffAddr); } diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c b/uefi-sct/Sct= Pkg/SCRT/SCRTDriver/Riscv64/Debug.c index 6161d596..2991935a 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c @@ -1,7 +1,8 @@ /** @file =20 Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
+ Copyright (c) 2021 Hewlett Packard Enterprise Development LP. All rights= reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -24,7 +25,6 @@ Module Name: #include "SCRTDriver.h" =20 UINTN mHandOffPtr =3D 0; -EFI_PHYSICAL_ADDRESS mIoPortSpaceAddress =3D 0; =20 =20 EFI_STATUS @@ -42,18 +42,10 @@ ConsumeHandOff ( HandOffPtr =3D (RUNTIME_HANDOFF*)mHandOffPtr; *ConfigData =3D HandOffPtr->ConfigureInfo; =20 - if (!HandOffPtr->DebuggerInfo.MmioFlag){ - // - // If debug port is I/O mapped, fix IoBase Address. - // - FixAddress(&HandOffPtr->DebuggerInfo.IoBase); - mIoPortSpaceAddress =3D HandOffPtr->DebuggerInfo.IoBase; - } else { - // - // If debug port is MMIO, fix MmioBase Address. - // - FixAddress(&HandOffPtr->DebuggerInfo.MmioBase); - } + // + // Fix MmioBase Address. + // + FixAddress(&HandOffPtr->DebuggerInfo.MmioBase); =20 return EFI_SUCCESS; } @@ -65,7 +57,7 @@ Send2UART ( ) { // - // TODO: On ARM platforms use platform specific functions to + // TODO: On RISC-V platforms use platform specific functions to // write the data to UART. // return EFI_SUCCESS; diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c b/uefi-sct/SctPkg= /SCRT/SCRTDriver/Riscv64/Io.c index b925e151..255cb9a6 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c @@ -2,6 +2,7 @@ =20 Copyright 2006 - 2012 Unified EFI, Inc.
Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + (C) Copyright 2021 Hewlett Packard Enterprise Development LP
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -21,7 +22,7 @@ Module Name: =20 --*/ =20 -#include "Io.h" +#include "SCRTDriver.h" =20 EFI_STATUS EFIAPI @@ -119,11 +120,11 @@ FixAddress ( ) { // - //Note: On ARM platforms don't have to do this as all the functions are = virtually mapped. + //Note: On RISC-V platforms don't have to do this as all the functions a= re virtually mapped. // } =20 -// Quick port to ARM +// Quick port to RISC-V. It doesn't have traditional I/O-Port 80h POST Cod= es =20 VOID Port80 ( diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.h b/uefi-sct/SctPkg= /SCRT/SCRTDriver/Riscv64/Io.h deleted file mode 100644 index 1e78b3e4..00000000 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.h +++ /dev/null @@ -1,48 +0,0 @@ -/** @file - - Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 - - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 - http://opensource.org/licenses/bsd-license.php -=20 - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 -**/ - -/*++ - -Module Name: - - Debug.h - ---*/ - -#ifndef _IA32_IO_ACCESS_H -#define _IA32_IO_ACCESS_H - -#include "SCRTDriver.h" - -#define IA32_MAX_IO_ADDRESS 0xFFFF - -#define IA32API - - -typedef union { - UINT8 VOLATILE *buf; - UINT8 VOLATILE *ui8; - UINT16 VOLATILE *ui16; - UINT32 VOLATILE *ui32; - UINT64 VOLATILE *ui64; - UINTN VOLATILE ui; -} PTR; - -// This address is assuming a pure PC architecture. Not required? -#define VIRT_TO_PHYS_OFFSET (0x80000000) //2G - - - -#endif diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/Sct= Pkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSuppo= rtBBTestExceptionCallbackFunction.c index c27c0c0c..c6e72806 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestExceptionCallbackFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestExceptionCallbackFunction.c @@ -2,6 +2,7 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -37,7 +38,7 @@ SoftwareBreak ( void ) { - // Not ported to ARM yet + // Not ported to RISC-V yet ASSERT (FALSE); } =20 @@ -99,9 +100,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( // Invoke RegisterExceptionCallback() to install an interrupt handler fu= nction. // InvokedExceptionCallback =3D FALSE; - // FIXME: Is it normal that we use EXCEPT_IA32_BREAKPOINT here? - // Shouldn't we define proper constants for ARM exceptions in DebugSuppo= rtProtocol.h file? - Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback, EXCEPT_IA32_BREAKPOINT); + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback, EXCEPT_RISCV_BREAKPOINT); =20 if ((Status =3D=3D EFI_SUCCESS) || (Status =3D=3D EFI_ALREADY_STARTED)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -205,7 +204,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( // Assertion Point 3.4.2.3 // Invoke RegisterExceptionCallback() to install another interrupt handl= er function. // - Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback1, EXCEPT_IA32_BREAKPOINT); + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback1, EXCEPT_RISCV_BREAKPOINT); =20 if (Status !=3D EFI_ALREADY_STARTED) { AssertionType =3D EFI_TEST_ASSERTION_FAILED; @@ -228,7 +227,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( // Assertion Point 3.4.2.4 // Invoke RegisterExceptionCallback() to unstall the interrupt handler f= unction. // - Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, NUL= L, EXCEPT_IA32_BREAKPOINT); + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, NUL= L, EXCEPT_RISCV_BREAKPOINT); =20 if (EFI_ERROR(Status)) { AssertionType =3D EFI_TEST_ASSERTION_FAILED; @@ -273,4 +272,3 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( =20 return EFI_SUCCESS; } - diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/PlatformIsa.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/D= ebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c index 8334f601..8b23d91b 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/PlatformIsa.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/PlatformIsa.c @@ -2,6 +2,7 @@ =20 Copyright 2006 - 2012 Unified EFI, Inc.
Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -26,5 +27,4 @@ Abstract: =20 #include "DebugSupportBBTestMain.h" =20 -EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa =3D IsaAArch64; - +EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa =3D IsaRiscv64; diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/R= iscv64/EntsLibPlat.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENT= S/EasLib/Riscv64/EntsLibPlat.h index ff781aee..7f7835e4 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= EntsLibPlat.h +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= EntsLibPlat.h @@ -20,7 +20,7 @@ Module Name: =20 Abstract: =20 - AArch64 specific defines + RISCV64 specific defines =20 --*/ =20 --=20 2.30.0 -=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 (#71527): https://edk2.groups.io/g/devel/message/71527 Mute This Topic: https://groups.io/mt/80507438/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 Sun Feb 8 11:49:36 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+71531+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+71531+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1612885479918592.5139802967564; Tue, 9 Feb 2021 07:44:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id CzgHYY1788612xucCeeVrxke; Tue, 09 Feb 2021 07:44:39 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web10.12316.1612885477242701741 for ; Tue, 09 Feb 2021 07:44:37 -0800 X-Received: from pps.filterd (m0134422.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 119Fd0pv009801; Tue, 9 Feb 2021 15:44:30 GMT X-Received: from g4t3426.houston.hpe.com (g4t3426.houston.hpe.com [15.241.140.75]) by mx0b-002e3701.pphosted.com with ESMTP id 36kvrhga3g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Feb 2021 15:44:29 +0000 X-Received: from G1W8108.americas.hpqcorp.net (g1w8108.austin.hp.com [16.193.72.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3426.houston.hpe.com (Postfix) with ESMTPS id 3421060; Tue, 9 Feb 2021 15:44:29 +0000 (UTC) X-Received: from G9W8456.americas.hpqcorp.net (2002:10d8:a15f::10d8:a15f) by G1W8108.americas.hpqcorp.net (2002:10c1:483c::10c1:483c) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Feb 2021 15:44:23 +0000 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (15.241.52.13) by G9W8456.americas.hpqcorp.net (16.216.161.95) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 9 Feb 2021 15:44:23 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W8VqukD2M657gwi0NswJtXiFter8STeN3y3nEy1C3NQyF/r/L3BvQOKDkXDwf44q6uMeDqUc4R163ekaCHqvYjvEN7AnHMmhF3g3j1OM7DwJgxMzcuiG6y+QnnL7sOp8i2LF8VrPYl8VycKvfslkrmsD19nAy02ONIxqa3Kj/N/sb62cTS7eugPHiN1MPCsOlQA49y1mgY7tg71D2AF/t6BC+w8LHWPNr6AcdsZ0o/S12zPAI2qYmgRlvFtrtUx3MehypUoHuBXh9e0rwlkTnCox05KtUGneBoWsOM+DogXpbG5LXJq4ceTM+PlfqS8vVsFBvbRMpC641Lo5HcSzKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MhQtyFNXudFqkG9OXIO5b7W8jDiV84QD05e8vnxlrxg=; b=b/flo0StWIxoTMN4L/0aYOfEqFuef4DpQKOqubE6PNvP/rpoZOk6dNGJnvb8YVK5iYiY8TZ5CN3aRU/5rcHmQrL9vs9rP+E81UwVkxFzc2sddPqpejl2qAlodxRnG1RylS/yoyjEdUAMeICWsfCqx7sE3P5GxZ7OPr+t3+/ZaW9V4ENCVNQf+BvpiFU84BxtvYMU4Iuctzv/F14GI2w48NqUj8mwmhhemMh6cxw9bZuIPwmn/7nq+8uggpLxkWLxe6qupXA5F1xwTtOr/IVk4Kegos/MXj5l8I2jLlFbs/HIo8SzNFXcL2+fbi9VKIhighos5jj90YcF9G1VuCz1tA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) by DF4PR8401MB0508.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.20; Tue, 9 Feb 2021 15:44:20 +0000 X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0]) by DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0%9]) with mapi id 15.20.3825.030; Tue, 9 Feb 2021 15:44:20 +0000 From: "Daniel Schaefer" To: CC: G Edhaya Chandran , Barton Gao , Samer El-Haj-Mahmoud , Eric Jin , Arvin Chen , Leif Lindholm , Heinrich Schuchardt , Abner Chang Subject: [edk2-devel] [edk2-test PATCHv2 3/5] SctPkg: Add RISCV64 build support Date: Tue, 9 Feb 2021 23:43:52 +0800 Message-ID: <20210209154354.30234-4-daniel.schaefer@hpe.com> In-Reply-To: <20210209154354.30234-1-daniel.schaefer@hpe.com> References: <20210209154354.30234-1-daniel.schaefer@hpe.com> X-Originating-IP: [123.193.51.23] X-ClientProxiedBy: HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) To DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from x360-nix.hitronhub.home (123.193.51.23) by HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.23 via Frontend Transport; Tue, 9 Feb 2021 15:44:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: fb9277f7-893b-417c-976c-08d8cd119090 X-MS-TrafficTypeDiagnostic: DF4PR8401MB0508: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: /+6xHbIHRlrNE4HHBojk2nybcWsaCQDX9dh7SMDeuCT3+WNgUl5zYWQyNJq0+h4G6ToFzHDjcLbgWGkG996Oox2ob1VaID3UdZJflpuDW2RVahtDipQ318EPrfA8yWr1Wc5SuJC3NI1vwm89p/kuSZvz45RI6WpmpNKbhUVroCi56blcEbb36iZvPn7Zm8LOOUJk6NYpxDvwGmoeNN8SZzUNve3PBprzjZF8yRymcwPWDNSReZoR+tye1UnaHtUAqDmC5890qIAC4t7rHKhjioyfQ2SYDabTx0dCnZQHPgyHvubeH9JmgZifZ7f42luy09qJEnHowr726N5J7S/oAMEBGS061PhLNwMlkUjWhmnUNcByjXOyfiMMjglVwhSkg4yRVTJ6ttaFJBnuDDDHE8N3oPDZJP+x/je6ik6pVz3ESpriyUO7pZlDwcOWevlUB3qHSHwFMHxOsHofWJGivIkLMsp/NLN+HOpkRYCi5w2sNJFxcD003V2ArzuFCJPf8qEopKfCZtzvX9F5CZZ3q3KZG0jIFYi0fvcyWEQgY1SsDZaZUA1Pl+o48TTkWcaSdcFFw4SOGfcfAg3hTqbZYw2/O20UG/bKTvC1xrpd5Rc= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?gCawSDE2moQjGBVkaeSKxpaIjTdPeDCFZZTq82UIOTrmbVcfxVGFEc9lR9Zh?= =?us-ascii?Q?7K7Ljh5Ca/C4Y+v2pP1iN3TR1r9kIsdrO1m4OYO9PwIHqg0odSw4xPfSMDG4?= =?us-ascii?Q?uNkjlJYkIpo6xFKqxvYyIheOMqZv8MFnuH8/xk9gxQAv9YjBay2AG9yv27UW?= =?us-ascii?Q?39NKq5x33IpMXwpOcOukShbl+6ZkY9/CfjI0ZQaNIyLPzAwrVWYT8SQQ0Q2R?= =?us-ascii?Q?GAa9TcO04nEErr+5WyjZXTX+YPx0i9rWmSrHaeUO49FRb6Nru+f4z21VmgcT?= =?us-ascii?Q?BM1UP1T/9zOMnrfEMncCoS+CNhY4e4++JYXYN4szYieIYl6ff7UkH9AjlkWx?= =?us-ascii?Q?ZCX4BfeyDFK5w+2pWn0LiUqbBbb7hlCSzxojWwODVA18Z42YHr4tKDSfAKxA?= =?us-ascii?Q?s1kqvbC/+mB6clZal4X8sDXmmU/MhSCHbuEgDvY4yL0jU1mbHOTt4O35CYKK?= =?us-ascii?Q?CQy7RCdSoMPV7PU+TB8ZESr0xE/9Bf1H2cc6JN6hdEfaH2R/f8OIUmY8gHHQ?= =?us-ascii?Q?eYeAOcZdE5W+cVwuCyLecLavfhfIxPe4kb3qbXeV23rwx93bXZJaNBg7wR9I?= =?us-ascii?Q?yYbnxxl5lPkAQaGIfL47enNVRkHBAYXc4IamhJWSDmPqEAA5PVallTvfVTZd?= =?us-ascii?Q?9kfKmO39d0J5aiTlSUuVehJhyrC6ewq9r64iHB9GR21ZYLOEJ1z060dgHgd7?= =?us-ascii?Q?aKjpujBqJ1q2pTrNN8J5xkkw3iVYNzLrlF2jS7cRFV/9SO2uj6S33xLSkzkF?= =?us-ascii?Q?ZjYUbmV0KD1NUioqVbJEbEN1IP+avIyKyWFg2yvLgoW3B0JzqUQIU49qLj5f?= =?us-ascii?Q?KMcijVTPhtyV1eYuTik0zXhhG9U6mARjXcxDS/06zeguzEj6ht7GcHkBFKSg?= =?us-ascii?Q?R44ynZQDQJEoDJcHgxPdjQz1k7yaMYKc5GvcSjgNLOCQRpQCGOuk+SHH3dFJ?= =?us-ascii?Q?saiUdJUZdi2oz41iTbYuzePL1YNXHB9rlWKICAts6GMncSZPxBcg7IZvuqTc?= =?us-ascii?Q?bdzN4snH+TcUHCbvbgyFFEuolmWVu2gMDV+SX1cgemwZzh8yprpvUIPppoHD?= =?us-ascii?Q?CAKDoDiXmC4lXQua3E+oIEC3C5ZPm2GNOhOcTlLBr6mou0wO5O9xLwstqwQ7?= =?us-ascii?Q?5W+NBU+sZcU6pY5LMqItz5a5IlmgUFM8D/R7a7mZYRmRjlep60N7QMXBrUOJ?= =?us-ascii?Q?J34wfE0hZBtCKc6BTmGI4zNEVzthQY25xMbivAtgC3XfQl59uqdE7xHy7u5r?= =?us-ascii?Q?DmFO6E1x9JeHkYdM6afWX212avEtzxeqIJja+hjdbUzA/s5R9qaN7h8Fvw7B?= =?us-ascii?Q?2hTzTx0EKhMTE7j7/ldZumuW?= X-MS-Exchange-CrossTenant-Network-Message-Id: fb9277f7-893b-417c-976c-08d8cd119090 X-MS-Exchange-CrossTenant-AuthSource: DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2021 15:44:19.9257 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Krtue8LaQ1J2CBmOWCBwEgN8ChkvMdy97+5+kbYZ8GUwuEAHet5UI8UYTfHaGgO9X2Ld07Hqjhg2F+ZZcr01xA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DF4PR8401MB0508 X-OriginatorOrg: hpe.com X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,daniel.schaefer@hpe.com X-Gm-Message-State: o736fPYse6XTSY2f3xQxTR41x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1612885479; bh=s4jgqMP7Ztcj6MT6hDmh0T1oXel9QBfHh7r9QL51X5Q=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=uyBTY1LxQXPEUXJkBGiCnVGg5Vk+w8FXAmBR3aMRvmVXq3zSGM8XZBdgpjcpOl1DfRp UNYLvX0pj5k3cheMuG5MvZJVANh8sek2iWmXtF+I4LB0HMYxCx03jFvUEgB2HNMJqlBt9 lsqIEYb6QwffJJWZb21Fb9mCazgWedARwqs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3042 Cc: G Edhaya Chandran Cc: Barton Gao Cc: Samer El-Haj-Mahmoud Cc: Eric Jin Cc: Arvin Chen Cc: Leif Lindholm Cc: Heinrich Schuchardt Cc: Abner Chang Signed-off-by: Daniel Schaefer Reviewed-by: Abner Chang --- uefi-sct/SctPkg/Application/InstallSct/InstallSctDef.h = | 4 ++ uefi-sct/SctPkg/Library/SctLib/SctLib.inf = | 6 ++ uefi-sct/SctPkg/SCRT/SCRTApp/SCRTApp.inf = | 5 ++ uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.inf = | 6 ++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Debug= SupportBBTest.inf | 6 ++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest.= inf | 4 ++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.in= f | 4 ++ uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.inf = | 5 ++ uefi-sct/SctPkg/Tools/Source/GenBin/GNUmakefile = | 4 ++ uefi-sct/SctPkg/UEFI/IHV_SCT.dsc = | 17 +++++- uefi-sct/SctPkg/UEFI/Protocol/DebugSupport.h = | 61 +++++++++++++++++++- uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc = | 18 +++++- uefi-sct/SctPkg/build.sh = | 11 +++- 13 files changed, 144 insertions(+), 7 deletions(-) diff --git a/uefi-sct/SctPkg/Application/InstallSct/InstallSctDef.h b/uefi-= sct/SctPkg/Application/InstallSct/InstallSctDef.h index a7815580..02f0283e 100644 --- a/uefi-sct/SctPkg/Application/InstallSct/InstallSctDef.h +++ b/uefi-sct/SctPkg/Application/InstallSct/InstallSctDef.h @@ -3,6 +3,7 @@ Copyright 2006 - 2017 Unified EFI, Inc.
Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved.
Portions copyright (c) 2014, ARM Ltd. All rights reserved.
+ (C) Copyright 2021 Hewlett Packard Enterprise Development LP
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -32,6 +33,9 @@ #elif defined(EFIAARCH64) #define INSTALL_SCT_PLATFORM_SHORT_NAME L"aarch64" #define INSTALL_SCT_PLATFORM_NAME L"AARCH64" +#elif defined(EFIRISCV64) + #define INSTALL_SCT_PLATFORM_SHORT_NAME L"riscv64" + #define INSTALL_SCT_PLATFORM_NAME L"RISCV64" #else #error "Architecture not supported" #endif diff --git a/uefi-sct/SctPkg/Library/SctLib/SctLib.inf b/uefi-sct/SctPkg/Li= brary/SctLib/SctLib.inf index 23cb77fb..7527b203 100644 --- a/uefi-sct/SctPkg/Library/SctLib/SctLib.inf +++ b/uefi-sct/SctPkg/Library/SctLib/SctLib.inf @@ -3,6 +3,7 @@ # Copyright 2006 - 2016 Unified EFI, Inc.
# Copyright (c) 2013 - 2014, ARM Ltd. All rights reserved.
# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -62,6 +63,11 @@ Aarch64/initplat.c Math.c =20 +[sources.RISCV64] + Riscv64/SctLibPlat.h + Riscv64/initplat.c + Math.c + [sources.ia32] ia32/SctLibPlat.h ia32/initplat.c diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/SCRTApp.inf b/uefi-sct/SctPkg/SCR= T/SCRTApp/SCRTApp.inf index 7aca6e30..8104a4ef 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTApp/SCRTApp.inf +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/SCRTApp.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2016 Unified EFI, Inc.
# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -39,6 +40,10 @@ Aarch64/GoVirtual.asm | RVCT Aarch64/GoVirtual.S | GCC =20 +[sources.RISCV64] + Riscv64/VirtualMemory.c + Riscv64/GoVirtual.S | GCC + [sources.ia32] ia32/VirtualMemory.c ia32/GoVirtual.asm | MSFT diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.inf b/uefi-sct/SctP= kg/SCRT/SCRTDriver/SCRTDriver.inf index ad0eb0f8..a3ef454e 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.inf +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/SCRTDriver.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2016 Unified EFI, Inc.
# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -69,6 +70,11 @@ Aarch64/Dump.c Aarch64/Debug.c =20 +[sources.RISCV64] + Riscv64/Io.c + Riscv64/Dump.c + Riscv64/Debug.c + [sources.common] Guid.h Guid.c diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/DebugSupportBBTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/= DebugSupport/BlackBoxTest/DebugSupportBBTest.inf index 799f86fd..03bf7ccf 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= DebugSupportBBTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= DebugSupportBBTest.inf @@ -3,6 +3,7 @@ # Copyright 2006 - 2012 Unified EFI, Inc.
# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
# Copyright (c) 2019, ARM Ltd. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -67,6 +68,11 @@ Aarch64/DebugSupportBBTestExceptionCallbackFunction.c Aarch64/DebugSupportBBTestCacheFunction.c =20 +[sources.RISCV64] + Riscv64/PlatformIsa.c + Riscv64/DebugSupportBBTestExceptionCallbackFunction.c + Riscv64/DebugSupportBBTestCacheFunction.c + [Packages] SctPkg/SctPkg.dec SctPkg/UEFI/UEFI.dec diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest= /Usb2HcTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBo= xTest/Usb2HcTest.inf index e8118739..95ae593e 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2Hc= Test.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2Hc= Test.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2016 Unified EFI, Inc.
# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -55,6 +56,9 @@ #[sources.Aarch64] # IPF/TimerInterrupt.c =20 +#[sources.Riscv64] +# IPF/TimerInterrupt.c + [Packages] MdePkg/MdePkg.dec SctPkg/SctPkg.dec diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/= UsbHcTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTe= st/UsbHcTest.inf index efc438c1..d3bcd5ce 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTe= st.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTe= st.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.
# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -55,6 +56,9 @@ [sources.Aarch64] Aarch64/TimerInterrupt.c =20 +[sources.RISCV64] + Riscv64/TimerInterrupt.c + [Packages] MdePkg/MdePkg.dec SctPkg/SctPkg.dec diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/E= ntsLib.inf b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/E= ntsLib.inf index 23f12d1a..b60e90b2 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.= inf +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/EntsLib.= inf @@ -3,6 +3,7 @@ # Copyright 2006 - 2012 Unified EFI, Inc.
# Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.
# Copyright (c) 2019, ARM Ltd. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -66,6 +67,10 @@ Aarch64/EntsLibPlat.h Aarch64/InitPlat.c =20 +[sources.RISCV64] + Riscv64/EntsLibPlat.h + Riscv64/InitPlat.c + [Packages] MdePkg/MdePkg.dec SctPkg/SctPkg.dec diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GNUmakefile b/uefi-sct/Sct= Pkg/Tools/Source/GenBin/GNUmakefile index c235f313..c492d441 100644 --- a/uefi-sct/SctPkg/Tools/Source/GenBin/GNUmakefile +++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GNUmakefile @@ -1,6 +1,7 @@ # # Copyright 2006 - 2010 Unified EFI, Inc.
# Copyright (c) 2010 Intel Corporation. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -31,6 +32,9 @@ ifndef ARCH ifneq (,$(findstring arm,$(uname_m))) ARCH=3DARM endif + ifneq (,$(findstring riscv64,$(uname_m))) + ARCH=3DRISCV64 + endif ifndef ARCH $(info Could not detected ARCH from uname results) $(error ARCH is not defined!) diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SC= T.dsc index f9e86264..94bb5c36 100644 --- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc +++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc @@ -3,6 +3,7 @@ # Copyright 2006 - 2016 Unified EFI, Inc.
# Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
# Copyright (c) 2019,Microchip Technology Inc.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -42,7 +43,7 @@ PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x00010005 OUTPUT_DIRECTORY =3D Build/IhvSct - SUPPORTED_ARCHITECTURES =3D IA32|X64|ARM|AARCH64 + SUPPORTED_ARCHITECTURES =3D IA32|X64|ARM|AARCH64|RISCV64 BUILD_TARGETS =3D DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT =20 @@ -109,6 +110,12 @@ *_*_AARCH64_PP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) RVCT:*_*_AARCH64_DLINK_FLAGS =3D --muldefweak =20 + *_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) -ffreestand= ing -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunused-bu= t-set-variable -Wno-error + *_*_RISCV64_VFRPP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + *_*_RISCV64_APP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + *_*_RISCV64_PP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + DEBUG_*_*_CC_FLAGS =3D -DEFI_DEBUG RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG =20 @@ -124,6 +131,9 @@ [Libraries.AARCH64] ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 +[Libraries.RISCV64] + ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + [Libraries.IA32,Libraries.X64] =20 [LibraryClasses.common] @@ -146,6 +156,9 @@ [LibraryClasses.AARCH64] NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 +[LibraryClasses.RISCV64] + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + [LibraryClasses.IA32] =20 ##########################################################################= ##### @@ -228,4 +241,4 @@ SctPkg/TestInfrastructure/SCT/Framework/Sct.inf =20 [Components.IA32, Components.X64] SctPkg/TestCase/UEFI/IHV/Protocol/PlatformDriverOverride/BlackBoxTest/IhvP= latformDriverOverrideBBTest.inf -SctPkg/TestCase/UEFI/IHV/Protocol/PlatformToDriverConfiguration/BlackBoxTe= st/IhvPlatformToDriverConfigurationBBTest.inf \ No newline at end of file +SctPkg/TestCase/UEFI/IHV/Protocol/PlatformToDriverConfiguration/BlackBoxTe= st/IhvPlatformToDriverConfigurationBBTest.inf diff --git a/uefi-sct/SctPkg/UEFI/Protocol/DebugSupport.h b/uefi-sct/SctPkg= /UEFI/Protocol/DebugSupport.h index 7fba87ae..1963d619 100644 --- a/uefi-sct/SctPkg/UEFI/Protocol/DebugSupport.h +++ b/uefi-sct/SctPkg/UEFI/Protocol/DebugSupport.h @@ -2,6 +2,7 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.
=20 + (C) Copyright 2021 Hewlett Packard Enterprise Development LP
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License @@ -607,6 +608,60 @@ typedef struct { UINT64 FAR; // Fault Address Register } EFI_SYSTEM_CONTEXT_AARCH64; =20 +/// +/// RISC-V processor exception types. +/// +#define EXCEPT_RISCV_INST_MISALIGNED 0 +#define EXCEPT_RISCV_INST_ACCESS_FAULT 1 +#define EXCEPT_RISCV_ILLEGAL_INST 2 +#define EXCEPT_RISCV_BREAKPOINT 3 +#define EXCEPT_RISCV_LOAD_ADDRESS_MISALIGNED 4 +#define EXCEPT_RISCV_LOAD_ACCESS_FAULT 5 +#define EXCEPT_RISCV_STORE_AMO_ADDRESS_MISALIGNED 6 +#define EXCEPT_RISCV_STORE_AMO_ACCESS_FAULT 7 +#define EXCEPT_RISCV_ENV_CALL_FROM_UMODE 8 +#define EXCEPT_RISCV_ENV_CALL_FROM_SMODE 9 +#define EXCEPT_RISCV_ENV_CALL_FROM_HMODE 10 +#define EXCEPT_RISCV_ENV_CALL_FROM_MMODE 11 + +#define EXCEPT_RISCV_SOFTWARE_INT 0x0 +#define EXCEPT_RISCV_TIMER_INT 0x1 + +typedef struct { + UINT64 X0; + UINT64 X1; + UINT64 X2; + UINT64 X3; + UINT64 X4; + UINT64 X5; + UINT64 X6; + UINT64 X7; + UINT64 X8; + UINT64 X9; + UINT64 X10; + UINT64 X11; + UINT64 X12; + UINT64 X13; + UINT64 X14; + UINT64 X15; + UINT64 X16; + UINT64 X17; + UINT64 X18; + UINT64 X19; + UINT64 X20; + UINT64 X21; + UINT64 X22; + UINT64 X23; + UINT64 X24; + UINT64 X25; + UINT64 X26; + UINT64 X27; + UINT64 X28; + UINT64 X29; + UINT64 X30; + UINT64 X31; +} EFI_SYSTEM_CONTEXT_RISCV64; + // // Universal EFI_SYSTEM_CONTEXT definition // @@ -618,6 +673,7 @@ union { EFI_SYSTEM_CONTEXT_IPF *SystemContextIpf; EFI_SYSTEM_CONTEXT_ARM *SystemContextArm; EFI_SYSTEM_CONTEXT_AARCH64 *SystemContextAArch64; + EFI_SYSTEM_CONTEXT_RISCV64 *SystemContextRiscV64; } EFI_SYSTEM_CONTEXT; =20 // @@ -645,6 +701,8 @@ VOID #define IMAGE_FILE_MACHINE_EBC 0x0EBC #define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED 0x01c2 #define IMAGE_FILE_MACHINE_ARM64 0xAA64 +#define IMAGE_FILE_MACHINE_RISCV64 0x5064 + =20 typedef enum { @@ -653,7 +711,8 @@ enum { IsaIpf =3D IMAGE_FILE_MACHINE_IA64, IsaEbc =3D IMAGE_FILE_MACHINE_EBC, IsaArm =3D IMAGE_FILE_MACHINE_ARMTHUMB_MIXED, ///< 0x01c2 - IsaAArch64 =3D IMAGE_FILE_MACHINE_ARM64 ///< 0xAA64 + IsaAArch64 =3D IMAGE_FILE_MACHINE_ARM64, ///< 0xAA64 + IsaRiscv64 =3D IMAGE_FILE_MACHINE_RISCV64 ///< 0x5064 } EFI_INSTRUCTION_SET_ARCHITECTURE; =20 typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL EFI_DEBUG_SUPPORT_PROTOCOL;; diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_= SCT.dsc index 2e97687b..e13e40e4 100644 --- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc +++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc @@ -2,7 +2,7 @@ # # Copyright 2006 - 2017 Unified EFI, Inc.
# Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.
-# (C) Copyright 2017 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2017 - 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -42,7 +42,7 @@ PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x00010005 OUTPUT_DIRECTORY =3D Build/UefiSct - SUPPORTED_ARCHITECTURES =3D IA32|X64|ARM|AARCH64 + SUPPORTED_ARCHITECTURES =3D IA32|X64|ARM|AARCH64|RISCV64 BUILD_TARGETS =3D DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT =20 @@ -112,6 +112,12 @@ *_*_AARCH64_PP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) RVCT:*_*_AARCH64_DLINK_FLAGS =3D --muldefweak =20 + *_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) -ffreest= anding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunused= -but-set-variable -Wno-error + *_*_RISCV64_VFRPP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + *_*_RISCV64_APP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + *_*_RISCV64_PP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + DEBUG_*_*_CC_FLAGS =3D -DEFI_DEBUG RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG =20 @@ -129,6 +135,9 @@ [Libraries.AARCH64] ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 +[Libraries.RISCV64] + ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + [LibraryClasses.common] UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiA= pplicationEntryPoint.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf @@ -157,6 +166,9 @@ [LibraryClasses.AARCH64] NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf =20 +[LibraryClasses.RISCV64] + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + ##########################################################################= ##### # # These are the components that will be built by the master makefile @@ -483,4 +495,4 @@ SctPkg/TestCase/RIVL/Protocol/Http/Http/HttpENTSTest.inf SctPkg/TestCase/RIVL/Protocol/Http/HttpServiceBinding/HttpServiceBindingEN= TSTest.inf =20 [Components.IA32, Components.X64] -SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.inf \ No newline at end of file +SctPkg/TestCase/UEFI/EFI/Generic/ExeMode/BlackBoxTest/ExeModeBBTest.inf diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh index 37667711..f7c5e4bd 100755 --- a/uefi-sct/SctPkg/build.sh +++ b/uefi-sct/SctPkg/build.sh @@ -2,6 +2,7 @@ # # Copyright 2006 - 2015 Unified EFI, Inc.
# Copyright (c) 2011 - 2020, ARM Ltd. All rights reserved.
+# (C) Copyright 2021 Hewlett Packard Enterprise Development LP
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License @@ -22,6 +23,8 @@ function get_build_arch BUILD_ARCH=3DARM;; aarch64*) BUILD_ARCH=3DAARCH64;; + riscv64*) + BUILD_ARCH=3DRISCV64;; *) BUILD_ARCH=3Dother;; esac @@ -47,6 +50,12 @@ function set_cross_compile else TEMP_CROSS_COMPILE=3Darm-linux-gnueabihf- fi + elif [ "$SCT_TARGET_ARCH" =3D=3D "RISCV64" ]; then + if [ X"$CROSS_COMPILE_64" !=3D X"" ]; then + TEMP_CROSS_COMPILE=3D"$CROSS_COMPILE_64" + else + TEMP_CROSS_COMPILE=3Driscv64-unknown-elf- + fi else echo "Unsupported target architecture '$SCT_TARGET_ARCH'!" >&2 fi @@ -110,7 +119,7 @@ PrintUsage() { #Print Help # echo "Usage:" - echo " $0 \ + echo " $0 \ \ [build type (RELEASE OR DEBUG, DEFAULT: DEBUG)]" } --=20 2.30.0 -=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 (#71531): https://edk2.groups.io/g/devel/message/71531 Mute This Topic: https://groups.io/mt/80507447/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 Sun Feb 8 11:49:36 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+71530+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+71530+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1612885481837994.4924735781364; Tue, 9 Feb 2021 07:44:41 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NCCQYY1788612xO2SWI9ctkE; Tue, 09 Feb 2021 07:44:41 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web11.12131.1612885475964896813 for ; Tue, 09 Feb 2021 07:44:36 -0800 X-Received: from pps.filterd (m0134420.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 119FdE0c032649; Tue, 9 Feb 2021 15:44:26 GMT X-Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0b-002e3701.pphosted.com with ESMTP id 36k6wt2hy0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Feb 2021 15:44:26 +0000 X-Received: from G2W6311.americas.hpqcorp.net (g2w6311.austin.hp.com [16.197.64.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3427.houston.hpe.com (Postfix) with ESMTPS id B811D80; Tue, 9 Feb 2021 15:44:25 +0000 (UTC) X-Received: from G4W9332.americas.hpqcorp.net (16.208.32.118) by G2W6311.americas.hpqcorp.net (16.197.64.53) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Feb 2021 15:44:25 +0000 X-Received: from G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) by G4W9332.americas.hpqcorp.net (2002:10d0:2076::10d0:2076) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Feb 2021 15:44:25 +0000 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.241.52.12) by G9W9210.americas.hpqcorp.net (16.220.66.155) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 9 Feb 2021 15:44:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VUNNsbrFKbIQHbitiFjdReGk5yp2VS7amSObeXMACe0MFH7kSjJ3vZGtoFVyRUQmTeE+1kEFVXO5jtymTnk43B2gjuzH+0aShDzoPFTyIwFhjJAcKfhN8xV3Mro43ucwDcfSnmiIyS/e340tWdY5GKMlomgZQQWzqF81mi491XvEWvmdDBmCfiaXgKzXyMMN5cC7/vdEa3XAUEn5V3jZaVF6lSf6Ntbqijtk5e2IaTAel3G082ipmWeVuLAbw0ZL80R8Zoj89qFTi7MXYnt0x8R6mFYsTnHFhiv65v1/+/d6r6MsmCq6Agr//QTRJYj5tc2XkJYEhaEEGcnS1DglCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mPjjlHEVSgX/pSZx0j3emwm7s8rH+3nsIdriI5mj0u8=; b=YADmy1TBEK13/atAXZ6q25kTmwtpeydUZZE6thJqRujrOspx2paYeP9paaxlh0XBljDKicqTNylS1f38vaa3gMedOMuQnmvNljPTHnWUGe2pqGT6/y9ZrLvTqYxRrp7uw/GfTBYIGDLjom5PUaZuaKeUULiU1OJWBcikFyHje7tJu24f9CQR0EDpxGPhmWTshJVqijKChasQ39RTSZX+LUgmX+b0VHbDvwTiNSsdzQKFZcL/oSkeDDnC5l28AjHxZA+ZLIVJpNi53O0wkKC42FElk1ratAgll5mosi7Wt7w9BuIFZISBOMJ3SxalJFW8bFHdoNzv44vMFh8iZYQnNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (10.169.86.151) by DF4PR8401MB0443.NAMPRD84.PROD.OUTLOOK.COM (10.169.82.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.27; Tue, 9 Feb 2021 15:44:23 +0000 X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0]) by DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0%9]) with mapi id 15.20.3825.030; Tue, 9 Feb 2021 15:44:23 +0000 From: "Daniel Schaefer" To: CC: G Edhaya Chandran , Barton Gao , Samer El-Haj-Mahmoud , Eric Jin , Arvin Chen , "Leif Lindholm" , Heinrich Schuchardt , "Abner Chang" Subject: [edk2-devel] [edk2-test PATCHv2 4/5] SctPkg: Unify CC_FLAGS for all GCC platforms Date: Tue, 9 Feb 2021 23:43:53 +0800 Message-ID: <20210209154354.30234-5-daniel.schaefer@hpe.com> In-Reply-To: <20210209154354.30234-1-daniel.schaefer@hpe.com> References: <20210209154354.30234-1-daniel.schaefer@hpe.com> X-Originating-IP: [123.193.51.23] X-ClientProxiedBy: HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) To DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from x360-nix.hitronhub.home (123.193.51.23) by HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.23 via Frontend Transport; Tue, 9 Feb 2021 15:44:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 66aa91c8-6c4d-4d71-c73a-08d8cd1192cb X-MS-TrafficTypeDiagnostic: DF4PR8401MB0443: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:454; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: e2tGdDpRwRL4PxLfmQHD8Imid+Ovk9YY9n04IcKhpVkr6yiRg1RNBAUsl1xurdMu2WzWMwO7vZPcD6KMQW3VC4noqW+SYgC4fLOKMwgu4y1YnktqW88E05zZwKZWO2tZGKNnkFmN2/uhs4ZBC0raGZntm2mBJ7ozcGNpGjJM0C9oQkRlyY6dM86CMKovUjYYa2xbYT9y5KLuy5L3zJxAbq61E9kR9fiYFG+KrIcWNTXPKzVNNp7dBSOE0mhFzUcZ9u5FOse5rCK9qEBLFyoocGJV2i+/ieOLIxjkvpWzJAxR5Mf/ZZwQ5OxWxLxXaz+f6GUcvcdENBkJ/4NnrpNh5B/JT1Y8dMAl/H1NJgh4ZfgSSHIiA2PRUaaskARO0yYAouJbkOJlPdQmgOki1p57VhIiO9zBHr/zjZn/sGP4gSiH7nBiOdSWw96Pq4Pz7flov4C3Epwyi9NYG9sSG5LzxslOq1BAdcKeU+J1NwIn691dbZxkKbMBXXwn3yIrZjEszKJbJKeWA7fHaUK6iwTwUJMWIVLWMXgHZL4kRlin4IDJ12mhK/3B9s8pXrJ2UQPJAm31sCkaSi5ZjfB4lEnlAvOWsVpQ0c3T1IB9nbd1Aoc= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?UXEDm6XkctnwMYYvH4fYnLvYpfHcokeTflI0Qu8Kwzx4VRyRQEPLxqNyCSbj?= =?us-ascii?Q?vI8aOwrF/hyKjyI9wtpnbgoSPfsUXySptCfpl4/t4MlYuVc6UR4d6xsu6nh6?= =?us-ascii?Q?HS0JdX7KQ7U0G2X6T8dDLogp2IrWJvMVSmdmaKKXNb6rmf3NngQSzuR7D844?= =?us-ascii?Q?3q5Jxr3DOZeSTaspyZaConVOPYHtg3DlwAAafNO3kfNMAb/TU2Zby8b+TgUx?= =?us-ascii?Q?XSUuEvM/bIHr+Wu9/KRWKKAY1xUIAzqF6Hdf8cYY+9Rn6TKkPPA/wacdxISF?= =?us-ascii?Q?ljaOkbFRgRGNuy5GELNgg6P4uGD+q0nmJR5tb45cACQaCbaw/qNfxCZ3lj1L?= =?us-ascii?Q?WO3d+7VlcC3zjFOf2oSFqQ4R3+C7q90nb78ERS/g/M/A7p07llsiaVDukCmu?= =?us-ascii?Q?MXdoTeUJBBXipeSTKdV4nD3LrC31ZUqhNV9cOeTuPAIJcc1Uz3UoJSwSPIns?= =?us-ascii?Q?vqk+92muMdg/1G7PLwvqlJHJV358hFHdFgVSC/qZTe/0QNY9zLR0NHklNjdy?= =?us-ascii?Q?rrcc63cKIBg9t/Gy42J8+Gkw7XjpZ53AP5QBpsagEsffV/GGehyOT+nTSpJC?= =?us-ascii?Q?2RWXVmXGAFBgIgQ+Vhh+Otpox5x494GsIpTDYS9PCjwHAGe6vSOon60lwfQX?= =?us-ascii?Q?fTBXMeb0sQw5guyJNRXFemdNnaLg0mPlBnZ6gML1j1JTYGhtaiMp9VU5rlQh?= =?us-ascii?Q?u9xZxQQC1DKHrOmeS4TH+4ZyovaAScV94T0t9Gwn2ifKBnD+ACPMlNR5q5ch?= =?us-ascii?Q?LbAkwfm+Go9uEjCYzG+VfL7hsIDbWSAVrXLlflkwYZUMNEcTxIrKKMG/swQP?= =?us-ascii?Q?p2hEfhyWfFuJzO6yUJS4dIW7wP9SWsLiFgsUWGfzM79TnREMl5mLSAEAqfHn?= =?us-ascii?Q?Xn9iIpH8vjA0/PPuu9Pmt9b445U906oSSOOwZU6y5p2EMofJ2/9uB/0VytOv?= =?us-ascii?Q?fW0MaNxsVdDEtAu/cQvhj16RRu5sXYTtMcfR8qG7BeHkYrsKhyKpxBLUg7R2?= =?us-ascii?Q?V2ajIk9RBUtnlvTjfENkJDFoSLxKVgS9OE87jRWM7WV78TZplqTWK/PwdSSB?= =?us-ascii?Q?C38UhTJ+N18gZ/lQcfNcGzEpqEJ5ig4dz/KlwoV5kKg65AMRYJjLLjJaY0a1?= =?us-ascii?Q?2+04qF0nZ/MTwCt3ti9NY2qgX1gMF/ca8LqjrSFFJnE5j4QRU30rbRk7JjWy?= =?us-ascii?Q?2qO+LZHvAM9xrs9IoQKGIi2v+yLcfvukbx7v4ZjEp47NFcAACUArOA0nGVAS?= =?us-ascii?Q?gy7jQtvySl2ogUPZWNP910+H0QRX/HAzavOeJR4y/nN9XNP8+8qb4fvEbzAz?= =?us-ascii?Q?zIw+FqcCJyKDvCCweiwheWcU?= X-MS-Exchange-CrossTenant-Network-Message-Id: 66aa91c8-6c4d-4d71-c73a-08d8cd1192cb X-MS-Exchange-CrossTenant-AuthSource: DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2021 15:44:23.6570 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XL9u7TEWqk7q5Cj5tOMfL6O01hL/eLyWjHiavBuecGJ3FH+CSqCme/6eptQjmoEWDp4RyLEb/iuIlRcmeU4hvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DF4PR8401MB0443 X-OriginatorOrg: hpe.com X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,daniel.schaefer@hpe.com X-Gm-Message-State: Ubuw8pbTGFN783HpBrejRBbnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1612885481; bh=YtUKD8kSmTI69NjME6MD5JptWjJksafKxWq78/1AO2Q=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Yw511xcQuuaqOrzh2tWKfS4e4V0k6y8pmzw6sq+r9pDIjCJaHYu2ktZYC02bCVtwUWb Zn5OBQPykK0XPLOgDAev/DJtp6yomc8MjZIIFB03CpAi4dBadq8WUB40Ag2Q7kfZOT33+ 8643SQVi/VydPz6yGpcbrzo2QLcM+RQhA6c= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3042 Cc: G Edhaya Chandran Cc: Barton Gao Cc: Samer El-Haj-Mahmoud Cc: Eric Jin Cc: Arvin Chen Cc: Leif Lindholm Cc: Heinrich Schuchardt Cc: Abner Chang Signed-off-by: Daniel Schaefer --- uefi-sct/SctPkg/UEFI/IHV_SCT.dsc | 15 ++++++++------- uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SC= T.dsc index 94bb5c36..91116ca7 100644 --- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc +++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc @@ -69,15 +69,16 @@ MSFT:*_*_X64_APP_FLAGS =3D /D EFIX64 MSFT:*_*_X64_PP_FLAGS =3D /D EFIX64 =20 -# GCC:*_*_IA32_CC_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) -ffreestanding = -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-pr= obe "-DEFIAPI=3D__attribute__((ms_abi))" -m32 -mabi=3Dms -D MDE_CPU_X32 - GCC:*_*_IA32_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -Wno-error=20 + GCC:*_*_*_CC_FLAGS =3D -ffreestanding -nostdinc -nostdlib -Wno-e= rror +# GCC:*_*_IA32_CC_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) -mno-red-zone -= Wno-address -mno-stack-arg-probe "-DEFIAPI=3D__attribute__((ms_abi))" -m32 = -mabi=3Dms -D MDE_CPU_X32 + GCC:*_*_IA32_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_IA32_VFRPP_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_APP_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_PP_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) =20 -# GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -ffreestanding = -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-pr= obe "-DEFIAPI=3D__attribute__((ms_abi))" -m64 -mcmodel=3Dlarge -mabi=3Dms -= D MDE_CPU_X64 +# GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -mno-red-zone -= Wno-address -mno-stack-arg-probe "-DEFIAPI=3D__attribute__((ms_abi))" -m64 = -mcmodel=3Dlarge -mabi=3Dms -D MDE_CPU_X64 =20 - GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -Wno-error=20 + GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_X64_VFRPP_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_X64_APP_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_X64_PP_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) @@ -85,7 +86,7 @@ =20 #TODO: OM - fixme RVCT:*_*_ARM_CC_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) *_*_ARM_CC_FLAGS =3D -D EFIARM - GCC:*_*_ARM_CC_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) -fno-stack-protecto= r -ffreestanding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-erro= r=3Dunused-but-set-variable -Wno-error=3Dimplicit-function-declaration -Wno= -error + GCC:*_*_ARM_CC_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) -fno-stack-protector *_*_ARM_VFRPP_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) *_*_ARM_APP_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) *_*_ARM_PP_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) @@ -104,14 +105,14 @@ RVCT:*_*_ARM_CC_FLAGS =3D --diag_remark=3D167 --diag_suppress=3D167,1= 295,188,550,1,68,111,177 =20 *_*_AARCH64_CC_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) - GCC:*_*_AARCH64_CC_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) -ffreest= anding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunused= -but-set-variable -Wno-error + GCC:*_*_AARCH64_CC_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) *_*_AARCH64_VFRPP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) *_*_AARCH64_APP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) *_*_AARCH64_PP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) RVCT:*_*_AARCH64_DLINK_FLAGS =3D --muldefweak =20 *_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) - GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) -ffreestand= ing -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunused-bu= t-set-variable -Wno-error + GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) *_*_RISCV64_VFRPP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) *_*_RISCV64_APP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) *_*_RISCV64_PP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_= SCT.dsc index e13e40e4..3bb57d26 100644 --- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc +++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc @@ -72,14 +72,15 @@ MSFT:*_*_X64_APP_FLAGS =3D /D EFIX64 MSFT:*_*_X64_PP_FLAGS =3D /D EFIX64 =20 -# GCC:*_*_IA32_CC_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) -ffreestanding = -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-pr= obe "-DEFIAPI=3D__attribute__((ms_abi))" -m32 -mabi=3Dms -D MDE_CPU_X32 - GCC:*_*_IA32_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -Wno-error=20 + GCC:*_*_*_CC_FLAGS =3D -ffreestanding -nostdinc -nostdlib -Wno-e= rror +# GCC:*_*_IA32_CC_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) -mno-red-zone -= Wno-address -mno-stack-arg-probe "-DEFIAPI=3D__attribute__((ms_abi))" -m32 = -mabi=3Dms -D MDE_CPU_X32 + GCC:*_*_IA32_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_IA32_VFRPP_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_APP_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) # GCC:*_*_IA32_PP_FLAGS =3D -D EFI32 $(GCC_VER_MACRO) =20 -# GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -ffreestanding = -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-pr= obe "-DEFIAPI=3D__attribute__((ms_abi))" -m64 -mcmodel=3Dlarge -mabi=3Dms -= D MDE_CPU_X64 - GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -Wno-error=20 +# GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) -mno-red-zone -= Wno-address -mno-stack-arg-probe "-DEFIAPI=3D__attribute__((ms_abi))" -m64 = -mcmodel=3Dlarge -mabi=3Dms -D MDE_CPU_X64 + GCC:*_*_X64_CC_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_X64_VFRPP_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_X64_APP_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) # GCC:*_*_X64_PP_FLAGS =3D -D EFIX64 $(GCC_VER_MACRO) @@ -87,7 +88,7 @@ =20 #TODO: OM - fixme RVCT:*_*_ARM_CC_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) *_*_ARM_CC_FLAGS =3D -D EFIARM - GCC:*_*_ARM_CC_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) -fno-stack-protecto= r -ffreestanding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-erro= r=3Dunused-but-set-variable -Wno-error=3Dimplicit-function-declaration -Wno= -error + GCC:*_*_ARM_CC_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) -fno-stack-protector *_*_ARM_VFRPP_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) *_*_ARM_APP_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) *_*_ARM_PP_FLAGS =3D -D EFIARM $(GCC_VER_MACRO) @@ -106,14 +107,14 @@ RVCT:*_*_ARM_CC_FLAGS =3D --diag_remark=3D167 --diag_suppress=3D167,1= 295,188,550,1,68,111,177 =20 *_*_AARCH64_CC_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) - GCC:*_*_AARCH64_CC_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) -ffreest= anding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunused= -but-set-variable -Wno-error + GCC:*_*_AARCH64_CC_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) *_*_AARCH64_VFRPP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) *_*_AARCH64_APP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) *_*_AARCH64_PP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) RVCT:*_*_AARCH64_DLINK_FLAGS =3D --muldefweak =20 *_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) - GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) -ffreest= anding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunused= -but-set-variable -Wno-error + GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) *_*_RISCV64_VFRPP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) *_*_RISCV64_APP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) *_*_RISCV64_PP_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) --=20 2.30.0 -=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 (#71530): https://edk2.groups.io/g/devel/message/71530 Mute This Topic: https://groups.io/mt/80507445/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 Sun Feb 8 11:49:36 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+71532+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+71532+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=hpe.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1612885487588734.0106263939215; Tue, 9 Feb 2021 07:44:47 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id rMvJYY1788612xPquKXzVNvb; Tue, 09 Feb 2021 07:44:46 -0800 X-Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web12.12205.1612885481433147344 for ; Tue, 09 Feb 2021 07:44:41 -0800 X-Received: from pps.filterd (m0150242.ppops.net [127.0.0.1]) by mx0a-002e3701.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 119FdT07018748; Tue, 9 Feb 2021 15:44:31 GMT X-Received: from g4t3427.houston.hpe.com (g4t3427.houston.hpe.com [15.241.140.73]) by mx0a-002e3701.pphosted.com with ESMTP id 36kvgh8f5f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 09 Feb 2021 15:44:30 +0000 X-Received: from G2W6311.americas.hpqcorp.net (g2w6311.austin.hp.com [16.197.64.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by g4t3427.houston.hpe.com (Postfix) with ESMTPS id 0075A80; Tue, 9 Feb 2021 15:44:29 +0000 (UTC) X-Received: from G4W9335.americas.hpqcorp.net (16.208.33.85) by G2W6311.americas.hpqcorp.net (16.197.64.53) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Feb 2021 15:44:29 +0000 X-Received: from G9W9210.americas.hpqcorp.net (2002:10dc:429b::10dc:429b) by G4W9335.americas.hpqcorp.net (2002:10d0:2155::10d0:2155) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 9 Feb 2021 15:44:29 +0000 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (15.241.52.13) by G9W9210.americas.hpqcorp.net (16.220.66.155) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 9 Feb 2021 15:44:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O+LUrAfV+MsUIZ+0Y0XlPVqGDTYGYAj2hME7ORH4vaHTszKHZ83GoPywLjjvg/jp4JwMf+C/nTk9nHPyPaAfgPA2FGT/vDvQi36jV5T1YXL97mnHGSjqPON9lzsBxL25HPQKeOgvhM4r48oWor5m+ee2NvQOQ2/O9Y4iK6b9RAXpk0Rl5vKWCmvge5dCuAl1+ToMiyguy9Ha48bftKqm3IMRUNyRyvKwXCojczf7BMBjXICKXhTQks4LJK6RiBuHNtohEt1G6gYstjDVaiA5sCKaQbjIt+HsI61I1b2jqiVQJr7RmJQ9WL6gsQp7cDCY7PnFWaq4Y+qAbE+MHNRNog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZtNvXQ9mZ08dQjppFvT7l/pmpKtjkctftEA8qvqo4II=; b=Oy+V77QQgdtfHKCk0N/Vi4XkkhnN0rkd+UZhesBB4htEg2egxaQvz8fSgETca5PXZRCSHNbfggQdwXOxFPX2FQNrQacCmNY1EgssKGiWSct7arCfefVzwmErHYLDLOdkkXFrclfX4G+Br0Aw5JdO/qGl9FmcZTGeF7qVrW15esPvD4dbdj6yQ4E28vShHYnj5WPW9ONsZdG5hYRWdIV16DaP75N7bd4Il8Obrc6c7G9eHYL65IQBO1PBGpVYF6faXooQGFlQuewXjPSvLpK8GQ/1BiTU3kp9x99KZ5CE8owfiMB7oSzPQk4F67XOweWjrFnB6CM148f52kevTHOKZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hpe.com; dmarc=pass action=none header.from=hpe.com; dkim=pass header.d=hpe.com; arc=none X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (10.169.86.151) by DF4PR8401MB0443.NAMPRD84.PROD.OUTLOOK.COM (10.169.82.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.27; Tue, 9 Feb 2021 15:44:27 +0000 X-Received: from DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0]) by DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM ([fe80::45f0:20e7:1e33:e2a0%9]) with mapi id 15.20.3825.030; Tue, 9 Feb 2021 15:44:27 +0000 From: "Daniel Schaefer" To: CC: G Edhaya Chandran , Barton Gao , Samer El-Haj-Mahmoud , Eric Jin , Arvin Chen , "Leif Lindholm" , Heinrich Schuchardt , "Abner Chang" Subject: [edk2-devel] [edk2-test PATCHv2 5/5] SctPkg: Remove trailing whitespace Date: Tue, 9 Feb 2021 23:43:54 +0800 Message-ID: <20210209154354.30234-6-daniel.schaefer@hpe.com> In-Reply-To: <20210209154354.30234-1-daniel.schaefer@hpe.com> References: <20210209154354.30234-1-daniel.schaefer@hpe.com> X-Originating-IP: [123.193.51.23] X-ClientProxiedBy: HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) To DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM (2a01:111:e400:760d::23) X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from x360-nix.hitronhub.home (123.193.51.23) by HK0PR03CA0116.apcprd03.prod.outlook.com (2603:1096:203:b0::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3825.23 via Frontend Transport; Tue, 9 Feb 2021 15:44:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6309903b-f821-464d-4dec-08d8cd119503 X-MS-TrafficTypeDiagnostic: DF4PR8401MB0443: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Message-Info: 6KEeqJ5v2JLIuJVxeCbItd2mGX+7dLTkf7fnM0dhBWPQbCmUQfJIwC6W/qXpN+M3EvvkJqqmDrgMo6Vvh2iI8DM6lxzcNB24RrRAKTSjeWsL3+aL1KWeMNCPGUdrEaPuuz+9E9aPflep5HtLG453Mcr8E3XEdd6/ruBtycx1dUuJdP6/kn14PdkD6/mELtDP6dhp5bImu2QDLo4VeDFv1lzlbvvKSM9EflKfpmdVMTog31zkPr3ggIMK3FbkO4Vwroo3nhElAiE6yrPSrbF9M/2JnFxU9yCF7W5FBJqNZcydxL2jio9a1DcwVJ2FudsVmIccsWsEMvwSZjBq/MBfhFsGJOf9QMv0LU8sO1ZzASo32hPnG4qf3RG2CllVBdyOmF/pWSXLQzqYP0eojzb2Ktrrz4/4V2t9dx0BPT5qtdWidxS4Q7Ks+pgocxOT+FUUWKbVUypb19+zQvLVxNEvA0n1bMiywYs7DZiZzoRshslbuRzUUfS+OvypKAn4NB8wcurPsqxG5MYrPCcAN3eTh6v3fDEzxSK0zDycsh3GnJFGoPz/ZAzIN1h86E16Ohy9gpaAyQXbjQvuSeRHBFH0ODofYw4wmCMGMsbjdexL9Wo= X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?tmNbJw5Ds3n3aaOvdHCArgKaEEugewCdYyT2Uzt+A9HT+I8rXp1p3gskElNa?= =?us-ascii?Q?qy78YqaiQhnhZGzGKEyhVvuqJgwY68rpst+LHnBeYR9UpD05p6nIrICnk6rA?= =?us-ascii?Q?NHest6jQu07j7mX/j8tCCDTnTWpAaMXPtNgMK8Rzdn1F3ww/sKm7s9a2NmCc?= =?us-ascii?Q?JG/Fi/WuNGPPP8gNXsyIZsk2lC66YPihpGj8cz0FkEzY14msWrDly1p/RvRk?= =?us-ascii?Q?eRG9O7Yw/itIpf4FagQQeRUbST53kJjLFc3iYwdH60Sz7htPqB1vVVfPgUT7?= =?us-ascii?Q?PdWepCzMQsG4AJuZBX6BntqYSwu8Pj4FrCFoCfMK8D5IXYrPQs4RA1wqIM4i?= =?us-ascii?Q?FZRKOg0+KFz5fYT8tyHL0EoXCYg2ghsr21muR8+BB/+C2qmaQP/1D1tONH09?= =?us-ascii?Q?4QnUYfBcUA7fCayn7PHlKcfUAVuQJ/6bjhiYyD8nfwpmS5+HO3qLK/lXO0x3?= =?us-ascii?Q?WRKt/HzV/TyTau5/dlGAGM4M594b4EwIl1dYihrBGMJx6G87s+26otpLCvhY?= =?us-ascii?Q?UVnc83J0CwvT+EOrY8HAf/aD7bR+fO7392lOtnyFqUOIDMeEXH0TaedHTouI?= =?us-ascii?Q?jE9En8MZdgPXrLPCAfWGaLCDoq503tTgCxDUFDxDRdZcOb4VkHXGvIiXUd2G?= =?us-ascii?Q?p+wfip8xI83VNGAoIYGu0ipIiXx0aFAjUvoilNMUZD2X66r/aCGLXe/eCL4x?= =?us-ascii?Q?KR2HkVmMJQTcEsFFNTxyPIlnZ2ONNqMaWNKlXFJl8ODf4/q/L/PtYtrNA0ul?= =?us-ascii?Q?UEDKoEGnc/Nk/p/uZoCYUcWX5FIc4jjHmxpewfhGR664dy35f/V90zXhD4EV?= =?us-ascii?Q?MrfYh/sTTzALAT5RA4kAhUrDVY7tYu1Sm948nRKhYZ8fq9vtiSJST0cLcdm+?= =?us-ascii?Q?IsAKBnzKueYM6tdn9MRMKQ65Ash0qAbf56068czoToFF5LOEKIa1GMA/99CS?= =?us-ascii?Q?Xaq6OGUzE7cee4j/Sxkr+e+Ag6L+vkEoR+fVhAS3G0tvxRmaRJ2KyzPC/QYO?= =?us-ascii?Q?ePh6Sm89b4/scAJDrVxkgJ3Xbus/MytDQAu+4t4RsAn10gH1SZ7XqnhIsXB7?= =?us-ascii?Q?X8VAbLQshxd5ahbg0vI5jDcIjuLvDtViMclGUcKZnsoo5fD/w/evugmuZP6k?= =?us-ascii?Q?BtYjz+cG9QpGJetjVEzqAnO+WZG4Ns7PQO7WrXJqO74B+DkBhyX3fYubn9cw?= =?us-ascii?Q?DtzJW98Cd5DiG6Agu6uLXCd7p2UK+5xmBx0Xh8xKSJJRJO5vRAjmavAIArw4?= =?us-ascii?Q?vFKHz2CiIw9xKjkqk0k9XEn4KAayY92URsoHkAcnxzgIX+X9SnUfCwM+woWZ?= =?us-ascii?Q?RgDyuLD+1xvRrNOiohrmqqrH?= X-MS-Exchange-CrossTenant-Network-Message-Id: 6309903b-f821-464d-4dec-08d8cd119503 X-MS-Exchange-CrossTenant-AuthSource: DF4PR8401MB0444.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2021 15:44:27.3344 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9NUhw7R2azzK/MsfbncAckIdSPV61CH6KSei3AvNPf9jZfuq4fRe41fLxE/ks0KNUg0SPzAs4tdOBIHLXTNLMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DF4PR8401MB0443 X-OriginatorOrg: hpe.com X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 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,daniel.schaefer@hpe.com X-Gm-Message-State: 3Cqrwj8aNZn68KFXG6qXMgt1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1612885486; bh=zpa9rktrjMLWSDwAsa+025KHR8SwmAHhjRouZT7/bNI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=rAhyih1SWNS8JrX6bNgRir2aFsJGSDFhrYe4z+1REJCdAYhqaCffpQSvE94UBx+g8BL 02ONYGh7XEhnZs2nhhNycUSTD+vPLoJ5vNlxJfiGLXTEfXXunt8A1/wbcklFtdpw9Uir8 dz6KID6W4kh16WKC3gtmPHRICRCwrPaS+TY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D3042 Cc: G Edhaya Chandran Cc: Barton Gao Cc: Samer El-Haj-Mahmoud Cc: Eric Jin Cc: Arvin Chen Cc: Leif Lindholm Cc: Heinrich Schuchardt Cc: Abner Chang Signed-off-by: Daniel Schaefer Reviewed-by: G Edhaya Chandran Reviewed-by: Samer El-Haj-Mahmoud --- uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h = | 4 +-- uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c = | 6 ++--- uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h = | 7 +++-- uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c = | 6 ++--- uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S = | 15 ++++++----- uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c = | 22 +++++++-------- uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S = | 6 ++--- uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c = | 6 ++--- uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c = | 28 +++++++------------- uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c = | 8 +++--- uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c = | 15 ++++++----- uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h = | 8 +++--- uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c = | 6 ++--- uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c = | 8 +++--- uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c = | 8 +++--- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch= 64/DebugSupportBBTestCacheFunction.c | 6 ++--- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch= 64/DebugSupportBBTestExceptionCallbackFunction.c | 18 ++++++------- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch= 64/PlatformIsa.c | 10 +++---- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/DebugSupportBBTestCacheFunction.c | 6 ++--- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/DebugSupportBBTestExceptionCallbackFunction.c | 6 ++--- uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv= 64/PlatformIsa.c | 6 ++--- uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/EntsL= ibPlat.h | 8 +++--- uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/InitP= lat.c | 6 ++--- uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/EntsL= ibPlat.h | 6 ++--- uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/InitP= lat.c | 6 ++--- 25 files changed, 109 insertions(+), 122 deletions(-) diff --git a/uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h b/uefi-sct= /SctPkg/Library/SctLib/Aarch64/SctLibPlat.h index ee7c656b..b7832e18 100644 --- a/uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h +++ b/uefi-sct/SctPkg/Library/SctLib/Aarch64/SctLibPlat.h @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php =20 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c b/uefi-sct/S= ctPkg/Library/SctLib/Aarch64/initplat.c index a48bb2f3..1c247c91 100644 --- a/uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c +++ b/uefi-sct/SctPkg/Library/SctLib/Aarch64/initplat.c @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h b/uefi-sct= /SctPkg/Library/SctLib/Riscv64/SctLibPlat.h index 69e7f904..b7832e18 100644 --- a/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h +++ b/uefi-sct/SctPkg/Library/SctLib/Riscv64/SctLibPlat.h @@ -2,16 +2,15 @@ =20 Copyright 2006 - 2012 Unified EFI, Inc.
Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
- Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php =20 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 @@ -21,7 +20,7 @@ Module Name: =20 Abstract: =20 - RISCV64 specific defines + AArch64 specific defines =20 --*/ =20 diff --git a/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c b/uefi-sct/S= ctPkg/Library/SctLib/Riscv64/initplat.c index a48bb2f3..1c247c91 100644 --- a/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c +++ b/uefi-sct/SctPkg/Library/SctLib/Riscv64/initplat.c @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S b/uefi-sct/Sc= tPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S index d223b36b..66b5ab6a 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/GoVirtual.S @@ -2,15 +2,16 @@ # # Copyright 2010 - 2012 Unified EFI, Inc.
# Copyright (c) 2012, ARM Ltd. All rights reserved.
+# Copyright (c) 2021, Hewlett Packard Enterprise Development LP.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License -# which accompanies this distribution. The full text of the license may = be found at=20 +# which accompanies this distribution. The full text of the license may = be found at # http://opensource.org/licenses/bsd-license.php -#=20 +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. -#=20 +# ## # # @@ -23,7 +24,7 @@ #--*/ #start of the code section .text -/* FIXME: Should alignment be different on Aarch64? */ +/* FIXME: Should alignment be different on Riscv64? */ .align 3 =20 .global JumpToTestFunc @@ -37,8 +38,8 @@ # ) # JumpToTestFunc: - mov x2, x0 - mov x0, x1 + mv x2, x0 + mv x0, x1 =20 // Jump to Virtual function - blr x2 + jalr x2 diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c b/uefi-sc= t/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c index 397b3514..c85ea27b 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Aarch64/VirtualMemory.c @@ -2,15 +2,16 @@ =20 Copyright 2006 - 2012 Unified EFI, Inc.
Copyright (c) 2012, ARM Ltd. All rights reserved.
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 @@ -22,9 +23,6 @@ Module Name: =20 #include "SCRTApp.h" =20 -#define VIRT_TO_PHYS_OFFSET (0x80000000) //2G - -BOOLEAN HighAddress =3D FALSE; UINTN PageTable =3D 0; =20 =20 @@ -49,11 +47,10 @@ Returns: =20 --*/ { - /*Note: It is presumed that on ARM v5, V6 and V7 architectures - * the MMU is configured and enabled in PEI phase. As VirtualFunc - * is already mapped to virtual memory, don't have to do anything here. + /* Note: It is presumed that on RISCV architectures the MMU is configure= d and + * enabled in PEI phase. As VirtualFunc is already mapped to virtual mem= ory, + * don't have to do anything here. */ - /* FIXME: Is it the same on ARM v8? */ } =20 =20 @@ -174,9 +171,8 @@ Returns: --*/ { // - // Note: It is assumed that the MMU and page tables are configured on AR= M platforms - // based on ARM v5 v6 and v7 architecture. + // Note: It is assumed that the MMU and page tables are configured on RI= SC-V + // platforms. // - /* FIXME: Is it the same on ARM v8? */ JumpToTestFunc(VirtualFunc, HandOffAddr); } diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S b/uefi-sct/Sc= tPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S index ae33da18..6b727d6e 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/GoVirtual.S @@ -6,12 +6,12 @@ # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License -# which accompanies this distribution. The full text of the license may = be found at=20 +# which accompanies this distribution. The full text of the license may = be found at # http://opensource.org/licenses/bsd-license.php -#=20 +# # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IM= PLIED. -#=20 +# ## # # diff --git a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c b/uefi-sc= t/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c index 00b59594..c85ea27b 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c +++ b/uefi-sct/SctPkg/SCRT/SCRTApp/Riscv64/VirtualMemory.c @@ -6,12 +6,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c b/uefi-sct/Sct= Pkg/SCRT/SCRTDriver/Aarch64/Debug.c index 6161d596..b3e13f63 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Debug.c @@ -1,16 +1,17 @@ /** @file =20 Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
+ Copyright (c) 2021 Hewlett Packard Enterprise Development LP. All rights= reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ =20 /*++ @@ -24,7 +25,6 @@ Module Name: #include "SCRTDriver.h" =20 UINTN mHandOffPtr =3D 0; -EFI_PHYSICAL_ADDRESS mIoPortSpaceAddress =3D 0; =20 =20 EFI_STATUS @@ -42,18 +42,10 @@ ConsumeHandOff ( HandOffPtr =3D (RUNTIME_HANDOFF*)mHandOffPtr; *ConfigData =3D HandOffPtr->ConfigureInfo; =20 - if (!HandOffPtr->DebuggerInfo.MmioFlag){ - // - // If debug port is I/O mapped, fix IoBase Address. - // - FixAddress(&HandOffPtr->DebuggerInfo.IoBase); - mIoPortSpaceAddress =3D HandOffPtr->DebuggerInfo.IoBase; - } else { - // - // If debug port is MMIO, fix MmioBase Address. - // - FixAddress(&HandOffPtr->DebuggerInfo.MmioBase); - } + // + // Fix MmioBase Address. + // + FixAddress(&HandOffPtr->DebuggerInfo.MmioBase); =20 return EFI_SUCCESS; } @@ -65,7 +57,7 @@ Send2UART ( ) { // - // TODO: On ARM platforms use platform specific functions to + // TODO: On RISC-V platforms use platform specific functions to // write the data to UART. // return EFI_SUCCESS; diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c b/uefi-sct/SctP= kg/SCRT/SCRTDriver/Aarch64/Dump.c index cc8d9869..cb9771b1 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Dump.c @@ -1,16 +1,16 @@ /** @file =20 Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ =20 /*++ diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c b/uefi-sct/SctPkg= /SCRT/SCRTDriver/Aarch64/Io.c index b925e151..a728d3ca 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.c @@ -1,16 +1,17 @@ /** @file =20 Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
+ (C) Copyright 2021 Hewlett Packard Enterprise Development LP
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ =20 /*++ @@ -21,7 +22,7 @@ Module Name: =20 --*/ =20 -#include "Io.h" +#include "SCRTDriver.h" =20 EFI_STATUS EFIAPI @@ -119,11 +120,11 @@ FixAddress ( ) { // - //Note: On ARM platforms don't have to do this as all the functions are = virtually mapped. + //Note: On RISC-V platforms don't have to do this as all the functions a= re virtually mapped. // } =20 -// Quick port to ARM +// Quick port to RISC-V. It doesn't have traditional I/O-Port 80h POST Cod= es =20 VOID Port80 ( diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h b/uefi-sct/SctPkg= /SCRT/SCRTDriver/Aarch64/Io.h index 1e78b3e4..10ab372a 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Aarch64/Io.h @@ -1,16 +1,16 @@ /** @file =20 Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ =20 /*++ diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c b/uefi-sct/Sct= Pkg/SCRT/SCRTDriver/Riscv64/Debug.c index 2991935a..b3e13f63 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Debug.c @@ -6,12 +6,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ =20 /*++ diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c b/uefi-sct/SctP= kg/SCRT/SCRTDriver/Riscv64/Dump.c index cc8d9869..cb9771b1 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Dump.c @@ -1,16 +1,16 @@ /** @file =20 Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ =20 /*++ diff --git a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c b/uefi-sct/SctPkg= /SCRT/SCRTDriver/Riscv64/Io.c index 255cb9a6..a728d3ca 100644 --- a/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c +++ b/uefi-sct/SctPkg/SCRT/SCRTDriver/Riscv64/Io.c @@ -1,17 +1,17 @@ /** @file =20 Copyright 2006 - 2012 Unified EFI, Inc.
- Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
=20 + Copyright (c) 2011 - 2012 ARM Ltd. All rights reserved.
(C) Copyright 2021 Hewlett Packard Enterprise Development LP
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ =20 /*++ diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Aarch64/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase= /UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSupportBBTestCach= eFunction.c index 96ee7b57..6b54a25f 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Aarch64/DebugSupportBBTestCacheFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Aarch64/DebugSupportBBTestCacheFunction.c @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Aarch64/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/Sct= Pkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Aarch64/DebugSuppo= rtBBTestExceptionCallbackFunction.c index c27c0c0c..1cf2dd74 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Aarch64/DebugSupportBBTestExceptionCallbackFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Aarch64/DebugSupportBBTestExceptionCallbackFunction.c @@ -2,15 +2,16 @@ =20 Copyright 2006 - 2016 Unified EFI, Inc.
Copyright (c) 2011 - 2016, ARM Ltd. All rights reserved.
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 @@ -37,7 +38,7 @@ SoftwareBreak ( void ) { - // Not ported to ARM yet + // Not ported to RISC-V yet ASSERT (FALSE); } =20 @@ -99,9 +100,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( // Invoke RegisterExceptionCallback() to install an interrupt handler fu= nction. // InvokedExceptionCallback =3D FALSE; - // FIXME: Is it normal that we use EXCEPT_IA32_BREAKPOINT here? - // Shouldn't we define proper constants for ARM exceptions in DebugSuppo= rtProtocol.h file? - Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback, EXCEPT_IA32_BREAKPOINT); + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback, EXCEPT_RISCV_BREAKPOINT); =20 if ((Status =3D=3D EFI_SUCCESS) || (Status =3D=3D EFI_ALREADY_STARTED)) { AssertionType =3D EFI_TEST_ASSERTION_PASSED; @@ -205,7 +204,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( // Assertion Point 3.4.2.3 // Invoke RegisterExceptionCallback() to install another interrupt handl= er function. // - Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback1, EXCEPT_IA32_BREAKPOINT); + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, Exc= eptionCallback1, EXCEPT_RISCV_BREAKPOINT); =20 if (Status !=3D EFI_ALREADY_STARTED) { AssertionType =3D EFI_TEST_ASSERTION_FAILED; @@ -228,7 +227,7 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( // Assertion Point 3.4.2.4 // Invoke RegisterExceptionCallback() to unstall the interrupt handler f= unction. // - Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, NUL= L, EXCEPT_IA32_BREAKPOINT); + Status =3D DebugSupport->RegisterExceptionCallback (DebugSupport, 0, NUL= L, EXCEPT_RISCV_BREAKPOINT); =20 if (EFI_ERROR(Status)) { AssertionType =3D EFI_TEST_ASSERTION_FAILED; @@ -273,4 +272,3 @@ BBTestRegisterExceptionCallbackFunctionManualTest ( =20 return EFI_SUCCESS; } - diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Aarch64/PlatformIsa.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/D= ebugSupport/BlackBoxTest/Aarch64/PlatformIsa.c index 8334f601..d91f520e 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Aarch64/PlatformIsa.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Aarch64/PlatformIsa.c @@ -2,15 +2,16 @@ =20 Copyright 2006 - 2012 Unified EFI, Inc.
Copyright (c) 2011 - 2012, ARM Ltd. All rights reserved.
+ Copyright (c) 2021, Hewlett Packard Enterprise Development LP. All right= s reserved.
=20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 @@ -26,5 +27,4 @@ Abstract: =20 #include "DebugSupportBBTestMain.h" =20 -EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa =3D IsaAArch64; - +EFI_INSTRUCTION_SET_ARCHITECTURE PlatformIsa =3D IsaRiscv64; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/DebugSupportBBTestCacheFunction.c b/uefi-sct/SctPkg/TestCase= /UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSupportBBTestCach= eFunction.c index 96ee7b57..6b54a25f 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestCacheFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestCacheFunction.c @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/DebugSupportBBTestExceptionCallbackFunction.c b/uefi-sct/Sct= Pkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/Riscv64/DebugSuppo= rtBBTestExceptionCallbackFunction.c index c6e72806..1cf2dd74 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestExceptionCallbackFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/DebugSupportBBTestExceptionCallbackFunction.c @@ -6,12 +6,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackB= oxTest/Riscv64/PlatformIsa.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/D= ebugSupport/BlackBoxTest/Riscv64/PlatformIsa.c index 8b23d91b..d91f520e 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/PlatformIsa.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/DebugSupport/BlackBoxTest/= Riscv64/PlatformIsa.c @@ -6,12 +6,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found at http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/A= arch64/EntsLibPlat.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENT= S/EasLib/Aarch64/EntsLibPlat.h index ff781aee..41a6c8bf 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/= EntsLibPlat.h +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/= EntsLibPlat.h @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 @@ -20,7 +20,7 @@ Module Name: =20 Abstract: =20 - AArch64 specific defines + RISCV64 specific defines =20 --*/ =20 diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/A= arch64/InitPlat.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/E= asLib/Aarch64/InitPlat.c index 70a509a4..7a66c099 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/= InitPlat.c +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Aarch64/= InitPlat.c @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/R= iscv64/EntsLibPlat.h b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENT= S/EasLib/Riscv64/EntsLibPlat.h index 7f7835e4..41a6c8bf 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= EntsLibPlat.h +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= EntsLibPlat.h @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/R= iscv64/InitPlat.c b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/E= asLib/Riscv64/InitPlat.c index 70a509a4..7a66c099 100644 --- a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= InitPlat.c +++ b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/Riscv64/= InitPlat.c @@ -5,12 +5,12 @@ =20 This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License - which accompanies this distribution. The full text of the license may b= e found at=20 + which accompanies this distribution. The full text of the license may b= e found a=20 http://opensource.org/licenses/bsd-license.php -=20 + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP= LIED. -=20 + **/ /*++ =20 --=20 2.30.0 -=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 (#71532): https://edk2.groups.io/g/devel/message/71532 Mute This Topic: https://groups.io/mt/80507448/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-