MdeModulePkg/NvmExpressDxe: Fix MS toolchain /Od 32bit build failure

Note NVME_ACQ & NVME_ASQ internal data structure are changed to make
build pass.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19632 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
index 6cb2f92e8dded76b4f42f0687e4094f09b7b56c8..2af2df7549b9a98d98dfce774943c6266e393cdc 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressBlockIo.c
@@ -2,7 +2,7 @@
   NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
   NVM Express specification.\r
 \r
-  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\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
@@ -63,7 +63,7 @@ ReadSectors (
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket.NvmeCmd->Cdw11 = (UINT32)(Lba >> 32);\r
+  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
   CommandPacket.NvmeCmd->Cdw12 = (Blocks - 1) & 0xFFFF;\r
 \r
   CommandPacket.NvmeCmd->Flags = CDW10_VALID | CDW11_VALID | CDW12_VALID;\r
@@ -126,7 +126,7 @@ WriteSectors (
   CommandPacket.QueueType      = NVME_IO_QUEUE;\r
 \r
   CommandPacket.NvmeCmd->Cdw10 = (UINT32)Lba;\r
-  CommandPacket.NvmeCmd->Cdw11 = (UINT32)(Lba >> 32);\r
+  CommandPacket.NvmeCmd->Cdw11 = (UINT32)RShiftU64(Lba, 32);\r
   CommandPacket.NvmeCmd->Cdw12 = (Blocks - 1) & 0xFFFF;\r
 \r
   CommandPacket.MetadataBuffer = NULL;\r

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index f6b6288f652f1053511debe25eb52166bdb2ff66..60b06b45e6a3fef25ff32279b162d435fe03f93c 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
@@ -2,7 +2,7 @@
   NvmExpressDxe driver is used to manage non-volatile memory subsystem which follows\r
   NVM Express specification.\r
 \r
-  Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2013 - 2016, Intel Corporation. All rights reserved.<BR>\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
@@ -328,7 +328,7 @@ WriteNvmeAdminSubmissionQueueBaseAddress (
     return Status;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Asq.Asqb: %lx\n", Asq->Asqb));\r
+  DEBUG ((EFI_D_INFO, "Asq: %lx\n", *Asq));\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -408,7 +408,7 @@ WriteNvmeAdminCompletionQueueBaseAddress (
     return Status;\r
   }\r
 \r
-  DEBUG ((EFI_D_INFO, "Acq.Acqb: %lxh\n", Acq->Acqb));\r
+  DEBUG ((EFI_D_INFO, "Acq: %lxh\n", *Acq));\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -861,14 +861,12 @@ NvmeControllerInit (
   //\r
   // Address of admin submission queue.\r
   //\r
-  Asq.Rsvd1 = 0;\r
-  Asq.Asqb  = (UINT64)(UINTN)(Private->BufferPciAddr) >> 12;\r
+  Asq = (UINT64)(UINTN)(Private->BufferPciAddr) & ~0xFFF;\r
 \r
   //\r
   // Address of admin completion queue.\r
   //\r
-  Acq.Rsvd1 = 0;\r
-  Acq.Acqb  = (UINT64)(UINTN)(Private->BufferPciAddr + EFI_PAGE_SIZE) >> 12;\r
+  Acq = (UINT64)(UINTN)(Private->BufferPciAddr + EFI_PAGE_SIZE) & ~0xFFF;\r
 \r
   //\r
   // Address of I/O submission & completion queue.\r

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h
index 06c1db7d8e915e996400a559ae2ce65215af0a29..f893251fbc936c77454a4d98af535fdf0047e52d 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.h
@@ -109,18 +109,11 @@ typedef struct {
 //\r
 // 3.1.9 Offset 28h: ASQ - Admin Submission Queue Base Address\r
 //\r
-typedef struct {\r
-  UINT64 Rsvd1:12;\r
-  UINT64 Asqb:52;    // Admin Submission Queue Base Address\r
-} NVME_ASQ;\r
-\r
+#define NVME_ASQ      UINT64\r
 //\r
 // 3.1.10 Offset 30h: ACQ - Admin Completion Queue Base Address\r
 //\r
-typedef struct {\r
-  UINT64 Rsvd1:12;\r
-  UINT64 Acqb:52;    // Admin Completion Queue Base Address\r
-} NVME_ACQ;\r
+#define NVME_ACQ      UINT64\r
 \r
 //\r
 // 3.1.11 Offset (1000h + ((2y) * (4 << CAP.DSTRD))): SQyTDBL - Submission Queue y Tail Doorbell\r