From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.61]) by mx.groups.io with SMTP id smtpd.web09.1980.1613125448291884284 for ; Fri, 12 Feb 2021 02:24:08 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=f6Fd7oCI; spf=pass (domain: arm.com, ip: 40.107.21.61, mailfrom: sami.mujawar@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=DuLfsY9svjZhFeQh+/ZjzgD8NsryD8Fw+kSlbimawTc=; b=f6Fd7oCIDPLTc1pkm7furXYd84eJeG0RmF+YaBLEeXUOkEjz0ZXHJ5s0iu0MZGehm0i+8a9bTTjO6//8QLfRtm5/tgiZM9en6qFK7qrf1gBIv62XSt7aKdyFBXz9W/SyU4+7k0EopWFMYOwzNRz5EkPuIMqWR1AQ4v6lmQ8l5Wo= Received: from AM6PR10CA0107.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:8c::48) by AM6PR08MB3208.eurprd08.prod.outlook.com (2603:10a6:209:4b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25; Fri, 12 Feb 2021 10:24:05 +0000 Received: from AM5EUR03FT056.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:8c:cafe::3c) by AM6PR10CA0107.outlook.office365.com (2603:10a6:209:8c::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:24:05 +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 AM5EUR03FT056.mail.protection.outlook.com (10.152.17.224) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:24:04 +0000 Received: ("Tessian outbound f362b81824dc:v71"); Fri, 12 Feb 2021 10:24:04 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: f376613d1b9935f3 X-CR-MTA-TID: 64aa7808 Received: from e4ed16f3ef22.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C2757C3D-A722-40ED-A1C9-11B9574618E2.1; Fri, 12 Feb 2021 10:23:58 +0000 Received: from EUR02-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e4ed16f3ef22.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 12 Feb 2021 10:23:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cc+3kBI3Yg4Qd2lU8RhRSm9hPDx2Xj3hK86njarSTDsHvtB3xfdqT7BRms6mnp+kP3+iY52eWQfIibWzahRnEDEuNwvdnKxy96i/Sppo+eKE8jGpCQWzSMThE8g5/H6Das6hWAD6TEC/YEN3bIf/m8lxFOZ3gefceLKmKYxIctRG5BLstjl7JAwDJ9oo97dFh7KnJBgB3xDXeD9ohjb9FoCAzD4LAa3f3bJFyjqcVqx0dpad1sMHrVhldncJrotmIhszBIy02bvMGT6f80QjhQZmhp+f4wBhpJ0XBxlYc4XQQPmM5zDYAvKr3Dd3p99iqsCOYvbttb+kzCdX3j2oag== 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=DuLfsY9svjZhFeQh+/ZjzgD8NsryD8Fw+kSlbimawTc=; b=QeU1Owt2csnXFO9kHxOHUsYWGX12TD5JNXcGGSb6qg7WZbZzDWU9a1bn6oIJmk7vm4veWs/HsKfUNUSCpkVAGNhroXFmrZtpbMZj287S5+GlCxRypvdBTSGoUHEV4/cE4nZwupOOLGUICbE3ZvpKLHFRR6T/MKCRdvnf+YYGG3soyvvTalJr8umBi5kPQfkIIfN6+IDShRT3iWUs/0V+TRViJ3OSWy6uMWZ2/807cQUm+7WuQvqjxW4n0XjNoMjEfqKEWKiIiPP0qgieLvVqeiCmAyC6mt8d02M9jqBno7++Jrh4O8SHYAZnW1iVO+tGRS6hcvJwjrCeTX2zIqtf5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); 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=DuLfsY9svjZhFeQh+/ZjzgD8NsryD8Fw+kSlbimawTc=; b=f6Fd7oCIDPLTc1pkm7furXYd84eJeG0RmF+YaBLEeXUOkEjz0ZXHJ5s0iu0MZGehm0i+8a9bTTjO6//8QLfRtm5/tgiZM9en6qFK7qrf1gBIv62XSt7aKdyFBXz9W/SyU4+7k0EopWFMYOwzNRz5EkPuIMqWR1AQ4v6lmQ8l5Wo= Received: from DU2PR04CA0144.eurprd04.prod.outlook.com (2603:10a6:10:231::29) by AS8PR08MB6053.eurprd08.prod.outlook.com (2603:10a6:20b:292::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.26; Fri, 12 Feb 2021 10:23:57 +0000 Received: from DB5EUR03FT064.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:231:cafe::86) by DU2PR04CA0144.outlook.office365.com (2603:10a6:10:231::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:23:57 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; Received: from nebula.arm.com (40.67.248.234) by DB5EUR03FT064.mail.protection.outlook.com (10.152.21.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3846.25 via Frontend Transport; Fri, 12 Feb 2021 10:23:56 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2044.4; Fri, 12 Feb 2021 10:23:48 +0000 Received: from E107187.Arm.com (10.57.49.120) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2044.4 via Frontend Transport; Fri, 12 Feb 2021 10:23:47 +0000 From: "Sami Mujawar" To: CC: Sami Mujawar , , , , , , Subject: [PATCH edk2-platforms v1 07/12] Platform/ARM/VExpressPkg: Add support for FVP RevC model Date: Fri, 12 Feb 2021 10:23:36 +0000 Message-ID: <20210212102341.24056-8-sami.mujawar@arm.com> X-Mailer: git-send-email 2.11.0.windows.3 In-Reply-To: <20210212102341.24056-1-sami.mujawar@arm.com> References: <20210212102341.24056-1-sami.mujawar@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 773b0e06-ddd8-4d7b-2561-08d8cf4052b4 X-MS-TrafficTypeDiagnostic: AS8PR08MB6053:|AM6PR08MB3208: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:8273;OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 97ogR/59wd3KBWnrRD85syrFuX6ultmE7abQpImlLZl7PFhXd5TPKOXDBTQwXNEyEUH1qF7QLXMJ2dYdRXwSsxYumiCE7EiFltlGb/pQuC+AGwLccABs5/LdTqbgTeTbLX1QsH8xCsEC29SRcu1hPZ9cvMR0XtCgbV/Q4WzRH96TvDnITyCEhlc0VUEqMURTpeZoNO2p34xMQO2+lNUoLO/i+SO9BOUUQ8EISct9CpNQmzy4FswENZhlXU+lHsEH0SKV7oL32UQmna8DxQkS0xzVje+gUQb00ivVgJPNjJ+r9Ho13FwzYEnSUw5DnSGnsn99B9SEDsmFEEXZr7OcsDHUfqYNuUx9yQ5R+FS5PUd8EcI/r7C4yIGZ4gaoOWSM/VMnhVt+/iYet5McjIrvDarzfwafzQKbi4za7Z8SvTWKQH+qplngl9IFZal53Tat2FflTY5qmj7sgk/so7TCyVO9dAl2wsbLLjgiq8A6Dl9caRpsFqTj5YRgfTKD6YWu/v9/4mLwC27B9KbdFsXVUNqr4E9J6aff51TJJxuIBm8VlzM1/OFeqx43/VvrWbRZrwWmZnvLuiHxgRm5YqDUEd9zmSfOPDwmdDXk35Tj0Yq9Rr4MAjzczB/uyswFFAGTkfWH7+WFLyoIKciwAwc24MOJaDiztaHcXe2mzigNTda4PI//c8nFFeTq/2CNytEb X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:nebula.arm.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(39860400002)(136003)(376002)(396003)(346002)(36840700001)(46966006)(1076003)(70206006)(86362001)(54906003)(5660300002)(7696005)(316002)(70586007)(19627235002)(2906002)(4326008)(186003)(36860700001)(8676002)(82740400003)(44832011)(82310400003)(2616005)(478600001)(336012)(356005)(8936002)(83380400001)(36756003)(81166007)(47076005)(426003)(6666004)(26005)(6916009)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6053 Return-Path: Sami.Mujawar@arm.com X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT056.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: c237f3d6-4108-4d7b-56e8-08d8cf404e2a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SIAt+ZxZyKPLs/sMOJcDsWuXOsd801OLYlFB08+MI4Otki9vzCC1Y19nmnWyImsab+gSfU6OMk0QRVok7nAyyA13dBbCRM4psxC3w1xcNPb5YZgpNiABLiAcSUxooeDk4UO31h0gOwjf+8hzROVa3P/UlfiXCTq9Ceds0ItlrMBcQdAkjD3okaC20/Q88QIIakg2C25t3Y7vnoe4ucIblu4/DFfI+Q64vQmaRPGGWHlyDEOuhFbv1jg6GnvmsPA5xOTXhK32UXjq6fNKDEgD51MLsXXNRGA82I37jXDmPHtIp8D8ZFHtXDPM2RPsq8hmIMQDSKGVIi7uGVB7dWcJ2OEaxSFC6nNlkryshTNgEXpCX7ous3vHfz42Hf4EaXyxRGcvCCj3ILoP4FJQUzVaPKxmDc1alQ8/p/1EKDeRI+aQs80RuC2NumXQ1iUQxWMMsy+Wy+nLaAfv2RQsvUp3e/ur/uWBSd9cgYbyt4PARE9+p71gr5eAOqRRez+Koks9TEuM2J7IqlPHbtc6GhAKgA1WPHTC8GN5PPLpE7BzeOKXIRLAf5hzpE0SWBs+Ma9YvXi8gz2iw37q+V2t1t+WjYf11o2eeRt/KZAzxHTTorANP8bACEec0ZJSkwCpOXnqI1wjBj72KtDA87XLn79B3+eKb0zfea4s70H8cnqEsrw= 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)(346002)(136003)(376002)(39860400002)(396003)(36840700001)(46966006)(426003)(336012)(54906003)(2616005)(36860700001)(26005)(186003)(1076003)(47076005)(2906002)(478600001)(86362001)(70206006)(4326008)(316002)(8936002)(7696005)(5660300002)(70586007)(44832011)(8676002)(6916009)(83380400001)(82740400003)(19627235002)(6666004)(36756003)(82310400003)(81166007);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2021 10:24:04.4729 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 773b0e06-ddd8-4d7b-2561-08d8cf4052b4 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: AM5EUR03FT056.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3208 Content-Type: text/plain Base Platform RevC is a configuration of the Base Platform that includes a PCIe subsystem and a SMMUv3. It also has an AHCI-SATA disk controller as a device on the PCIe bus. Add firmware support for the FVP RevC model as it provides a standard boot environment using a SATA disk. Note: Checks have been added in appropriate places so that a common firmware can be used for both the FVP_Base_AEMv8A-AEMv8A model and the FVP_Base_RevC-2xAEMv8A model. However, this unified firmware is only available if the firmware is built using Dynamic Firmware Tables support. This feature can be enabled by building the firmware using the command line build option '-D DYNAMIC_TABLES_FRAMEWORK'. Signed-off-by: Sami Mujawar --- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 40 +++++++++++++++++++- Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 20 +++++++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc index f8c703c4b22b2a26028ba0562e0eae5948c3292d..d01e549f945f2593e6b62a58b204737aff104a40 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc @@ -1,5 +1,5 @@ # -# Copyright (c) 2011-2021, ARM Limited. All rights reserved. +# Copyright (c) 2011-2021, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -65,6 +65,11 @@ [LibraryClasses.common.SEC] [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.UEFI_APPLICATION, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_DRIVER] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + PciExpressLib|MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf + PciHostBridgeLib|Platform/ARM/VExpressPkg/Library/ArmVExpressPciHostBridgeLib/ArmVExpressPciHostBridgeLib.inf + PciLib|MdePkg/Library/BasePciLibPciExpress/BasePciLibPciExpress.inf + PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf + [BuildOptions] GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/Platform/ARM/VExpressPkg/Include/Platform/RTSM @@ -161,6 +166,21 @@ [PcdsFixedAtBuild.common] gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000000 # + # PCI Root Complex + # + gArmTokenSpaceGuid.PcdPciBusMin|0 + gArmTokenSpaceGuid.PcdPciBusMax|255 + + gArmTokenSpaceGuid.PcdPciMmio32Base|0x50000000 + gArmTokenSpaceGuid.PcdPciMmio32Size|0x10000000 + + gArmTokenSpaceGuid.PcdPciMmio64Base|0x4000000000 + gArmTokenSpaceGuid.PcdPciMmio64Size|0x4000000000 + + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x40000000 + gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseSize|0x10000000 + + # # ARM Architectural Timer Frequency # # Set tick frequency value to 100Mhz @@ -331,3 +351,21 @@ [Components.common] # EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf !endif + + # + # PCI Support + # + ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf + + # + # AHCI Support + # + MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf + MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf + + # + # SATA Controller + # + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf index 513054dbcbc5fd301816400a0471f66673a5aefb..418566673981a9655fbc7a834942443a2005c403 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf @@ -1,5 +1,5 @@ # -# Copyright (c) 2011 - 2018, ARM Limited. All rights reserved. +# Copyright (c) 2011 - 2021, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -171,6 +171,24 @@ [FV.FvMain] INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf INF MdeModulePkg/Application/UiApp/UiApp.inf + + # + # PCI Support + # + INF ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf + INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf + # + # AHCI Support + # + INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf + INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf + + # + # SATA Controller + # + INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + # FV Filesystem INF MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf -- 'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'