EmbeddedPkg: Implement NorFlashInfoLib

The SPI NOR flash drivers which base on ArmPlatformPkg's
NorFlashDxe usually make use of static declarations of the
flash instances with their type and parameters. As a result
it implies hardcoding the exact way of flash handling, not to
mention the code does not look very nice. Much better solution
would be obtaining the flash ID and hence its description
in runtime.

JEDEC compliant SPI NOR devices allow to obtain their IDs with
READ_ID command (0x9f), which should return the vendor ID byte,
followed by 2 to 4 following device ID bytes. Use this capability
for implementing a NorFlashInfoLib that gives an access to the
NOR flash description data, such as name, page size, sector
(block) size and others, of more than 50 different models.
The new library user should pass an output array from issuing
READ_ID command to the NorFlashGetInfo () routine - if the
match is found, an allocated (optionally for RT) pool with
the flash description copy will be returned.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index cb07d3ece685cd6d5d531c2802c95d7059cd9143..af9b221f4f076029d3311e9c2ed3b13cbb98d23b 100644 (file)
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -45,6 +45,7 @@
   EblNetworkLib|Include/Library/EblNetworkLib.h\r
   GdbSerialLib|Include/Library/GdbSerialLib.h\r
   DebugAgentTimerLib|Include/Library/DebugAgentTimerLib.h\r
   EblNetworkLib|Include/Library/EblNetworkLib.h\r
   GdbSerialLib|Include/Library/GdbSerialLib.h\r
   DebugAgentTimerLib|Include/Library/DebugAgentTimerLib.h\r

+  NorFlashInfoLib|Include/Library/NorFlashInfoLib.h\r

 \r
   DtPlatformDtbLoaderLib|Include/Library/DtPlatformDtbLoaderLib.h\r
 \r
 \r
   DtPlatformDtbLoaderLib|Include/Library/DtPlatformDtbLoaderLib.h\r
 \r

diff --git a/EmbeddedPkg/Include/Library/NorFlashInfoLib.h b/EmbeddedPkg/Include/Library/NorFlashInfoLib.h
new file mode 100644 (file)
index 0000000..c376110
--- /dev/null
+++ b/EmbeddedPkg/Include/Library/NorFlashInfoLib.h
@@ -0,0 +1,96 @@
+/** @file\r
+*\r
+*  Copyright (c) 2017 Marvell International Ltd.\r
+*\r
+*  This program and the accompanying materials\r
+*  are licensed and made available under the terms and conditions of the BSD License\r
+*  which accompanies this distribution.  The full text of the license may be found at\r
+*  http://opensource.org/licenses/bsd-license.php\r
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+*\r
+**/\r
+\r
+#ifndef __NOR_FLASH_ID_LIB_H__\r
+#define __NOR_FLASH_ID_LIB_H__\r
+\r
+#include <Uefi/UefiBaseType.h>\r
+\r
+#define NOR_FLASH_MAX_ID_LEN    6\r
+\r
+typedef struct {\r
+  /* Device name */\r
+  UINT16 *Name;\r
+\r
+  /*\r
+   * JEDEC ID\r
+   */\r
+  UINT8  Id[NOR_FLASH_MAX_ID_LEN];\r
+  UINT8  IdLen;\r
+\r
+  UINT16 PageSize;\r
+\r
+  /*\r
+   * Below parameters can be referred as BlockSize\r
+   * and BlockCount, when treating the NorFlash as\r
+   * block device.\r
+   */\r
+  UINT32 SectorSize;\r
+  UINT32 SectorCount;\r
+\r
+  UINT16 Flags;\r
+#define NOR_FLASH_ERASE_4K     (1 << 0)  /* Use 4 KB erase blocks and CMD_ERASE_4K */\r
+#define NOR_FLASH_ERASE_32K    (1 << 1)  /* Use 32 KB erase blocks and CMD_ERASE_32K */\r
+#define NOR_FLASH_WRITE_FSR    (1 << 2)  /* Use flag status register for write */\r
+#define NOR_FLASH_4B_ADDR      (1 << 3)  /* Use 4B addressing */\r
+} NOR_FLASH_INFO;\r
+\r
+/* Vendor IDs */\r
+#define NOR_FLASH_ID_ATMEL      0x1f\r
+#define NOR_FLASH_ID_EON        0x1c\r
+#define NOR_FLASH_ID_GIGADEVICE 0xc8\r
+#define NOR_FLASH_ID_ISSI       0x9d\r
+#define NOR_FLASH_ID_MACRONIX   0xc2\r
+#define NOR_FLASH_ID_SPANSION   0x01\r
+#define NOR_FLASH_ID_STMICRO    0x20\r
+#define NOR_FLASH_ID_SST        0xbf\r
+#define NOR_FLASH_ID_WINDBOND   0xef\r
+\r
+/**\r
+  Return an allocated copy pool of the NOR flash information structure.\r
+\r
+  @param[in]       Id                 Pointer to an array with JEDEC ID obtained\r
+                                      from the NOR flash with READ_ID command\r
+                                      (0x9f)\r
+  @param[in out]   FlashInfo          Pointer to NOR flash information structure\r
+  @param[in]       AllocateForRuntime A flag specifying a type of a copy pool\r
+                                      allocation (TRUE for runtime, FALSE for\r
+                                      normal)\r
+\r
+  @retval       EFI_SUCCESS           Operation completed successfully\r
+  @retval       EFI_NOT_FOUND         No matching entry in NOR ID table found\r
+  @retval       EFI_OUT_OF_RESOURCES  No pool memory available\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+NorFlashGetInfo (\r
+  IN UINT8                *Id,\r
+  IN OUT NOR_FLASH_INFO  **FlashInfo,\r
+  IN BOOLEAN               AllocateForRuntime\r
+  );\r
+\r
+/**\r
+  Print NOR flash information basing on data stored in\r
+  the NOR_FLASH_INFO structure.\r
+\r
+  @param[in]       FlashInfo          Pointer to NOR flash information structure\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+NorFlashPrintInfo (\r
+  IN     NOR_FLASH_INFO  *Info\r
+  );\r
+#endif\r

diff --git a/EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.c b/EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.c
new file mode 100644 (file)
index 0000000..750f37a
--- /dev/null
+++ b/EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.c
@@ -0,0 +1,225 @@
+/** @file\r
+*\r
+*  Copyright (c) 2017 Marvell International Ltd.\r
+*\r
+*  This program and the accompanying materials\r
+*  are licensed and made available under the terms and conditions of the BSD License\r
+*  which accompanies this distribution.  The full text of the license may be found at\r
+*  http://opensource.org/licenses/bsd-license.php\r
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+*\r
+**/\r
+\r
+#include <PiDxe.h>\r
+\r
+#include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+#include <Library/DebugLib.h>\r
+#include <Library/DxeServicesLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
+#include <Library/NorFlashInfoLib.h>\r
+\r
+STATIC CONST NOR_FLASH_INFO NorFlashIds[] = {\r
+  /* ATMEL */\r
+  {L"at45db011d",     {0x1f, 0x22, 0x00}, 3, 256, 64 * 1024,     4, NOR_FLASH_ERASE_4K},\r
+  {L"at45db021d",     {0x1f, 0x23, 0x00}, 3, 256, 64 * 1024,     8, NOR_FLASH_ERASE_4K},\r
+  {L"at45db041d",     {0x1f, 0x24, 0x00}, 3, 256, 64 * 1024,     8, NOR_FLASH_ERASE_4K},\r
+  {L"at45db081d",     {0x1f, 0x25, 0x00}, 3, 256, 64 * 1024,    16, NOR_FLASH_ERASE_4K},\r
+  {L"at45db161d",     {0x1f, 0x26, 0x00}, 3, 256, 64 * 1024,    32, NOR_FLASH_ERASE_4K},\r
+  {L"at45db321d",     {0x1f, 0x27, 0x00}, 3, 256, 64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"at45db641d",     {0x1f, 0x28, 0x00}, 3, 256, 64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"at25df321a",     {0x1f, 0x47, 0x01}, 3, 256, 64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"at25df321",      {0x1f, 0x47, 0x00}, 3, 256, 64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"at26df081a",     {0x1f, 0x45, 0x01}, 3, 256, 64 * 1024,    16, NOR_FLASH_ERASE_4K},\r
+  /* EON */\r
+  {L"en25q32b",       {0x1c, 0x30, 0x16}, 3, 256, 64 * 1024,    64, 0},\r
+  {L"en25q64",        {0x1c, 0x30, 0x17}, 3, 256, 64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"en25q128b",      {0x1c, 0x30, 0x18}, 3, 256, 64 * 1024,   256, 0},\r
+  {L"en25s64",        {0x1c, 0x38, 0x17}, 3, 256, 64 * 1024,   128, 0},\r
+  /* GIGADEVICE */\r
+  {L"gd25q64b",       {0xc8, 0x40, 0x17}, 3, 256, 64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"gd25lq32",       {0xc8, 0x60, 0x16}, 3, 256, 64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  /* ISSI */\r
+  {L"is25lp032",      {0x9d, 0x60, 0x16}, 3, 256, 64 * 1024,    64, 0},\r
+  {L"is25lp064",      {0x9d, 0x60, 0x17}, 3, 256, 64 * 1024,   128, 0},\r
+  {L"is25lp128",      {0x9d, 0x60, 0x18}, 3, 256, 64 * 1024,   256, 0},\r
+  /* MACRONIX */\r
+  {L"mx25l2006e",     {0xc2, 0x20, 0x12}, 3, 256, 64 * 1024,     4, 0},\r
+  {L"mx25l4005",      {0xc2, 0x20, 0x13}, 3, 256, 64 * 1024,     8, 0},\r
+  {L"mx25l8005",      {0xc2, 0x20, 0x14}, 3, 256, 64 * 1024,    16, 0},\r
+  {L"mx25l1605d",     {0xc2, 0x20, 0x15}, 3, 256, 64 * 1024,    32, 0},\r
+  {L"mx25l3205d",     {0xc2, 0x20, 0x16}, 3, 256, 64 * 1024,    64, 0},\r
+  {L"mx25l6405d",     {0xc2, 0x20, 0x17}, 3, 256, 64 * 1024,   128, 0},\r
+  {L"mx25l12805",     {0xc2, 0x20, 0x18}, 3, 256, 64 * 1024,   256, 0},\r
+  {L"mx25l25635f",    {0xc2, 0x20, 0x19}, 3, 256, 64 * 1024,   512, 0},\r
+  {L"mx25l51235f",    {0xc2, 0x20, 0x1a}, 3, 256, 64 * 1024,  1024, 0},\r
+  {L"mx25l12855e",    {0xc2, 0x26, 0x18}, 3, 256, 64 * 1024,   256, 0},\r
+  {L"mx66u51235f",    {0xc2, 0x25, 0x3a}, 3, 256, 64 * 1024,  1024, 0},\r
+  {L"mx66l1g45g",     {0xc2, 0x20, 0x1b}, 3, 256, 64 * 1024,  2048, 0},\r
+  /* SPANSION */\r
+  {L"s25fl008a",      {0x01, 0x02, 0x13}, 3, 256, 64 * 1024,    16, 0},\r
+  {L"s25fl016a",      {0x01, 0x02, 0x14}, 3, 256, 64 * 1024,    32, 0},\r
+  {L"s25fl032a",      {0x01, 0x02, 0x15}, 3, 256, 64 * 1024,    64, 0},\r
+  {L"s25fl064a",      {0x01, 0x02, 0x16}, 3, 256, 64 * 1024,   128, 0},\r
+  {L"s25fl116k",      {0x01, 0x40, 0x15}, 3, 256, 64 * 1024,   128, 0},\r
+  {L"s25fl164k",      {0x01, 0x40, 0x17, 0x01, 0x40}, 5, 256,  64 * 1024,   128, 0},\r
+  {L"s25fl128p_256k", {0x01, 0x20, 0x18, 0x03, 0x00}, 5, 256, 256 * 1024,    64, 0},\r
+  {L"s25fl128p_64k",  {0x01, 0x20, 0x18, 0x03, 0x01}, 5, 256,  64 * 1024,   256, 0},\r
+  {L"s25fl032p",      {0x01, 0x02, 0x15, 0x4d, 0x00}, 5, 256,  64 * 1024,    64, 0},\r
+  {L"s25fl064p",      {0x01, 0x02, 0x16, 0x4d, 0x00}, 5, 256,  64 * 1024,   128, 0},\r
+  {L"s25fl128s_256k", {0x01, 0x20, 0x18, 0x4d, 0x00}, 5, 256, 256 * 1024,    64, 0},\r
+  {L"s25fl128s_64k",  {0x01, 0x20, 0x18, 0x4d, 0x01}, 5, 256,  64 * 1024,   256, 0},\r
+  {L"s25fl256s_256k", {0x01, 0x02, 0x19, 0x4d, 0x00}, 5, 256, 256 * 1024,   128, 0},\r
+  {L"s25fl256s_64k",  {0x01, 0x02, 0x19, 0x4d, 0x01}, 5, 256,  64 * 1024,   512, 0},\r
+  {L"s25fl512s_256k", {0x01, 0x02, 0x20, 0x4d, 0x00}, 5, 256, 256 * 1024,   256, 0},\r
+  {L"s25fl512s_64k",  {0x01, 0x02, 0x20, 0x4d, 0x01}, 5, 256,  64 * 1024,  1024, 0},\r
+  {L"s25fl512s_512k", {0x01, 0x02, 0x20, 0x4f, 0x00}, 5, 256, 256 * 1024,   256, 0},\r
+  /* STMICRO */\r
+  {L"m25p10",         {0x20, 0x20, 0x11}, 3, 256, 32 * 1024,     4, 0},\r
+  {L"m25p20",         {0x20, 0x20, 0x12}, 3, 256, 64 * 1024,     4, 0},\r
+  {L"m25p40",         {0x20, 0x20, 0x13}, 3, 256, 64 * 1024,     8, 0},\r
+  {L"m25p80",         {0x20, 0x20, 0x14}, 3, 256, 64 * 1024,    16, 0},\r
+  {L"m25p16",         {0x20, 0x20, 0x15}, 3, 256, 64 * 1024,    32, 0},\r
+  {L"m25pE16",        {0x20, 0x80, 0x15, 0x10, 0x00}, 5, 256, 64 * 1024, 32, 0},\r
+  {L"m25pX16",        {0x20, 0x71, 0x15, 0x10, 0x00}, 5, 256, 64 * 1024, 32, 0},\r
+  {L"m25p32",         {0x20, 0x20, 0x16}, 3, 256,  64 * 1024,    64, 0},\r
+  {L"m25p64",         {0x20, 0x20, 0x17}, 3, 256,  64 * 1024,   128, 0},\r
+  {L"m25p128",        {0x20, 0x20, 0x18}, 3, 256, 256 * 1024,    64, 0},\r
+  {L"m25pX64",        {0x20, 0x71, 0x17}, 3, 256,  64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"n25q016a",       {0x20, 0xbb, 0x15}, 3, 256,  64 * 1024,    32, NOR_FLASH_ERASE_4K},\r
+  {L"n25q32",         {0x20, 0xba, 0x16}, 3, 256,  64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"n25q32a",        {0x20, 0xbb, 0x16}, 3, 256,  64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"n25q64",         {0x20, 0xba, 0x17}, 3, 256,  64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"n25q64a",        {0x20, 0xbb, 0x17}, 3, 256,  64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"n25q128",        {0x20, 0xba, 0x18}, 3, 256,  64 * 1024,   256, 0},\r
+  {L"n25q128a",       {0x20, 0xbb, 0x18}, 3, 256,  64 * 1024,   256, 0},\r
+  {L"n25q256",        {0x20, 0xba, 0x19}, 3, 256,  64 * 1024,   512, NOR_FLASH_ERASE_4K},\r
+  {L"n25q256a",       {0x20, 0xbb, 0x19}, 3, 256,  64 * 1024,   512, NOR_FLASH_ERASE_4K},\r
+  {L"n25q512",        {0x20, 0xba, 0x20}, 3, 256,  64 * 1024,  1024, NOR_FLASH_WRITE_FSR | NOR_FLASH_ERASE_4K},\r
+  {L"n25q512a",       {0x20, 0xbb, 0x20}, 3, 256,  64 * 1024,  1024, NOR_FLASH_WRITE_FSR | NOR_FLASH_ERASE_4K},\r
+  {L"n25q1024",       {0x20, 0xba, 0x21}, 3, 256,  64 * 1024,  2048, NOR_FLASH_WRITE_FSR | NOR_FLASH_ERASE_4K},\r
+  {L"n25q1024a",      {0x20, 0xbb, 0x21}, 3, 256,  64 * 1024,  2048, NOR_FLASH_WRITE_FSR | NOR_FLASH_ERASE_4K},\r
+  {L"mt25qu02g",      {0x20, 0xbb, 0x22}, 3, 256,  64 * 1024,  4096, NOR_FLASH_WRITE_FSR | NOR_FLASH_ERASE_4K},\r
+  {L"mt25ql02g",      {0x20, 0xba, 0x22}, 3, 256,  64 * 1024,  4096, NOR_FLASH_WRITE_FSR | NOR_FLASH_ERASE_4K},\r
+  /* SST */\r
+  {L"sst25vf040b",    {0xbf, 0x25, 0x8d}, 3, 256,  64 * 1024,     8, NOR_FLASH_ERASE_4K},\r
+  {L"sst25vf080b",    {0xbf, 0x25, 0x8e}, 3, 256,  64 * 1024,    16, NOR_FLASH_ERASE_4K},\r
+  {L"sst25vf016b",    {0xbf, 0x25, 0x41}, 3, 256,  64 * 1024,    32, NOR_FLASH_ERASE_4K},\r
+  {L"sst25vf032b",    {0xbf, 0x25, 0x4a}, 3, 256,  64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"sst25vf064c",    {0xbf, 0x25, 0x4b}, 3, 256,  64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"sst25wf512",     {0xbf, 0x25, 0x01}, 3, 256,  64 * 1024,     1, NOR_FLASH_ERASE_4K},\r
+  {L"sst25wf010",     {0xbf, 0x25, 0x02}, 3, 256,  64 * 1024,     2, NOR_FLASH_ERASE_4K},\r
+  {L"sst25wf020",     {0xbf, 0x25, 0x03}, 3, 256,  64 * 1024,     4, NOR_FLASH_ERASE_4K},\r
+  {L"sst25wf040",     {0xbf, 0x25, 0x04}, 3, 256,  64 * 1024,     8, NOR_FLASH_ERASE_4K},\r
+  {L"sst25wf040b",    {0x62, 0x16, 0x13}, 3, 256,  64 * 1024,     8, NOR_FLASH_ERASE_4K},\r
+  {L"sst25wf080",     {0xbf, 0x25, 0x05}, 3, 256,  64 * 1024,    16, NOR_FLASH_ERASE_4K},\r
+  /* WINBOND */\r
+  {L"w25p80",         {0xef, 0x20, 0x14}, 3, 256,  64 * 1024,    16, 0},\r
+  {L"w25p16",         {0xef, 0x20, 0x15}, 3, 256,  64 * 1024,    32, 0},\r
+  {L"w25p32",         {0xef, 0x20, 0x16}, 3, 256,  64 * 1024,    64, 0},\r
+  {L"w25x40",         {0xef, 0x30, 0x13}, 3, 256,  64 * 1024,     8, NOR_FLASH_ERASE_4K},\r
+  {L"w25x16",         {0xef, 0x30, 0x15}, 3, 256,  64 * 1024,    32, NOR_FLASH_ERASE_4K},\r
+  {L"w25x32",         {0xef, 0x30, 0x16}, 3, 256,  64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"w25x64",         {0xef, 0x30, 0x17}, 3, 256,  64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"w25q80bl",       {0xef, 0x40, 0x14}, 3, 256,  64 * 1024,    16, NOR_FLASH_ERASE_4K},\r
+  {L"w25q16cl",       {0xef, 0x40, 0x15}, 3, 256,  64 * 1024,    32, NOR_FLASH_ERASE_4K},\r
+  {L"w25q32bv",       {0xef, 0x40, 0x16}, 3, 256,  64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"w25q64cv",       {0xef, 0x40, 0x17}, 3, 256,  64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"w25q128bv",      {0xef, 0x40, 0x18}, 3, 256,  64 * 1024,   256, NOR_FLASH_ERASE_4K},\r
+  {L"w25q256",        {0xef, 0x40, 0x19}, 3, 256,  64 * 1024,   512, NOR_FLASH_ERASE_4K},\r
+  {L"w25q80bw",       {0xef, 0x50, 0x14}, 3, 256,  64 * 1024,    16, NOR_FLASH_ERASE_4K},\r
+  {L"w25q16dw",       {0xef, 0x60, 0x15}, 3, 256,  64 * 1024,    32, NOR_FLASH_ERASE_4K},\r
+  {L"w25q32dw",       {0xef, 0x60, 0x16}, 3, 256,  64 * 1024,    64, NOR_FLASH_ERASE_4K},\r
+  {L"w25q64dw",       {0xef, 0x60, 0x17}, 3, 256,  64 * 1024,   128, NOR_FLASH_ERASE_4K},\r
+  {L"w25q128fw",      {0xef, 0x60, 0x18}, 3, 256,  64 * 1024,   256, NOR_FLASH_ERASE_4K},\r
+  {},  /* Empty entry to terminate the list */\r
+};\r
+\r
+/**\r
+  Return an allocated copy pool of the NOR flash information structure.\r
+\r
+  @param[in]       Id                 Pointer to an array with JEDEC ID obtained\r
+                                      from the NOR flash with READ_ID command\r
+                                      (0x9f)\r
+  @param[in out]   FlashInfo          Pointer to NOR flash information structure\r
+  @param[in]       AllocateForRuntime A flag specifying a type of a copy pool\r
+                                      allocation (TRUE for runtime, FALSE for\r
+                                      normal)\r
+\r
+  @retval       EFI_SUCCESS           Operation completed successfully\r
+  @retval       EFI_NOT_FOUND         No matching entry in NOR ID table found\r
+  @retval       EFI_OUT_OF_RESOURCES  No pool memory available\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+NorFlashGetInfo (\r
+  IN UINT8                *Id,\r
+  IN OUT NOR_FLASH_INFO  **FlashInfo,\r
+  IN BOOLEAN               AllocateForRuntime\r
+  )\r
+{\r
+  CONST NOR_FLASH_INFO *TmpInfo;\r
+\r
+  /*\r
+   * Iterate over NorFlashIds table, in order to find matching entry.\r
+   */\r
+  TmpInfo = NorFlashIds;\r
+  for (; TmpInfo->Name != NULL; TmpInfo++) {\r
+    if (CompareMem (TmpInfo->Id, Id, TmpInfo->IdLen) == 0) {\r
+      break;\r
+    }\r
+  }\r
+\r
+  /*\r
+   * Matching entry was not found.\r
+   */\r
+  if (TmpInfo->Name == NULL) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
+  /*\r
+   * Allocate and copy NOR flash information structure.\r
+   */\r
+  if (AllocateForRuntime) {\r
+    *FlashInfo = AllocateRuntimeCopyPool (sizeof (NOR_FLASH_INFO), TmpInfo);\r
+  } else {\r
+    *FlashInfo = AllocateCopyPool (sizeof (NOR_FLASH_INFO), TmpInfo);\r
+  }\r
+  if (FlashInfo == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
+  }\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+/**\r
+  Print NOR flash information basing on data stored in\r
+  the NOR_FLASH_INFO structure.\r
+\r
+  @param[in]       FlashInfo          Pointer to NOR flash information structure\r
+\r
+**/\r
+VOID\r
+EFIAPI\r
+NorFlashPrintInfo (\r
+  IN     NOR_FLASH_INFO  *Info\r
+  )\r
+{\r
+  UINTN EraseSize;\r
+\r
+  if (Info->Flags & NOR_FLASH_ERASE_4K) {\r
+    EraseSize = SIZE_4KB;\r
+  } else {\r
+    EraseSize = Info->SectorSize;\r
+  }\r
+\r
+  DEBUG ((DEBUG_ERROR,\r
+    "Detected %s SPI NOR flash with page size %d B, erase size %d KB, total %d MB\n",\r
+    Info->Name,\r
+    Info->PageSize,\r
+    EraseSize / 1024,\r
+    (Info->SectorSize * Info->SectorCount) / 1024 / 1024));\r
+}\r

diff --git a/EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf b/EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf
new file mode 100644 (file)
index 0000000..b4b3324
--- /dev/null
+++ b/EmbeddedPkg/Library/NorFlashInfoLib/NorFlashInfoLib.inf
@@ -0,0 +1,34 @@
+/** @file\r
+*\r
+*  Copyright (c) 2017 Marvell International Ltd.\r
+*\r
+*  This program and the accompanying materials\r
+*  are licensed and made available under the terms and conditions of the BSD License\r
+*  which accompanies this distribution.  The full text of the license may be found at\r
+*  http://opensource.org/licenses/bsd-license.php\r
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+*\r
+**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010019\r
+  BASE_NAME                      = NorFlashInfoLib\r
+  FILE_GUID                      = 6b639c7e-9b53-4e9f-89a3-2e711729709c\r
+  MODULE_TYPE                    = DXE_DRIVER\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = NorFlashInfoLib|DXE_DRIVER DXE_RUNTIME_DRIVER UEFI_APPLICATION\r
+\r
+[Sources]\r
+  NorFlashInfoLib.c\r
+\r
+[Packages]\r
+  EmbeddedPkg/EmbeddedPkg.dec\r
+  MdePkg/MdePkg.dec\r
+\r
+[LibraryClasses]\r
+  BaseLib\r
+  DebugLib\r
+  DxeServicesLib\r
+  MemoryAllocationLib\r