From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=40.107.0.77; helo=eur02-am5-obe.outbound.protection.outlook.com; envelope-from=meenakshi.aggarwal@nxp.com; receiver=edk2-devel@lists.01.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00077.outbound.protection.outlook.com [40.107.0.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D4DB7223230FC for ; Fri, 16 Feb 2018 00:49:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=WMNcf5jRd2KavdkOHlOA/Clqg/SmpiwXtzL6F2T6ajE=; b=B8NL3ztes/8Xt7Jh1nnp9AZI54OlQNaRtadXd9iApbKvf2x90FCBxL+GAsXGnCuokFqqMgWN0aTu7c33zzLLgv98z62+fhHyalyO9g2yia37dApnAEz/6SctUyHu1qYO2GFm9xGpWF3QKdCcgDzpO0YgY5XtToLHA7uDAfUUsJI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=meenakshi.aggarwal@nxp.com; Received: from idcbfarm.ap.freescale.net (192.88.169.1) by VI1PR04MB1008.eurprd04.prod.outlook.com (2a01:111:e400:5090::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.485.10; Fri, 16 Feb 2018 08:55:37 +0000 From: Meenakshi To: ard.biesheuvel@linaro.org, leif.lindholm@linaro.org, michael.d.kinney@intel.com, edk2-devel@lists.01.org Date: Fri, 16 Feb 2018 14:20:34 +0530 Message-Id: <1518771035-6733-39-git-send-email-meenakshi.aggarwal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1518771035-6733-1-git-send-email-meenakshi.aggarwal@nxp.com> References: <1518771035-6733-1-git-send-email-meenakshi.aggarwal@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.169.1] X-ClientProxiedBy: HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::32) To VI1PR04MB1008.eurprd04.prod.outlook.com (2a01:111:e400:5090::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 7b0d0495-5ad2-4858-4f4d-08d5751b0e2c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7153060)(7193020); SRVR:VI1PR04MB1008; X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1008; 3:hr8YtFXxuls0Nv3m+ee3ZFhdlVpc8OXd9D46t8wKam2xyQQXOg+hhcffDey7C1wWLFph7XafI9qdXEkbu/lS5Y4GrD2z6Yydeo6L6mwVlr03uMFTGrYSp0hGkn5GScuWbGhcph3MhdPzqyCTLnewhqZBtcteJP2w0gyUbxZsI67v8R/lQis2n1gaRsnNW5oYRlhyWQf2NFM2cjS+imhWvWbiUrBuzFeOYcFJ9/clGcWD8QCq4ueHdAFX8me6zaG/; 25:Cf1+lQYuuz9wm3DcaQ93QkFtOpGP+xULbumQxEmcr/a3Tx+nMaM7y3d85jrSKyR0KPBgxJbIEO9r3dU3YHq2PqI15iVTM6RMmbzHekLOCeQiGRBocqGC04mnV8oUsQukG5y651miJ8PS2FTv6GWnK1QXduV3DSK/4cEbwgnq9P2mv5HU1Wkr9dnznj7jlRh3dYAJKUYaHoBenq8V8eUEn3yRATGlPss1vLo5A09HYczVI7L/e9RAacgqNcWng8nMfAAtApyNcHBCDzw4wx6kxdV88iT3Kq7vhE8IQ2rrW3fdlbJR+xu/pbCzqb/F8GdnNY8qnaB0ZS1Zj0cHXsrPXw==; 31:895at0frC9Z8GocdgZs77YsSCfJi0QfFVr6aSLFll6cSq4E/3a6eM0//21G1tIYBAtF8/HyOfvQCkoEcImuLak4hbUCBKC/A7tga3QEnxepF+6zt4oSpSQ6WLUKzcRqfViMmpwUKn3ZaE48RTic3JZANQ2bsE3vty3EBCF6T4OBqZl9DOB9uJ+TeOhB6ztyemOyTJZeyDhppxYbkLxQiE/PBn5wAeW337IeqO2T7Rxk= X-MS-TrafficTypeDiagnostic: VI1PR04MB1008: X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1008; 20:3bjcP0Tnsx0cd9YIugpAyTCuYTImfrtVuvGag5uLmGH3qL9RLEi/YZKgFDoWicW0b32lMcDaGcQfNl/lQAll0wZki98Qpd+0SadbeMPwEbqSQPiJKX4+e8L++vAX1qtlN1ZfEGliwuRiL3J89nQQY/hbN1rxlgCxNiiZ6vZ20Bc9blIQw9QDjwfzMnRScbCgDFogC7pStI8WonmGkjfrzwk1k7jL6yH21bnmmZfo6W5Ljtf2cGXvvLJmeMyPLdJoIUl339Gc2eRnpJ+gxXzjPI/4Z/avs70SVFHi75rQd1JZAhrSBIP5K6O8/fZ0YosSxP7CmAMucz04h8+BuiW4BcyaBOkEVgEqMtWzq0vNysxtg8Als0yAFPYgSBnCYFEC7SgoQaGNB3Y1FBkgRnLVem/dNP+lYqboZFGuu4m++1b8HDhn8UdFqrSayCwzCI+aUfLYdQ3MXMGGP7dwIH5/EFHmXnWJssqt/6LO109uUuz4FX9O9O1wTMrQPCD998Gd; 4:On6WdArtt7aBheODFJAAJV4vtdHJfX4bU/8Crm0HLd2HnxZrXSjJkbShA5ZJu5yqYCVfBavQAAFTwX9Qkf/AzyzkhDR6dufDDK68kK+qMInoKlAIudeePzMftnuIYZgkCSW6mF+3UANcAZILEixpUDnXNWuB67pCzCil0fWi5GEsGjM9JB/YgVN31A/Q/ei78UidBL5cIkuJi3XHznLDS9mK3coOXWqpikAVrYU7pZ2Iqbyeo4bOw/FHjJvkpoAyZJsYEHgpkaM/fOhMpd1QcR+3ZRXcH6QAYQpH8YbvUH6gFPzm+HsxGc39TAKA+gNO X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231101)(944501161)(6055026)(6041288)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:VI1PR04MB1008; BCL:0; PCL:0; RULEID:; SRVR:VI1PR04MB1008; X-Forefront-PRVS: 0585417D7B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(39380400002)(396003)(39860400002)(366004)(199004)(189003)(86362001)(6486002)(8676002)(76176011)(36756003)(4326008)(6116002)(7736002)(386003)(68736007)(186003)(26005)(53936002)(305945005)(16526019)(81156014)(3846002)(6506007)(478600001)(50226002)(16586007)(8936002)(2950100002)(316002)(2906002)(59450400001)(25786009)(97736004)(50466002)(48376002)(105586002)(52116002)(47776003)(81166006)(51416003)(5660300001)(6666003)(106356001)(66066001)(6512007)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR04MB1008; H:idcbfarm.ap.freescale.net; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR04MB1008; 23:YVCpJfZr/naLrbKI09GnqHzayACy9juOwhZ16VnmC?= =?us-ascii?Q?fzbUnaDIN5SwsvYLBmejxf0vO3+ojlp2Uw9MwHv341YQh3/spt0YmeaattTe?= =?us-ascii?Q?ejGp26d7/+b+VwLNaJmp3kI3MIjkEDaIOrluxKhLqarbmQiqBAwh8TgXzyq2?= =?us-ascii?Q?K1e1VQuD3zI+phg6JrUXBO7bCq+zP19z2uMLIE23IYiixYxRQ3GJP1CHMeRc?= =?us-ascii?Q?Y8nwOjvrEPKcvftjndzE5F+ZUPGWErArnvl7ZI1oxLdMlV/p8VWE0RjPvvYq?= =?us-ascii?Q?c+pl4cWGNsVlZiQH11x3T+rITWPtfHgyd5OC8gDgN5kv4mJg7vYlm/I5wh65?= =?us-ascii?Q?mQCj5fdZ2p2Mn7G4ChWf5FEObF/7SiaREQ4Ey5hgwZx4UJkN1PphIuKgpkkv?= =?us-ascii?Q?5RqUiwR1tjUBA5P0Y6fKmGLZg2du2FAhF54CySZnzf7ibq7j1yclkTzXbnIA?= =?us-ascii?Q?NFXBoPAlGHisddbuX3jcUgqoa8weO7WsmlzyOx8dA+q2KSSb5i+zyjJWp+EC?= =?us-ascii?Q?Mt+118rRdMaPa243KOYCRYKQNQbkHwADWDYtsJM1QGqBGyPDfo2cRL0EbnU6?= =?us-ascii?Q?VCDHvzpRhFhsYHnN18MdAtTcTkHSh5YyoOEXccpO0nF1rWQmp68ro7KCN7vD?= =?us-ascii?Q?BIlrbOKzFnznDsLac1YpUSm2nPMRmZkuGfMce7dAsUgYa3VD8Rx4cM3kWrbC?= =?us-ascii?Q?W0Q7BmEQykNhoNDz+TQOIkBXh1FqqKw6oh/ORM4anKDJeJXQh89KbP6mxiOM?= =?us-ascii?Q?/Gy+/ymWF/my+A2FbjMW4A2DI32Tv29qq3q0hJsjUrqtj4EdryISmmaDcNpu?= =?us-ascii?Q?RcZZroUQb6Iwgsdq9lo0/5gBMVw3skxF1nePhgPY5di5V2H8vxuf2fRFp1Z2?= =?us-ascii?Q?kKQTeVIijDBkhw3xxs7m58pdXLMmbSR+iU+mJzPZ9dKP8w5g+2n+04Slzs5y?= =?us-ascii?Q?mJzwjlvXHsdv0RePwH/CNnyH/IhgqWApzd9goQXQCPEe4am392efbEyMSfmZ?= =?us-ascii?Q?MKG5RItHBE3UQX5HoniyjKO6PS+FjtTB1s2IOiOjKOn85EnYaOu6i3UhiEd+?= =?us-ascii?Q?ThAG186GcUk0hIBoMXDNaAshBjbWnzifA+oaqw9ZwAD/RU35Uq4kg362da7P?= =?us-ascii?Q?ZtTniSpYVRWwwOzV7SvCdxjJ5sSooBH?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR04MB1008; 6:s31Kq3uK/aQwWEa2Giy5L8Ijh3hMFaeoY2mw5s0Qyj6weJWLmZwLWGVkrv/QfhM5cBsx5m69Jk0aNo+zxG0xCvkZVdrH8Lfzi5yVAH3m+yDAxdhdlE1aX7jZLKyMlC4C2Tyt7RRH91mIGPGZsZQnJydIMK0U29JNGIL4rCd3B4LYWqArFO4JSiv7Lr32GZVtxa6cJphELZYI6U8sxmPSStHNlPqiL2vA/w7xCDOW3oifh29ae+kQp0xD7C0QFhOW+b3+sMi1SoSZcnbE+r21y/cJMCRhs6WFnhYhahXGhtfE4GasOuRlTfT45scuJn1cufPtqWhk4AbAPo153NVktaLfpKDsygKc0p7x8I0CnRA=; 5:Iwof0O4aedFDBCIt5NTrg5vYUhp07tSTT1SdNfw/JSYTYRwsZ7A3mQjImTrWZFKVuJBZy9Ip497/uHJlnurPAp2dB+yKmLIzp+cy79BV+i2GcQQRF0b2yndjfswpy/0pe3NG5kZdNL70BB/Ag+Pinzm+gGWcrrMGkKrraaCSSSQ=; 24:t0G7bl2WG8JOYAA3QxuJvRIOtJj5mWk2gAGDDIR+FRlCt4C5305b4ugR/DRD2Fc3SmsxE/ZNKPslYK0kU0ZaKYTg8LHPMbDtq0EDoujxerk=; 7:47fgdHPG9tlzia7LKn9V/zFJYV1BgVammd2dI7AAbdk1/BE2N61ldF7Z1tRBClp5jlV93K7KL5kMaEu/tQxovP9GRqwpvtqe1PT04dJtDnKCvYgBY/HNjqIsRbpSSgjX34kpdOX55YoSK2f6e+UP9mofBHjop4oxFof86Gy+Adh4kH4hWsyRSQJ9IMDgIlmCHwE2uHRrXQ/+vC1JJlwT9v7jb8XiGEGd8AFmIwLpd3/tdfCZajodpNrRZRW1HJW+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2018 08:55:37.6550 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7b0d0495-5ad2-4858-4f4d-08d5751b0e2c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB1008 Subject: [PATCH edk2-platforms 38/39] Platform/NXP:PCIe enablement for LS1046A RDB X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Feb 2018 08:49:51 -0000 Content-Type: text/plain From: Vabhav Compilation: Update the fdf, dsc and dec files. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Vabhav --- Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc | 15 +++++++++++++++ Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf | 9 +++++++++ .../LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf | 2 ++ .../NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c | 6 ++++++ Silicon/NXP/LS1046A/LS1046A.dsc | 3 +++ 5 files changed, 35 insertions(+) diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc index 36002d5..231207d 100644 --- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc +++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc @@ -41,6 +41,8 @@ IfcLib|Silicon/NXP/Library/IfcLib/IfcLib.inf BoardLib|Platform/NXP/LS1046aRdbPkg/Library/BoardLib/BoardLib.inf FpgaLib|Platform/NXP/LS1046aRdbPkg/Library/FpgaLib/FpgaLib.inf + PciSegmentLib|Silicon/NXP/Library/PciSegmentLib/PciSegmentLib.inf + PciHostBridgeLib|Silicon/NXP/Library/PciHostBridgeLib/PciHostBridgeLib.inf [PcdsFixedAtBuild.common] @@ -65,6 +67,7 @@ gNxpQoriqLsTokenSpaceGuid.PcdGurBigEndian|TRUE gNxpQoriqLsTokenSpaceGuid.PcdWdogBigEndian|TRUE gNxpQoriqLsTokenSpaceGuid.PcdIfcBigEndian|TRUE + gNxpQoriqLsTokenSpaceGuid.PcdPciLutBigEndian|TRUE # # I2C controller Pcds @@ -77,6 +80,12 @@ gNxpQoriqLsTokenSpaceGuid.PcdI2cSlaveAddress|0x51 gNxpQoriqLsTokenSpaceGuid.PcdI2cSpeed|100000 + # + # PCI PCDs. + # + gNxpQoriqLsTokenSpaceGuid.PcdPciDebug|FALSE + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutBase|0x80000 + gNxpQoriqLsTokenSpaceGuid.PcdPcieLutDbg|0x407FC ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -90,5 +99,11 @@ Silicon/NXP/Drivers/WatchDog/WatchDogDxe.inf Silicon/NXP/Drivers/I2cDxe/I2cDxe.inf + Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf + MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8010004F + } + MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf ## diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf index 834e3a4..3351a06 100644 --- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf +++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf @@ -123,6 +123,13 @@ READ_LOCK_STATUS = TRUE INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf # + # PCI + # + INF Silicon/NXP/Drivers/PciCpuIo2Dxe/PciCpuIo2Dxe.inf + INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf + INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf + + # # Network modules # INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf @@ -147,6 +154,8 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf !endif + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + # # FAT filesystem + GPT/MBR partitioning # diff --git a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf index 49b57fc..5e09757 100644 --- a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf +++ b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf @@ -42,6 +42,8 @@ gArmTokenSpaceGuid.PcdArmPrimaryCore gNxpQoriqLsTokenSpaceGuid.PcdCcsrBaseAddr gNxpQoriqLsTokenSpaceGuid.PcdCcsrSize + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr + gNxpQoriqLsTokenSpaceGuid.PcdRomSize gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1BaseAddr gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion1Size gNxpQoriqLsTokenSpaceGuid.PcdIfcRegion2BaseAddr diff --git a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c index 64c5612..1ef3292 100644 --- a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c +++ b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c @@ -67,6 +67,12 @@ ArmPlatformGetVirtualMemoryMap ( VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdCcsrSize); VirtualMemoryTable[Index].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; + // ROM Space + VirtualMemoryTable[++Index].PhysicalBase = FixedPcdGet64 (PcdRomBaseAddr); + VirtualMemoryTable[Index].VirtualBase = FixedPcdGet64 (PcdRomBaseAddr); + VirtualMemoryTable[Index].Length = FixedPcdGet64 (PcdRomSize); + VirtualMemoryTable[Index].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; + // IFC region 1 // // A-009241 : Unaligned write transactions to IFC may result in corruption of data diff --git a/Silicon/NXP/LS1046A/LS1046A.dsc b/Silicon/NXP/LS1046A/LS1046A.dsc index 9f87028..59a6150 100644 --- a/Silicon/NXP/LS1046A/LS1046A.dsc +++ b/Silicon/NXP/LS1046A/LS1046A.dsc @@ -64,5 +64,8 @@ gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionBaseAddr|0x40000000 gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionSize|0x20000000 gNxpQoriqLsTokenSpaceGuid.PcdIfcBaseAddr|0x1530000 + gNxpQoriqLsTokenSpaceGuid.PcdNumPciController|3 + gNxpQoriqLsTokenSpaceGuid.PcdRomBaseAddr|0x00000000 + gNxpQoriqLsTokenSpaceGuid.PcdRomSize|0x00100000 ## -- 1.9.1