From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c06::243; helo=mail-io0-x243.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io0-x243.google.com (mail-io0-x243.google.com [IPv6:2607:f8b0:4001:c06::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 992EB22227587 for ; Mon, 8 Jan 2018 07:06:50 -0800 (PST) Received: by mail-io0-x243.google.com with SMTP id i143so14277481ioa.3 for ; Mon, 08 Jan 2018 07:12:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=/w1osieKinlMimy0NlZECqbAxvSHXz9Fcg+eMPLQtAg=; b=USwPSPSUVxlP1czJ2Ja1bMdNe1wZkvqgOcq3vYswecttpfOdKCR8+6Nc/ir2BPw+3/ SFh8/+M3tOJsYoYR/FEwY5HeSXfah6ITC02HNjAnmxDlZco8Ry0aeDhBC2Hv4rhbGiPU OaNQcwU0l0p/C3aKlYw02bmnKslf4Bq0k5QzE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=/w1osieKinlMimy0NlZECqbAxvSHXz9Fcg+eMPLQtAg=; b=c7HyNeXoLGaIhj3CArkFWPeyyPmw7hW11w/kpMniiin4vkRfJUDA7P7jRj6slwc+U1 Bt159p3zl6I2ZLuH9SmH/4erzOOm7xMFJxPzUeI/gvH5tkfJtqckiausmxmkecLHmL3+ M6gFQiU+irpYl+K7c3an9q271mVUpCzqzvtQvuw+4Xch9KmXUi+7M32ruuQemzjpx0ow wvLb0nQ+J8GDiX2atzhaRPZcQZxWwnX7osO0GQr3ndjJS0cARdKBVPvXtjuaemqTTKw7 9yVoyOTujKZYhWJtBpmERZ8W28mEzJjxF3NMJ4dPQVDNBCHONPQA/KM0eYlNCED1ShOl q4wg== X-Gm-Message-State: AKGB3mLfMQ5uKAATdOyQaLmQUIJD4cZIxkGMXTNZoACpsZLpXTlmjytd e6oO59XaG/89tJv95UHDklBdWB/cXF//TLer6PApLg== X-Google-Smtp-Source: ACJfBosQ6+THrtkWbQb6cIorjWkf0v/c0eqGaz2hwQjgr40ZeUsrHbGr1LzOEtphBfr3BS66md5vmuuymwW5xZY11JM= X-Received: by 10.36.192.10 with SMTP id u10mr11879362itf.73.1515424319384; Mon, 08 Jan 2018 07:11:59 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.37.197 with HTTP; Mon, 8 Jan 2018 07:11:58 -0800 (PST) In-Reply-To: <1515426912-13557-3-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> <1515426912-13557-3-git-send-email-meenakshi.aggarwal@nxp.com> From: Ard Biesheuvel Date: Mon, 8 Jan 2018 15:11:58 +0000 Message-ID: To: Meenakshi Aggarwal Cc: Leif Lindholm , "Kinney, Michael D" , "edk2-devel@lists.01.org" , Udit Kumar , Varun Sethi Subject: Re: [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 15:06:51 -0000 Content-Type: text/plain; charset="UTF-8" On 8 January 2018 at 15:55, Meenakshi Aggarwal wrote: > 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 This looks wrong to me. Your .dsc/.fdf files should not contain these edk2-platforms prefixes. Instead, you should set your PACKAGES_PATH correctly to include your edk2-platforms directory. > 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 > + Same here > # 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 >