From: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
To: <ard.biesheuvel@linaro.org>, <leif.lindholm@linaro.org>,
<michael.d.kinney@intel.com>, <edk2-devel@lists.01.org>
Subject: [PATCH edk2-platforms v2 2/2] LS1046 : Enable support of SATA controller
Date: Mon, 8 Jan 2018 21:25:12 +0530 [thread overview]
Message-ID: <1515426912-13557-3-git-send-email-meenakshi.aggarwal@nxp.com> (raw)
In-Reply-To: <1515426912-13557-1-git-send-email-meenakshi.aggarwal@nxp.com>
Enable support of SATA drives on ls1046 board.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Meenakshi Aggarwal <meenakshi.aggarwal@nxp.com>
---
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
next prev parent reply other threads:[~2018-01-08 10:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 12:16 [PATCH edk2-platforms 0/3] Cover letter:Pci Emulation and SATA support Meenakshi Aggarwal
2017-12-22 12:16 ` [PATCH edk2-platforms 1/3] USB: Added Support of DWC3 USB controller Meenakshi Aggarwal
2017-12-22 12:16 ` [PATCH edk2-platforms 2/3] PciEmulation : Add support for Pci Emulation layer Meenakshi Aggarwal
2017-12-22 12:16 ` [PATCH edk2-platforms 3/3] SATA : Added SATA controller initialization driver Meenakshi Aggarwal
2017-12-22 15:31 ` [PATCH edk2-platforms 0/3] Cover letter:Pci Emulation and SATA support Ard Biesheuvel
2018-01-04 11:27 ` Meenakshi Aggarwal
2018-01-04 11:33 ` Ard Biesheuvel
2018-01-04 12:56 ` Meenakshi Aggarwal
2018-01-05 6:47 ` Meenakshi Aggarwal
2018-01-05 7:40 ` Ard Biesheuvel
2018-01-05 8:53 ` Meenakshi Aggarwal
2018-01-05 9:16 ` Ard Biesheuvel
2018-01-08 15:55 ` [PATCH edk2-platforms v2 0/2] Cover letter:SATA controller support Meenakshi Aggarwal
2018-01-08 15:55 ` [PATCH edk2-platforms v2 1/2] SATA : Added SATA controller driver Meenakshi Aggarwal
2018-01-08 15:05 ` Ard Biesheuvel
2018-01-09 4:50 ` Meenakshi Aggarwal
2018-01-09 8:26 ` Ard Biesheuvel
2018-01-08 15:55 ` Meenakshi Aggarwal [this message]
2018-01-08 15:11 ` [PATCH edk2-platforms v2 2/2] LS1046 : Enable support of SATA controller Ard Biesheuvel
2018-01-09 4:37 ` Meenakshi Aggarwal
2018-01-09 8:27 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515426912-13557-3-git-send-email-meenakshi.aggarwal@nxp.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox