From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=104.47.40.79; helo=nam03-co1-obe.outbound.protection.outlook.com; envelope-from=meenakshi.aggarwal@nxp.com; receiver=edk2-devel@lists.01.org Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0079.outbound.protection.outlook.com [104.47.40.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 74431222275A3 for ; Mon, 8 Jan 2018 02:02:17 -0800 (PST) Received: from BN6PR03CA0009.namprd03.prod.outlook.com (2603:10b6:404:23::19) by SN2PR03MB2368.namprd03.prod.outlook.com (2603:10b6:804:e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Mon, 8 Jan 2018 10:07:26 +0000 Received: from BY2FFO11FD005.protection.gbl (2a01:111:f400:7c0c::190) by BN6PR03CA0009.outlook.office365.com (2603:10b6:404:23::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Mon, 8 Jan 2018 10:07:25 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD005.mail.protection.outlook.com (10.1.14.126) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Mon, 8 Jan 2018 10:06:55 +0000 Received: from uefi-OptiPlex-790.ap.freescale.net (uefi-OptiPlex-790.ap.freescale.net [10.232.132.78]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w08A7CjP014903; Mon, 8 Jan 2018 03:07:22 -0700 From: Meenakshi Aggarwal To: , , , Date: Mon, 8 Jan 2018 21:25:12 +0530 Message-ID: <1515426912-13557-3-git-send-email-meenakshi.aggarwal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515426912-13557-1-git-send-email-meenakshi.aggarwal@nxp.com> References: <1513945005-30002-1-git-send-email-meenakshi.aggarwal@nxp.com> <1515426912-13557-1-git-send-email-meenakshi.aggarwal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131598796156503011; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(346002)(396003)(39380400002)(376002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(2906002)(36756003)(68736007)(77096006)(48376002)(8676002)(50226002)(110136005)(47776003)(81156014)(97736004)(305945005)(54906003)(4326008)(16586007)(316002)(6666003)(59450400001)(81166006)(2950100002)(104016004)(8656006)(5660300001)(76176011)(86362001)(575784001)(50466002)(2201001)(85426001)(105606002)(51416003)(356003)(53936002)(106466001)(498600001)(8936002)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2368; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD005; 1:ihu5B5zhOGOjPiYz95AGI8D/zLScYoYeCJj9aQxz3xam9J2YEnKxK81GUZnRXve9cRZRQDAnvt7UBWwcfArozmFdoEiGA/CDFuFphDZAdIsh+EmDcyCKq06R2Tv1oOd6 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3e4977d0-b0b5-41d9-03e3-08d5567f8c3e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:SN2PR03MB2368; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 3:lQw7sjcsdd/0LnLnp3V4zLBK+SQqYNSWnS7aLC3DtVvUdZN70EsNaybcJ/GURGF5hCb6Y/2b4lTTKHHuUmfpQjwoXlRopepW+4CoLLxyhfutncfbKfrPlC87Kd+O8lKuIDF/SmHzi/KcppVWKNl6dQttwBUhwGaELw+kTMtBwtmHyfR6BkwP70gSF0b/81DRSGlheBolJx+I2sMwg4TTlsc5OTWehDFwLX5kb6JCtG+hdWcyt/35PuJ0Wsw5FYuwukgjlZyMSKVlOEou3mKUHtwINsy9pbI5/0T0q7Dy3ZM36835jQH0lNBkKQ8shMgMVQyiYBTI3Nc71rO3efFjE6VJN1AVXd0Hp9xp6gAatd0=; 25:ElGR3T4/w+rvuWRcJ2tdhAq88WW4N7F2i6LojwXFIMPrI5JoRY9b9hWHp7Z5BcVfW6LuAgeHUK4PDey5dur0hFaX5dng0VxVT760S18WdgbsdRmEcEukIAIoN4DJKGAgAqI4XVT+vSctiKVN/fusjpmdRrKdfrS4TQBZmx1EMlsUy/YLD6gjYcLsMrXYbOuio5E7GUp4QmgsDpnV2GtwJnN4fVGur+pzQ/ZWknPdr1M6xx9XkylJW4Rb2wCsyaH5OhiTRKwbF6LWLVk77K7oLCzZ+1bkqQ+EnkSO+xmnMeGjJQfzflM7MnZB2a2Xh4IfJRwS0gRtWurOgIzRoGuoPg== X-MS-TrafficTypeDiagnostic: SN2PR03MB2368: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 31:yvw1YdHRC4/UA2zII+6rktsFgIW8AAMaYs28+BavLbFZo0QhLmfwgiRiso0Az+Eu1zy72lsVzPrTjOUiI1Bg8cwcmgnoAEjxWYJ5qV9/f/w03tOq4wjX+5Y1LhzJD1D6ef6Knb5WUiXkRvqrn61Wq9bhV4zEkjbsRKeeOd4LSE9+CT5o9pFhAo+A+pfJsixkGxwqK4z4S8LseMLNgxJrBE0tiJZU5WM2AqMXqh7BG20=; 4:aKuk6dbpsxawGQwUTDVYlrq+HzRnqwZdiH5KsIUBOYYl8u5IYuI193Oex27uMdveIxyDz+C5uW62DvygqECU7zaOFxwrz+4mCGpKdY6LjlokqJHWSCnzL/ahMpxKIhzVCB90/2bL5HslmwVb5xN3rq41MlJugWHmsfQR1dlHf64bDSGHmwQjlY4ejLPGoV6831MFl8Kht/LkeJsA5Gv8MDHrWJd+B3GMo/5PcuhOGYhYRNODrijwS7nqhSpwGdEZxyd8/te/inPUvPzdaNFwoLUy0P4VcCDXXltd6Sd/5PudW6kS2DHXsQoI/uecFqqY X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231023)(944510075)(944921075)(946801075)(946901075)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123563025)(20161123565025)(20161123556025)(20161123559100)(20161123561025)(201708071742011); SRVR:SN2PR03MB2368; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:SN2PR03MB2368; X-Forefront-PRVS: 054642504A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2368; 23:vVfqXRMS001OStsSbuauMa8VlcvoGbbJYnERL6fwD?= =?us-ascii?Q?tpH7tWNNEXKA13bY9fJbWed/gVmLKrwPAadxGyFqmQQlb1tJZnvfdCitZKOz?= =?us-ascii?Q?oiJ4VHFvPh/BHjofduZlCrCQTp9JtySwXclbJYLoa1yO6AqsSMGnSVVtDN3a?= =?us-ascii?Q?tHwF06Nl1lt276vmozQhBgoyAj+QNk/7VOeeqODpoQSBZtyF/bfjmpHIEqlb?= =?us-ascii?Q?VJVfzrKdx/sLbN/Yli13m4k+OQ5yQAEHwykqs5ss7BrcullP9Ys4ySp+EHdB?= =?us-ascii?Q?kffE4jcHVGqA2b4bAdOdO1XgVslLTKqjdOxAjK4adGTNLDiyKCGJCbE+qRx+?= =?us-ascii?Q?dvd7+6sE6ScTBvYJW74Kv1bgdzexKpgJiXgTTJqasePNtEbR6E0+GATCiF3t?= =?us-ascii?Q?H8WbZmkJC4oDQdd5A0lBk7ll1iEp40dDJ7eqQWvPbEOyyvODEHqevhotzZBu?= =?us-ascii?Q?tMB3XBZgeQG8SeqmRO8mCVPAgj9uMYdf0lHiQg99iAsI5xm8oTN5UEv40Qoi?= =?us-ascii?Q?qrlAG3TFbZhQuxiyqmcC0yfB43Ek90lLtcK4psCfNjGjdJ/0TAd0xtY2eubf?= =?us-ascii?Q?yNaRaCuCrdxH4UJuzkKmBGDhWMuCnoemoGqh9f0/zVnrdj6i2/EZpMucoVbx?= =?us-ascii?Q?MjCr1ZhfdTXJKX7QIGz+DDJRkpyQXtQsCA3XaKgm6dmX4s3ySaPcT3+V0LYC?= =?us-ascii?Q?5UQe9SlZG+s0VbGOmgg8eQG/xysitBMdmyipQtrc9EuqaAvBK8YOUu5x3W/D?= =?us-ascii?Q?iu05xDs5d34Um6ZHvhL+P6lqNp8CfbG7niDFMmaP9AeS9VzhT1GR/Ci2JEd/?= =?us-ascii?Q?ILztmSmWFsIZJ0OIxR5Ow3AhKi9hrmp+1b2EP9VzKrje8hW9KlI/TdnpOSe+?= =?us-ascii?Q?Wb2mFsloKuOQXXMy3TmooZzoCRdCX3dEigyfzP0NEVSkk+Qw12309zpOWvTA?= =?us-ascii?Q?86dFn3yT8TQEW4igABRLG8WLoXRwuj8z1Xrdxz/mYJCPU3K6D04xQ5C1bICQ?= =?us-ascii?Q?U1Rv52i0mXYMPTjnkDMf8S4KseywikESNYrar9zI/Sydouhr8yLCIi3ESk23?= =?us-ascii?Q?pMdEudEQVzruTeMW1t99Q/3kMbvXOf7bEl5w9NKi5ATXVi6vEVS3ESNzuk8x?= =?us-ascii?Q?Pp2sLEpleaNRVyhUUSRQh7J1Vw64e7J?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2368; 6:IF0HDf4Lm7scAPbaubvVsuuYcDwHHgSR7OqyA+GjPpAn1Z9UDskq2YP143KCb1SI588o8N4Ty/37dpLf9aU9dnr1EoYlUttCEj9vXvyitWtnoidYY9cl1Bj/aQK8MC/HN1g0tiU0atC6Rti6miENoSlo/+f91sVnKXjxDSeHmL3jITJUn/v7tFHZuRGH3KeDATYsQC3Z50JsGaIxhXCxam1ij5UOMWBZjY+GXYenKdFFDsf1Tu4PpAcSSJafI51ibcOALXuwBxKdfebnsmx76vJFbhQdKslhQCK21NA4fPxZ2I++rhWw+nQUML0LiU/dGoHaj/5rmfVCtLV3s6H5+HAqXGtq4gzlRz9ymVZMVOk=; 5:3dmK7TWVcMnMWujJniEnn8CIpdl77AlLM5MOHwZGyYu15xV+w7rh1DfNHeXm/PkwoPPAUeBOUvTrVQ1Vqgpj1HMz1TjhccJC6t6ICLRfstaMFNRSSkqOoj7sGzRIRgR23WutRjyaGTbSHAWJ7Sdsqi5CmWwOSGHkT6QG5uXxJh0=; 24:kFEM7yLddwcLJWKTHhrrJAFOb30gUr+FuUHPgZFqIITjmR+YzgGaAsATDM6JjLW2EMdp7CTF2GGznsJE+OGimzNhPzT1f4l0/YCFGGlgYjE=; 7:7sk+a8bHHYnq9gdQJiKlorgDjxP+kdQihFbfTQwPY5d8fL/eQlcHJF8k4oGSFb9jjrEvXNAHNc/oQrj1F9zor8eWiaDxjDYsJW8+KLJCQQNBQj9umK1GWy91jkyKcJamFvNnplGQgQ2qfBmtesZs2YTPP0lwjLRpdYr3irIpINjl0nPUD2XdTUBB0g7KQgjWIQZ73oVQI5G50HMuhlDZXeRXun3/Xc7wOVlVBKQ7ho2MuCvUN6osaqmXVEkD85Vs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2018 10:06:55.4631 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3e4977d0-b0b5-41d9-03e3-08d5567f8c3e X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2368 Subject: [PATCH edk2-platforms v2 2/2] LS1046 : Enable support of SATA controller 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: Mon, 08 Jan 2018 10:02:17 -0000 Content-Type: text/plain Enable support of SATA drives on ls1046 board. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Meenakshi Aggarwal --- Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc | 8 ++++++++ Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf | 12 ++++++++++++ .../NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf | 2 ++ .../NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c | 8 ++++++++ Silicon/NXP/LS1046A/LS1046A.dsc | 5 +++++ 5 files changed, 35 insertions(+) diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc index 9d2482b..93fc848 100644 --- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc +++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.dsc @@ -63,6 +63,13 @@ # gNxpQoriqLsTokenSpaceGuid.PcdI2cSlaveAddress|0x51 + # + # Errata Pcds + # + gNxpQoriqLsTokenSpaceGuid.PcdSataErratumA009185|TRUE + gNxpQoriqLsTokenSpaceGuid.PcdSataErratumA010554|TRUE + gNxpQoriqLsTokenSpaceGuid.PcdSataErratumA010635|TRUE + ################################################################################ # # Components Section - list of all EDK II Modules needed by this Platform @@ -71,3 +78,4 @@ [Components.common] edk2-platforms/Platform/NXP/Drivers/WatchDog/WatchDogDxe.inf edk2-platforms/Platform/NXP/Drivers/I2cDxe/I2cDxe.inf + edk2-platforms/Platform/NXP/Drivers/SataInitDxe/SataInitDxe.inf diff --git a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf index 169cef0..23b46ad 100644 --- a/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf +++ b/Platform/NXP/LS1046aRdbPkg/LS1046aRdbPkg.fdf @@ -142,6 +142,18 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf + # + # AHCI Support + # + INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf + INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf + INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + INF MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceDxe.inf + + INF edk2-platforms/Platform/NXP/Drivers/SataInitDxe/SataInitDxe.inf + # FAT filesystem + GPT/MBR partitioning # INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf diff --git a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf index 13a0ffb..002294e 100644 --- a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf +++ b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/ArmPlatformLib.inf @@ -68,3 +68,5 @@ gNxpQoriqLsTokenSpaceGuid.PcdDram3Size gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionBaseAddr gNxpQoriqLsTokenSpaceGuid.PcdQspiRegionSize + gNxpQoriqLsTokenSpaceGuid.PcdDcsrBaseAddr + gNxpQoriqLsTokenSpaceGuid.PcdDcsrSize diff --git a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c index 7022528..4b04ff5 100644 --- a/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c +++ b/Platform/NXP/LS1046aRdbPkg/Library/PlatformLib/NxpQoriqLsMem.c @@ -49,6 +49,8 @@ #define DRAM3_SIZE FixedPcdGet64 (PcdDram3Size) #define QSPI_REGION_BASE_ADDR FixedPcdGet64 (PcdQspiRegionBaseAddr) #define QSPI_REGION_SIZE FixedPcdGet64 (PcdQspiRegionSize) +#define DCSR_BASE_ADDR FixedPcdGet64 (PcdDcsrBaseAddr) +#define DCSR_SIZE FixedPcdGet64 (PcdDcsrSize) /** @@ -169,6 +171,12 @@ ArmPlatformGetVirtualMemoryMap ( VirtualMemoryTable[Index].Length = QSPI_REGION_SIZE; VirtualMemoryTable[Index].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_UNCACHED_UNBUFFERED; + // DCSR Space + VirtualMemoryTable[++Index].PhysicalBase = DCSR_BASE_ADDR; + VirtualMemoryTable[Index].VirtualBase = DCSR_BASE_ADDR; + VirtualMemoryTable[Index].Length = DCSR_SIZE; + VirtualMemoryTable[Index].Attributes = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE; + // End of Table VirtualMemoryTable[++Index].PhysicalBase = 0; VirtualMemoryTable[Index].VirtualBase = 0; diff --git a/Silicon/NXP/LS1046A/LS1046A.dsc b/Silicon/NXP/LS1046A/LS1046A.dsc index 4e7230a..33c57ad 100644 --- a/Silicon/NXP/LS1046A/LS1046A.dsc +++ b/Silicon/NXP/LS1046A/LS1046A.dsc @@ -74,5 +74,10 @@ gNxpQoriqLsTokenSpaceGuid.PcdI2c2BaseAddr|0x021A0000 gNxpQoriqLsTokenSpaceGuid.PcdI2c3BaseAddr|0x021B0000 gNxpQoriqLsTokenSpaceGuid.PcdNumI2cController|4 + gNxpQoriqLsTokenSpaceGuid.PcdDcsrBaseAddr|0x20000000 + gNxpQoriqLsTokenSpaceGuid.PcdDcsrSize|0x04000000 + gNxpQoriqLsTokenSpaceGuid.PcdSataBaseAddr|0x3200000 + gNxpQoriqLsTokenSpaceGuid.PcdSataSize|0x10000 + gNxpQoriqLsTokenSpaceGuid.PcdNumSataController|0x1 ## -- 1.9.1