From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (EUR03-AM5-obe.outbound.protection.outlook.com [40.107.3.70]) by mx.groups.io with SMTP id smtpd.web11.7035.1637049863466997322 for ; Tue, 16 Nov 2021 00:04:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@armh.onmicrosoft.com header.s=selector2-armh-onmicrosoft-com header.b=3LpwT+7h; spf=pass (domain: arm.com, ip: 40.107.3.70, mailfrom: khasim.mohammed@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=yvSmi3wUvILIuS789SGLs57xJ95NDMGiHGpXzEi85Mo=; b=3LpwT+7h4YJa/l0OCF5WOrKJuFv3CIuY2eNwitwNNCj1todwSnEoQ/FY+Ou5lKjnj3t0P1jHNLrN7LMhY97pjMg2i4vkKSVpdWzrVXJq2HQvG9ELWN95tb9Al6O0fZ8pamr+8Am49GFGS/0PQO43lA/ySReyGrn2jL5vNPnLIR8= Received: from AS8PR04CA0058.eurprd04.prod.outlook.com (2603:10a6:20b:312::33) by VI1PR08MB3198.eurprd08.prod.outlook.com (2603:10a6:803:49::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Tue, 16 Nov 2021 08:04:20 +0000 Received: from AM5EUR03FT037.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:312:cafe::a3) by AS8PR04CA0058.outlook.office365.com (2603:10a6:20b:312::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Tue, 16 Nov 2021 08:04:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;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 AM5EUR03FT037.mail.protection.outlook.com (10.152.17.241) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.20 via Frontend Transport; Tue, 16 Nov 2021 08:04:20 +0000 Received: ("Tessian outbound de6049708a0a:v110"); Tue, 16 Nov 2021 08:04:20 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 18cc72dadbd84740 X-CR-MTA-TID: 64aa7808 Received: from d76c3c024fe0.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 9F8FF204-65C3-4A37-B67F-F517AA54EEA0.1; Tue, 16 Nov 2021 08:04:09 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d76c3c024fe0.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 16 Nov 2021 08:04:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jqpRhI+QNReyrm30+6bMRKl3Gw3PExk28KA7UPS9XwZ5jQivq4Hz8NUirCSzBV0UqQ77Df7vVmWqCbsp/364RAqNLoIePL2jlVXHpMF0M9iXaPJTDV4GOEGGDJXeZAQyR5P7kiQw9Nz9BjeqwUlU33y/FyAq4lV20c+Wi1gc9H+qAatglT85ebr6IesjRAi7Ve98OfwxEpLx2g6HLbBElqav4AfdbDWTZqVslEdmm3z1uiLEgo8h3QbUvtMJdnbaquY85KNrj7k6Bhw2Duf5DUhfv5TYMzpH6ik7iTRNf7nGCxShgr7nA0ro6fw4BY9KvuEqaXt/HvpiU7UvxREalQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yvSmi3wUvILIuS789SGLs57xJ95NDMGiHGpXzEi85Mo=; b=SN6SqLMLQcCx0+3ifGth3q5gwyE6ExmdJTdv5dyE48fWfocYgbsISil2a0ZRmDYYo2z9nE7PwkzoApFQ46XmVD5+E50VEiksPe5wtzAAgWelRIyfWydTrq2H3nAtpESCUTuuItc5nSzOdBBNX6LbL+0Ixdw3vUuK5yWt3zMEI4RMoTbLgHXV98C7DBLVjbopUnyA9raXD/GOAv5iAEDnlpalklqbjci4oql7Zp8vlSCw181/pv8UBFkOvgknBdeF799hH0udVuffkWxSaA4y89dOYRhiNk38GbHuvX5WCN7vt/pA3SZdfkZUHrnVWEoPpV7WjNZP/geIGHU8RiTPsw== 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=yvSmi3wUvILIuS789SGLs57xJ95NDMGiHGpXzEi85Mo=; b=3LpwT+7h4YJa/l0OCF5WOrKJuFv3CIuY2eNwitwNNCj1todwSnEoQ/FY+Ou5lKjnj3t0P1jHNLrN7LMhY97pjMg2i4vkKSVpdWzrVXJq2HQvG9ELWN95tb9Al6O0fZ8pamr+8Am49GFGS/0PQO43lA/ySReyGrn2jL5vNPnLIR8= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB5902.eurprd08.prod.outlook.com (2603:10a6:102:e0::10) by PAXPR08MB6800.eurprd08.prod.outlook.com (2603:10a6:102:137::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.27; Tue, 16 Nov 2021 08:04:06 +0000 Received: from PA4PR08MB5902.eurprd08.prod.outlook.com ([fe80::d02e:f1e5:1354:622e]) by PA4PR08MB5902.eurprd08.prod.outlook.com ([fe80::d02e:f1e5:1354:622e%9]) with mapi id 15.20.4669.022; Tue, 16 Nov 2021 08:04:06 +0000 From: "Khasim Mohammed" To: devel@edk2.groups.io Cc: nd@arm.com, Khasim Syed Mohammed , Deepak Pandey Subject: [PATCH 1/3] Silicon/ARM/NeoverseN1Soc: Update PciExpressLib to enable CCIX port Date: Tue, 16 Nov 2021 13:33:17 +0530 Message-Id: <20211116080319.18533-2-khasim.mohammed@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211116080319.18533-1-khasim.mohammed@arm.com> References: <20211116080319.18533-1-khasim.mohammed@arm.com> X-ClientProxiedBy: PN3PR01CA0124.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:96::12) To PA4PR08MB5902.eurprd08.prod.outlook.com (2603:10a6:102:e0::10) MIME-Version: 1.0 Received: from e116623.arm.com (217.140.105.56) by PN3PR01CA0124.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:96::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.19 via Frontend Transport; Tue, 16 Nov 2021 08:04:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9eb6ed6-28bb-429c-ae48-08d9a8d7b1bf X-MS-TrafficTypeDiagnostic: PAXPR08MB6800:|VI1PR08MB3198: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3173;OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: KJcEZI2AdWwY/NVus2bxgRlpE3S6McqjSmDRDp820nCW+OS3+epmKmUHWXud5eMU6pl1yEku4Lbt9PdCFmensujVGkCoHFwFMVJsXxUYYvEK14YfTZKS+u4nDtK9C4nO0ogFS4B8+I24fCsCJMVw43+ReaSGLSEffbS0cT+vYtAKG4ME+/Zp2T/vVaBL22SVaMvY1CIfvsqZsQ4R01iZv32AhOT1XdNGXz37lDFjl/B+KDidCH0+kNguNtISISg4arUkpkdTVtXvIvkTsno/pOBtMBe0clQLUEGitdGsWHgPKHIZVS6NGEETfWV2Lqjdf+52JRkyC2Ii7ktJexcMtIrTJ7hDzDU5cYzbwk8R3bnUCP4dQdotPVhS1urCiNFNzFWv15389abCmfVBhLvrPECuXjGPExgVcBqqsxNdi98xLyJEDZt0pxu/pLn6/33dA3Y/T6duGg24MX4oAvEnzlhI5N4y6nLb+NXEf9DiuG6yWdA6Rly9s8wxLHkBOzUSNZnqchGbk8BNctIHQ3OWU6n3XPK/DGnjrlKRp+RUkcJ9Ow2P7VMGu0brX2wockaxp7leS+LBQg9df0jFYs18svWTcl7dkOG76X//LqGdM7t8QM1RF3PFQQKLMsMPWG/9AF0PS/h+sZy1xCPoFNC3UkXhXozxST5ZYcQbcUFsNQVDXTK5fzfqS0tSPGHn7N96IBYlo9d6dZWgU62xV4oWpQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR08MB5902.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(36756003)(956004)(2616005)(6666004)(83380400001)(38100700002)(38350700002)(15650500001)(5660300002)(7696005)(8676002)(86362001)(52116002)(8936002)(6916009)(66946007)(66556008)(508600001)(2906002)(19627235002)(1076003)(26005)(316002)(54906003)(66476007)(186003)(4326008)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6800 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Return-Path: Khasim.Mohammed@arm.com X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT037.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: fed18503-6d4d-4621-7108-08d9a8d7a90d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wj2lT7OI0nOhHuRT7vWSgbDCt4FDHuVZ3k4qZK2d6JtdkxE40V+X2Zy5w4IPpMgQmEDe1xdwoVBMM1J2RvohA7gzzz+RDaAON+pzDVgrDgkMuyXpuRpDbuZ7WsSR5Mp5OpCO0agwD2OfmEhDrV3wM0GKXiAvrYt/9iiL2Iqx8Mj2jvCnGsGVt4rj3eO3Qc5QVMAxNo+lsqh0LmSrZkhS3Orf7YvE2nfEPtJRqnBU9wKzbNGEPtfssFiLOGZMuQ4c7RuH6CFeNsDcsWsABk9Ta8VXAGeLiA4r+8DUrQWqEZ1ec1Ly19NyEEsxiit+ljd5xqWc9TrRhy06DBULwuFqAWTckY0PkVOU2ZL9OTna9BB5mN7dNdalxjMO7r7Kv+aftgcRZaBdtDWa1GL3AA8X7S+/Q+e8cR3+eCRyWJrRd7v+twg7x6pVGQrO2c6RNPqhd34X6m2NoVrb66rsF7RT3N73uNTrouuUfsMRLPVeOYyvKM6SE5qlOr4JzRRcUMXOtL/ULDarxJROeMB7yq/sD1ZZr4eFiWbA7tgtSCj6CJlMOt744seKkxt9SCWleligxARf9m/3nxfHqN7xjaDQJI1NSsyenIsIhd5WuUNst1eEUM6ENpmR4gtZ/+HIVjBUZGQi1IbdMart058/dI7hjOqomGl6qvHlmolI/MCHOtZs/qI530RsVGufXKgOsf1k2TyjbCYdfHbB1UhYC4jQAg== 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)(36840700001)(46966006)(81166007)(86362001)(82310400003)(83380400001)(70586007)(36756003)(2906002)(4326008)(26005)(19627235002)(7696005)(15650500001)(54906003)(336012)(316002)(6666004)(5660300002)(356005)(508600001)(6916009)(47076005)(186003)(1076003)(8936002)(36860700001)(6486002)(70206006)(8676002)(956004)(2616005);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 08:04:20.2430 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9eb6ed6-28bb-429c-ae48-08d9a8d7b1bf 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: AM5EUR03FT037.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3198 Content-Type: text/plain Update the PciExpressLib to enable CCIX port as PCIe root host by validating the PCIe addresses and introducing corresponding PCD entries. Change-Id: I0d1167b86e53a3781f59c4d68a3b2e61add4317e Signed-off-by: Deepak Pandey Signed-off-by: Khasim Syed Mohammed --- .../PciExpressLib.c | 127 ++++++++++++------ .../PciExpressLib.inf | 7 +- Silicon/ARM/NeoverseN1Soc/NeoverseN1Soc.dec | 5 +- 3 files changed, 94 insertions(+), 45 deletions(-) diff --git a/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.c b/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.c index bb0246b4a9..3abe0a2d6b 100644 --- a/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.c +++ b/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.c @@ -20,7 +20,7 @@ The description of the workarounds included for these limitations can be found in the comments below. - Copyright (c) 2020, ARM Limited. All rights reserved. + Copyright (c) 2020 - 2021, ARM Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -36,15 +36,29 @@ #include #include +#define BUS_OFFSET 20 +#define DEV_OFFSET 15 +#define FUNC_OFFSET 12 +#define REG_OFFSET 4096 + /** - Assert the validity of a PCI address. A valid PCI address should contain 1's - only in the low 28 bits. + Assert the validity of a PCI address. A valid PCI address should contain 1's. @param A The address to validate. **/ #define ASSERT_INVALID_PCI_ADDRESS(A) \ - ASSERT (((A) & ~0xfffffff) == 0) + ASSERT (((A) & ~0xffffffff) == 0) + +#define EFI_PCIE_ADDRESS(bus, dev, func, reg) \ + (UINT64) ( \ + (((UINTN) bus) << BUS_OFFSET) | \ + (((UINTN) dev) << DEV_OFFSET) | \ + (((UINTN) func) << FUNC_OFFSET) | \ + (((UINTN) (reg)) < REG_OFFSET ? \ + ((UINTN) (reg)) : (UINT64) (LShiftU64 ((UINT64) (reg), 32)))) + +#define GET_PCIE_BASE_ADDRESS(Address) (Address & 0xF8000000) /* Root port Entry, BDF Entries Count */ #define BDF_TABLE_ENTRY_SIZE 4 @@ -53,6 +67,7 @@ /* BDF table offsets for PCIe */ #define PCIE_BDF_TABLE_OFFSET 0 +#define CCIX_BDF_TABLE_OFFSET (16 * 1024) #define GET_BUS_NUM(Address) (((Address) >> 20) & 0x7F) #define GET_DEV_NUM(Address) (((Address) >> 15) & 0x1F) @@ -113,49 +128,64 @@ PciExpressRegisterForRuntimeAccess ( } /** - Check if the requested PCI address can be safely accessed. + Check if the requested PCI address is a valid BDF address. - SCP performs the initial bus scan, prepares a table of valid BDF addresses - and shares them through non-trusted SRAM. This function validates if the - requested PCI address belongs to a valid BDF by checking the table of valid - entries. If not, this function will return false. This is a workaround to - avoid bus fault that occurs when accessing unavailable PCI device due to - hardware bug. + SCP performs the initial bus scan and prepares a table of valid BDF addresses + and shares them through non-trusted SRAM. This function validates if the PCI + address from any PCI request falls within the table of valid entries. If not, + this function will return 0xFFFFFFFF. This is a workaround to avoid bus fault + that happens when accessing unavailable PCI device due to RTL bug. @param Address The address that encodes the PCI Bus, Device, Function and Register. - @return TRUE BDF can be accessed, valid. - @return FALSE BDF should not be accessed, invalid. + @return The base address of PCI Express. **/ STATIC -BOOLEAN +UINTN IsBdfValid ( - IN UINTN Address + IN UINTN Address ) { + UINT8 Bus; + UINT8 Device; + UINT8 Function; UINTN BdfCount; UINTN BdfValue; - UINTN BdfEntry; UINTN Count; UINTN TableBase; - UINTN ConfigBase; + UINTN PciAddress; + + Bus = GET_BUS_NUM (Address); + Device = GET_DEV_NUM (Address); + Function = GET_FUNC_NUM (Address); + + PciAddress = EFI_PCIE_ADDRESS (Bus, Device, Function, 0); + + if (GET_PCIE_BASE_ADDRESS (Address) == + FixedPcdGet64 (PcdPcieExpressBaseAddress)) { + TableBase = NEOVERSEN1SOC_NON_SECURE_SRAM_BASE + PCIE_BDF_TABLE_OFFSET; + } else { + TableBase = NEOVERSEN1SOC_NON_SECURE_SRAM_BASE + CCIX_BDF_TABLE_OFFSET; + } - ConfigBase = Address & ~0xFFF; - TableBase = NEOVERSEN1SOC_NON_SECURE_SRAM_BASE + PCIE_BDF_TABLE_OFFSET; BdfCount = MmioRead32 (TableBase + BDF_TABLE_ENTRY_SIZE); - BdfEntry = TableBase + BDF_TABLE_HEADER_SIZE; - - /* Skip the header & check remaining entry */ - for (Count = 0; Count < BdfCount; Count++, BdfEntry += BDF_TABLE_ENTRY_SIZE) { - BdfValue = MmioRead32 (BdfEntry); - if (BdfValue == ConfigBase) { - return TRUE; - } + + /* Start from the second entry */ + for (Count = BDF_TABLE_HEADER_COUNT; + Count < (BdfCount + BDF_TABLE_HEADER_COUNT); + Count++) { + BdfValue = MmioRead32 (TableBase + (Count * BDF_TABLE_ENTRY_SIZE)); + if (BdfValue == PciAddress) + break; } - return FALSE; + if (Count == (BdfCount + BDF_TABLE_HEADER_COUNT)) { + return mDummyConfigData; + } else { + return PciAddress; + } } /** @@ -186,20 +216,35 @@ GetPciExpressAddress ( IN UINTN Address ) { - UINT8 Bus, Device, Function; - UINTN ConfigAddress; - - Bus = GET_BUS_NUM (Address); - Device = GET_DEV_NUM (Address); + UINT8 Bus; + UINT8 Device; + UINT8 Function; + UINT16 Register; + UINTN ConfigAddress; + + // Get the EFI notation + Bus = GET_BUS_NUM (Address); + Device = GET_DEV_NUM (Address); Function = GET_FUNC_NUM (Address); - - if ((Bus == 0) && (Device == 0) && (Function == 0)) { - ConfigAddress = PcdGet32 (PcdPcieRootPortConfigBaseAddress) + Address; - } else { - ConfigAddress = PcdGet64 (PcdPciExpressBaseAddress) + Address; - if (!IsBdfValid(Address)) { - ConfigAddress = (UINTN)&mDummyConfigData; - } + Register = GET_REG_NUM (Address); + + ConfigAddress = (UINTN) + ((GET_PCIE_BASE_ADDRESS (Address) == + FixedPcdGet64 (PcdPcieExpressBaseAddress)) ? + (((Bus == 0) && (Device == 0) && (Function == 0)) ? + PcdGet32 (PcdPcieRootPortConfigBaseAddress + + EFI_PCIE_ADDRESS (Bus, Device, Function, Register)): + PcdGet64 (PcdPcieExpressBaseAddress + + EFI_PCIE_ADDRESS (Bus, Device, Function, Register))) : + (((Bus == 0) && (Device == 0) && (Function == 0)) ? + PcdGet32 (PcdCcixRootPortConfigBaseAddress + + EFI_PCIE_ADDRESS (Bus, Device, Function, Register)): + PcdGet32 (PcdCcixExpressBaseAddress + + EFI_PCIE_ADDRESS (Bus, Device, Function, Register)))); + + if (!((Bus == 0) && (Device == 0) && (Function == 0))) { + if (IsBdfValid (Address) == mDummyConfigData) + ConfigAddress = (UINTN) &mDummyConfigData; } return (VOID *)ConfigAddress; diff --git a/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.inf b/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.inf index acb6fb6219..eac981e460 100644 --- a/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.inf +++ b/Silicon/ARM/NeoverseN1Soc/Library/NeoverseN1SocPciExpressLib/PciExpressLib.inf @@ -21,7 +21,7 @@ # 2. Root port ECAM space is not capable of 8bit/16bit writes. # This library includes workaround for these limitations as well. # -# Copyright (c) 2020, ARM Limited. All rights reserved. +# Copyright (c) 2020 - 2021, ARM Limited. All rights reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -43,6 +43,8 @@ Silicon/ARM/NeoverseN1Soc/NeoverseN1Soc.dec [FixedPcd] + gArmNeoverseN1SocTokenSpaceGuid.PcdCcixRootPortConfigBaseAddress + gArmNeoverseN1SocTokenSpaceGuid.PcdCcixRootPortConfigBaseSize gArmNeoverseN1SocTokenSpaceGuid.PcdPcieRootPortConfigBaseAddress gArmNeoverseN1SocTokenSpaceGuid.PcdPcieRootPortConfigBaseSize @@ -53,4 +55,5 @@ PcdLib [Pcd] - gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress ## CONSUMES + gArmNeoverseN1SocTokenSpaceGuid.PcdCcixExpressBaseAddress ## CONSUMES + gArmNeoverseN1SocTokenSpaceGuid.PcdPcieExpressBaseAddress diff --git a/Silicon/ARM/NeoverseN1Soc/NeoverseN1Soc.dec b/Silicon/ARM/NeoverseN1Soc/NeoverseN1Soc.dec index eea2d58402..5ec3c32539 100644 --- a/Silicon/ARM/NeoverseN1Soc/NeoverseN1Soc.dec +++ b/Silicon/ARM/NeoverseN1Soc/NeoverseN1Soc.dec @@ -46,6 +46,7 @@ gArmNeoverseN1SocTokenSpaceGuid.PcdPcieMmio64MaxBase|0x28FFFFFFFF|UINT64|0x00000010 gArmNeoverseN1SocTokenSpaceGuid.PcdPcieMmio64Size|0x2000000000|UINT64|0x00000011 gArmNeoverseN1SocTokenSpaceGuid.PcdPcieMmio64Translation|0x0|UINT64|0x00000012 + gArmNeoverseN1SocTokenSpaceGuid.PcdPcieExpressBaseAddress|0x70000000|UINT64|0x00000013 # CCIX gArmNeoverseN1SocTokenSpaceGuid.PcdCcixBusCount|18|UINT32|0x00000016 @@ -53,8 +54,8 @@ gArmNeoverseN1SocTokenSpaceGuid.PcdCcixBusMin|0|UINT32|0x00000018 gArmNeoverseN1SocTokenSpaceGuid.PcdCcixExpressBaseAddress|0x68000000|UINT32|0x00000019 gArmNeoverseN1SocTokenSpaceGuid.PcdCcixIoBase|0x0|UINT32|0x0000001A - gArmNeoverseN1SocTokenSpaceGuid.PcdCcixIoMaxBase|0x01FFFF|UINT32|0x0000001B - gArmNeoverseN1SocTokenSpaceGuid.PcdCcixIoSize|0x020000|UINT32|0x0000001C + gArmNeoverseN1SocTokenSpaceGuid.PcdCcixIoMaxBase|0x00FFFFFF|UINT32|0x0000001B + gArmNeoverseN1SocTokenSpaceGuid.PcdCcixIoSize|0x01000000|UINT32|0x0000001C gArmNeoverseN1SocTokenSpaceGuid.PcdCcixIoTranslation|0x6D200000|UINT32|0x00000001D gArmNeoverseN1SocTokenSpaceGuid.PcdCcixMmio32Base|0x69200000|UINT32|0x0000001E gArmNeoverseN1SocTokenSpaceGuid.PcdCcixMmio32MaxBase|0x6D1FFFFF|UINT32|0x00000001F -- 2.17.1