From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.88]) by mx.groups.io with SMTP id smtpd.web12.3680.1617107274917469461 for ; Tue, 30 Mar 2021 05:27:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=elbeeyOg; spf=pass (domain: arm.com, ip: 40.107.7.88, mailfrom: sunny.wang@arm.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ldJcYxWAoiHssl/TiGelXTifZi8WhRBTKZKaU4e4un4=; b=elbeeyOgiU/qNK5BbH+lU833w3aqOwxfSVQjC3kUPWBRkbPpT8wDNEGeLBmXWjI6KcZIZ4nD7bw1gOV7NWfy4IHNhZ0FcYfWp3KVz6aLYKFFJMH76BYut7cjoPh61ditzyQHwcdG6lDEJ6YQV/e6DRx1Oy7zGfcaOnPjTP2IPU8= Received: from AM6PR08CA0017.eurprd08.prod.outlook.com (2603:10a6:20b:b2::29) by DB7PR08MB3884.eurprd08.prod.outlook.com (2603:10a6:10:78::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Tue, 30 Mar 2021 12:27:51 +0000 Received: from AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:b2:cafe::1d) by AM6PR08CA0017.outlook.office365.com (2603:10a6:20b:b2::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.26 via Frontend Transport; Tue, 30 Mar 2021 12:27:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; edk2.groups.io; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT014.mail.protection.outlook.com (10.152.16.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.25 via Frontend Transport; Tue, 30 Mar 2021 12:27:50 +0000 Received: ("Tessian outbound 22890c8e8230:v89"); Tue, 30 Mar 2021 12:27:49 +0000 X-CR-MTA-TID: 64aa7808 Received: from 7d52595eceb3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 26AEC516-BF2F-41C8-A7E2-EB50A4296FA6.1; Tue, 30 Mar 2021 12:27:44 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7d52595eceb3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 30 Mar 2021 12:27:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iY6odookHcC9gIb5M9ikCXknHGDcQ2rtbM5BvQtNEW+5s9YLcz01jPvFMiouEbf6Emf24lhICuBfCF8oTctyDUpOIxnPFZCeMcwqV8GvaW+KG/Cw+rnLiVtmIhRZYRasdvMIN230BcnWRDSvHHIjreIF2udb+xDQGym3uy9j3O5kp2majZgAbEhMCTAALoaMPCsCg8zZbuVNqJbTGMmJh513WulrgvWkAEHadOY2efhka+6NBBLqkT9f1czkJnU0dzdjKCCII8eW+H6EXRWg2BS9GViaH+QZmuqhUr8UAwy9HA8L0koMqztSVTZ1Z4gAfqlDDG7AAN9D0CUGiK6InA== 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=ldJcYxWAoiHssl/TiGelXTifZi8WhRBTKZKaU4e4un4=; b=fqcZFAPYEvBCFoVqY+SLl69cpPiaTGgIvKZ8eN5TMYZeoLBoiBiaIY1+65uyx9FAfjem7cBdYEmtFMZaQrr5rK0jCvNLUVUxs2D57mJzqfSBn1cEpk49nOOaeEEghE7lhjYz1C7xITzjaBYT1mEn+/efVLeydCwE1PSxVITLCtjkh/z+sJSwSItz2hFF6QAiTvGwq7NOvOIjbYKI9P1iriEdmq3ySKroObW0ppAappg8ME8ofcN4/NIH4PWKdxTchTdq7M8jZokrC1vk5AftNPfKEU2Ggoi6c0U5P/ndiv3U8UPcvkbz9l3uJa+usXIkWvcE+M26UBvyTaFzGdLlpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ldJcYxWAoiHssl/TiGelXTifZi8WhRBTKZKaU4e4un4=; b=elbeeyOgiU/qNK5BbH+lU833w3aqOwxfSVQjC3kUPWBRkbPpT8wDNEGeLBmXWjI6KcZIZ4nD7bw1gOV7NWfy4IHNhZ0FcYfWp3KVz6aLYKFFJMH76BYut7cjoPh61ditzyQHwcdG6lDEJ6YQV/e6DRx1Oy7zGfcaOnPjTP2IPU8= Received: from DB8PR08MB3993.eurprd08.prod.outlook.com (2603:10a6:10:ad::26) by DB8PR08MB3995.eurprd08.prod.outlook.com (2603:10a6:10:b2::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.29; Tue, 30 Mar 2021 12:26:20 +0000 Received: from DB8PR08MB3993.eurprd08.prod.outlook.com ([fe80::89f9:4e97:546d:2b97]) by DB8PR08MB3993.eurprd08.prod.outlook.com ([fe80::89f9:4e97:546d:2b97%6]) with mapi id 15.20.3977.033; Tue, 30 Mar 2021 12:26:20 +0000 From: "Sunny Wang" To: "devel@edk2.groups.io" , "daniel.schaefer@hpe.com" CC: G Edhaya Chandran , Barton Gao , Samer El-Haj-Mahmoud , Eric Jin , Arvin Chen , Leif Lindholm , Heinrich Schuchardt , Abner Chang , Sunny Wang Subject: Re: [edk2-devel] [edk2-test PATCHv3 3/5] SctPkg: Add RISCV64 build support Thread-Topic: [edk2-devel] [edk2-test PATCHv3 3/5] SctPkg: Add RISCV64 build support Thread-Index: AQD27+0jYV2aq4zmIthShL9qQEH6BwEc6btzrE3WB5A= Date: Tue, 30 Mar 2021 12:26:19 +0000 Message-ID: References: <20210304032116.24357-1-daniel.schaefer@hpe.com> <20210304032116.24357-4-daniel.schaefer@hpe.com> In-Reply-To: <20210304032116.24357-4-daniel.schaefer@hpe.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: 251756859D211B40992BF405836C0B63.0 x-checkrecipientchecked: true Authentication-Results-Original: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=arm.com; x-originating-ip: [61.231.198.221] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2feb2d47-7b93-4faf-c099-08d8f3773bf3 x-ms-traffictypediagnostic: DB8PR08MB3995:|DB7PR08MB3884: x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:4502;OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: BswoG52Ol9BHA1USdHE+qxTNMvvL1u8KYflsKzxJkdcboxbZELn6jx0wAiCHTKu8giSKo+5vWgl4TVjZW1m4hvxUiNxp0o8FYLNETwGPAJDOaDu+8hlJlJPis1UzdBtEEWsZI5ldy4qOX4Q1jnK2LKMoeljptDcl7mowfi065BXvpoMXLIgpXJEjjEeeainHhTJ4E1OuPAguGZJQ0eAyxEglOqYss4g6JA01HEy2iCsjYSvUETm4sAWsZHJtngLgiK3LJaAUnNFN+yxHO7AJqtVRLhubrBz7rk8bDkXMwkZh4qZTUTtkwSRYPVLF9lO9H37woQv13Q9YUmLDMxa/eGG+nNGrd0PHY1c5/qWHBAptP5vXSnXz1hOYD7A5hCsccRAZKUW2N5j+Zf/uuQDXZCOlbJ9v4ZxeRKWgOlzmkJjrvls3i2gIPfkGeC8Di9R7be+qYk8GUzjYxrcuyhEg9NbSnFzrh7q92HmOX/jdwM40ae0ec/zEEmoAZzDuVRPS8aCoRJLbJLDLfOsygC1o/5PdLUbNZNXUhSVIsBwIHOjHY2llvBkEM9czR8dGpyf9OhQypemkesFJEzTY22kSxn9iIex2ERtcSAye2SLtxMJ9Kif048v+MJ+F4F5TyV39IfybBhiZGMXMVgplMDPyKHbn+4JXw9rw+cLDdXPlzX/KLWug34SOFMBBYl6SyFjJYwglBYj2IZA91oDFjNWZmweESCOdAZH9T2bSS65k+mk= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB8PR08MB3993.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(39860400002)(366004)(346002)(136003)(376002)(5660300002)(316002)(19627235002)(966005)(2906002)(38100700001)(66556008)(64756008)(66446008)(6506007)(52536014)(66476007)(55016002)(53546011)(54906003)(86362001)(4326008)(66946007)(478600001)(71200400001)(110136005)(33656002)(76116006)(30864003)(9686003)(8676002)(26005)(186003)(83380400001)(7696005)(8936002)(579004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?jOojJHPfjM2egkhw9Wemb3inWpm/nIu1tQ6fGeiIAV2oziDRXopAaQ9SY8fh?= =?us-ascii?Q?ssNLPrXb43qpR5ZtHO9qlXq1nhQhwmrORD5xWrtz/GraUAdEzJogeMMPCGN+?= =?us-ascii?Q?zmw++hY+hPqlTv/YZ9PWgFRcj5fm6ndv+s/ZVP6Z5ZoQ0Se0hrHngaDroYqc?= =?us-ascii?Q?pL1ENpvshj3KciLLTF3oYb3vZxTNum8W2vVDYX8Vdr7SeducKVe9bBX4qsQI?= =?us-ascii?Q?4I7c3DIygOFTI7vdGlNerUQMf83HljGhcq3hkD+78PFTSrbti769l74Janve?= =?us-ascii?Q?T9V5Goj4NWLGrnf7qHSFj8ZFlwGcYWqm7yHxGE+SmHjwwUDQsY5yK4C44TU/?= =?us-ascii?Q?KxXcfPLDO4A87zgRLea9HmDey0O7wqderfPXowXmiaRnx5N9TqprZE1+qqzY?= =?us-ascii?Q?MoiXeQwgPYmC77XCpyqPme80FNZHqgk8r7jox1q6Sukv6sTaugNP/vwYY0Oi?= =?us-ascii?Q?Nb52f66dzaD+klhgivRl6BvmLYfpagRh3JFqpbQ0vNMwriVUmENqJJaJUlH4?= =?us-ascii?Q?OCnCP1HJd5O+wFAoVVsUbfm5+vi6kFmUKtGhPdb+HtEUumkF9AKUBeiU9MsH?= =?us-ascii?Q?3e1uhRImxbuFMVvvraVCboTwKfkEJkiU9S5jnH9B8AK1Mv66q1hphXMzHQbb?= =?us-ascii?Q?nG8NB8DpHmKCgiseWh/tlgHy+HAxRyBjbntldg0z+83jd6sljTWrCidkMszO?= =?us-ascii?Q?oNUThmqX/GVYsFLPgcp02Kxw9oG/Fh1Y0caeM3KKfermS1hGCMIYElTIOe9+?= =?us-ascii?Q?aOgwL+85lQWTpr0Wux2KvbLMrneLjkVfdV7kOmQIhmiP+VM5yfu1t8sRzQHl?= =?us-ascii?Q?K5udvhpqcwu26m7NOiio9f9eHdGI61X1Uc2v1yeQwyOoIs4fKqj2FVDq9Be1?= =?us-ascii?Q?NoU56azSzlgHPYAuqDJnkt+530Ui4i/TGrLtPgdC8EI8C+pn6/zILIn9jUNb?= =?us-ascii?Q?m9NOJKcbdirIa9/QhTu9mHwSNqRXfqS2GHngjRR8fVzV5MhqOdTdkTsTFR6d?= =?us-ascii?Q?ZroOqscLJcDQZ5mUbAMV1kDTUs4Opjh/ASwxSsMX05wXgTxY/zK18wPmUM51?= =?us-ascii?Q?PRcNqrQXLwxMJBs2g0nI+tuy5lyzoXXMbY7fK4SXNly6MVrMfsYlb0D51Fps?= =?us-ascii?Q?gCfggCTJvn5HHpAfUP684ZfAxN7At4s0hN8jD7uqBsBTCmhVmR/nzdCoGOYF?= =?us-ascii?Q?L0gbHJ4XOsf0Ue9ittFtUMUUe1fA78arbgD9zSSsp+9lMY6mDAYBNzyBSWjg?= =?us-ascii?Q?9yn0oCiKu3DB1uNdSzZSeCdz7e9pC2znNl8eHyLYltFA5l9WnlDRQhhttHbE?= =?us-ascii?Q?gEd25wVjvsImtPNE78wrZGem?= MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB3995 Original-Authentication-Results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=arm.com; Return-Path: Sunny.Wang@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 55aff72e-1621-41c8-a9f5-08d8f3770604 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T10VTZtKPEM13/r8nhGBEr/Px0hxa84WUC6jZa86U6ZwCaXolUjbA8MkIa0gxeeE05+zAoVfwOn1m1FPn4JIU5f/0WiM9Jq6HgOSL6bHXMYV521aw8WZQllKIdgjqr0b1Z2wDkUCMBfJw2ZCgbtvCe9JC5yPpXuAUyRZkUxXYefOsXM3Lm/DTnQzbqIPNoQbMEbb3DKFC+1obl+0aIVVnZ/ZsjREvNqiNAk7VWOnOLnv0WcE4p6F8Vs1nefLWhEmObncJkXEnOC659Gj81o4+FOXJDgBofbe3ocREE44SYgh330DnY26OgbhEst4a53ikgGl5soO2rcLlDxQXFcmyK91NQVLu+wi6Os3qAhKolLGwD71b+C5dkUo42SRvzYY06NEviFcfo/Wth+H56RC2eEDTGSLyIBEW5KaftFoYW9TKjuPjbZ3foQf2v0lZLgTUvr0YPIG49o+Oktv5tBEwVqJrEObCPPcvB0wNGnZ/PpFuoWNMbREB8BWVSBDhKp8hM9CjBNg7doHdeQK6we8OSq5bRkYbONWwAxEIx/JA9Mb3TOOx/6z9fx8QNUJrQf/+C420hyMXaQDGVvvLOC+OkKpe37uJx+agpKXOnX9OGHapN0RrRs6zIaCRNsFLzp9acAac+QVC8FrVymwikO49dKi8IvvdMroALjNObURwwgE/ilc8ESlnunVIUU6v01ZYjUeo63MvDMEtojXeb2k4oHDkZ6XdgrD9hSA4sG7S+o= X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(46966006)(36840700001)(356005)(36860700001)(336012)(70206006)(5660300002)(8936002)(7696005)(19627235002)(478600001)(26005)(52536014)(966005)(186003)(86362001)(9686003)(4326008)(53546011)(82740400003)(54906003)(55016002)(8676002)(33656002)(6506007)(110136005)(81166007)(83380400001)(82310400003)(70586007)(2906002)(30864003)(47076005)(316002);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2021 12:27:50.4634 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2feb2d47-7b93-4faf-c099-08d8f3773bf3 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT014.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3884 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Looks good to me. Same comment as the patches 1/5 and 2/5. Reviewed-by: Sunny Wang -----Original Message----- From: devel@edk2.groups.io On Behalf Of Daniel Scha= efer Sent: Thursday, March 4, 2021 11:21 AM To: devel@edk2.groups.io 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 PATCHv3 3/5] SctPkg: Add RISCV64 build su= pport 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/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/Debu= gSupportBBTest.inf | 6 ++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2HcTest= .inf | 4 ++ uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcTest.i= nf | 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
This program and the accompanying materials are licensed and made available under the terms and conditions of the B= SD 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/L= ibrary/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 - 2= 014, 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 BSD License @@ -62,6 +63,11= @@ Aarch64/initplat.c Math.c +[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/SC= RT/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 - 2= 016, 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 BSD License @@ -39,6 +40,10= @@ Aarch64/GoVirtual.asm | RVCT Aarch64/GoVirtual.S | GCC +[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/Sct= Pkg/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 - 2= 016, 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 BSD License @@ -69,6 +70,11= @@ Aarch64/Dump.c Aarch64/Debug.c +[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/Black= BoxTest/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/BlackBoxTe +++ st/DebugSupportBBTest.inf @@ -3,6 +3,7 @@ # Copyright 2006 - 2012 Unified EFI, Inc.
# Copyright (c) 2010 - 2= 012, Intel Corporation. All rights reserved.
# Copyright (c) 2019, AR= M 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 BSD License @@ -67,6 +68,11= @@ Aarch64/DebugSupportBBTestExceptionCallbackFunction.c Aarch64/DebugSupportBBTestCacheFunction.c +[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/BlackBoxTes= t/Usb2HcTest.inf b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackB= oxTest/Usb2HcTest.inf index e8118739..95ae593e 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb2H= cTest.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/Usb2Hc/BlackBoxTest/Usb +++ 2HcTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2016 Unified EFI, Inc.
# Copyright (c) 2010 - 2= 016, 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 BSD License @@ -55,6 +56,9 = @@ #[sources.Aarch64] # IPF/TimerInterrupt.c +#[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/BlackBoxT= est/UsbHcTest.inf index efc438c1..d3bcd5ce 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbHcT= est.inf +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/UsbHc/BlackBoxTest/UsbH +++ cTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.
# Copyright (c) 2010 - 2= 012, 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 BSD License @@ -55,6 +56,9 = @@ [sources.Aarch64] Aarch64/TimerInterrupt.c +[sources.RISCV64] + Riscv64/TimerInterrupt.c + [Packages] MdePkg/MdePkg.dec SctPkg/SctPkg.dec diff --git a/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/= EntsLib.inf b/uefi-sct/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasLib/= EntsLib.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/EntsL +++ ib.inf @@ -3,6 +3,7 @@ # Copyright 2006 - 2012 Unified EFI, Inc.
# Copyright (c) 2010 - 2= 012, Intel Corporation. All rights reserved.
# Copyright (c) 2019, AR= M 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 BSD License @@ -66,6 +67,10= @@ Aarch64/EntsLibPlat.h Aarch64/InitPlat.c +[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/Sc= tPkg/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 Int= el 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 BSD 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_S= CT.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 - 2= 016, Intel Corporation. All rights reserved.
# Copyright (c) 2019,Mic= rochip 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 BSD 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 @@ -109,6 +110,12 @@ *_*_AARCH64_PP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) RVCT:*_*_AARCH64_DLINK_FLAGS =3D --muldefweak + *_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) -ffreestan= ding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunused-b= ut-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 @@ -124,6 +131,9 @@ [Libraries.AARCH64] ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +[Libraries.RISCV64] + ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + [Libraries.IA32,Libraries.X64] [LibraryClasses.common] @@ -146,6 +156,9 @@ [LibraryClasses.AARCH64] NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +[LibraryClasses.RISCV64] + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + [LibraryClasses.IA32] #########################################################################= ###### @@ -228,4 +241,4 @@ SctPkg/TestInfrastructure/SCT/Framework/Sct.inf [Components.IA32, Components.X64] SctPkg/TestCase/UEFI/IHV/Protocol/PlatformDriverOverride/BlackBoxTest/Ihv= PlatformDriverOverrideBBTest.inf -SctPkg/TestCase/UEFI/IHV/Protocol/PlatformToDriverConfiguration/BlackBoxT= est/IhvPlatformToDriverConfigurationBBTest.inf \ No newline at end of file +SctPkg/TestCase/UEFI/IHV/Protocol/PlatformToDriverConfiguration/BlackBo +xTest/IhvPlatformToDriverConfigurationBBTest.inf diff --git a/uefi-sct/SctPkg/UEFI/Protocol/DebugSupport.h b/uefi-sct/SctPk= g/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 @@ 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 @@ -607,6 +608,60 @@ typedef struct { UINT64 FAR; // Fault Address Register } EFI_SYSTEM_CONTEXT_AARCH64; +/// +/// 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; // @@ -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 + 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; typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL EFI_DEBUG_SUPPORT_PROTOCOL;; d= iff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_S= CT.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 - 2= 018, Intel Corporation. All rights reserved.
-# (C) Copyright 2017 Hew= lett 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 BSD 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 @@ -112,6 +112,12 @@ *_*_AARCH64_PP_FLAGS =3D -D EFIAARCH64 $(GCC_VER_MACRO) RVCT:*_*_AARCH64_DLINK_FLAGS =3D --muldefweak + *_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) + GCC:*_*_RISCV64_CC_FLAGS =3D -D EFIRISCV64 $(GCC_VER_MACRO) -ffrees= tanding -nostdinc -nostdlib -Wno-error=3Dunused-function -Wno-error=3Dunuse= d-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 @@ -129,6 +135,9 @@ [Libraries.AARCH64] ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +[Libraries.RISCV64] + ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + [LibraryClasses.common] UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/Uefi= ApplicationEntryPoint.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntr= yPoint.inf @@ -157,6 +166,9 @@ [LibraryClasses.AARCH64] NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +[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/HttpServiceBindingE= NTSTest.inf [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 376= 67711..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 - 2= 020, 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 BSD 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 DEBU= G, DEFAULT: DEBUG)]" } -- 2.30.0 IMPORTANT NOTICE: The contents of this email and any attachments are confi= dential and may also be privileged. If you are not the intended recipient, = please notify the sender immediately and do not disclose the contents to an= y other person, use it for any purpose, or store or copy the information in= any medium. Thank you.