From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ruiyu.ni@intel.com>
Received: from mga05.intel.com (mga05.intel.com [192.55.52.43])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by ml01.01.org (Postfix) with ESMTPS id 9427E21CF9511
 for <edk2-devel@lists.01.org>; Mon, 31 Jul 2017 22:14:58 -0700 (PDT)
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
 by fmsmga105.fm.intel.com with ESMTP; 31 Jul 2017 22:17:07 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.41,305,1498546800"; d="scan'208";a="134365312"
Received: from ray-dev.ccr.corp.intel.com ([10.239.9.23])
 by fmsmga006.fm.intel.com with ESMTP; 31 Jul 2017 22:17:06 -0700
From: Ruiyu Ni <ruiyu.ni@intel.com>
To: edk2-devel@lists.01.org
Cc: HuajingLi <huajing.li@intel.com>
Date: Tue,  1 Aug 2017 13:17:04 +0800
Message-Id: <20170801051704.163104-1-ruiyu.ni@intel.com>
X-Mailer: git-send-email 2.12.2.windows.2
Subject: [PATCH] ShellPkg/dblk: Honor the BlockIo alignment requirement.
X-BeenThere: edk2-devel@lists.01.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: EDK II Development  <edk2-devel.lists.01.org>
List-Unsubscribe: <https://lists.01.org/mailman/options/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=unsubscribe>
List-Archive: <http://lists.01.org/pipermail/edk2-devel/>
List-Post: <mailto:edk2-devel@lists.01.org>
List-Help: <mailto:edk2-devel-request@lists.01.org?subject=help>
List-Subscribe: <https://lists.01.org/mailman/listinfo/edk2-devel>,
 <mailto:edk2-devel-request@lists.01.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Aug 2017 05:14:58 -0000

From: HuajingLi <huajing.li@intel.com>

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
---
 ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
index 32e5917523..3632ca8a7a 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c
@@ -2,7 +2,7 @@
   Main file for Dblk shell Debug1 function.
 
   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -37,6 +37,7 @@ DisplayTheBlocks(
   EFI_STATUS                Status;
   SHELL_STATUS              ShellStatus;
   UINT8                     *Buffer;
+  UINT8                     *OriginalBuffer;
   UINTN                     BufferSize;
 
   ShellStatus = SHELL_SUCCESS;
@@ -52,11 +53,17 @@ DisplayTheBlocks(
   }
 
   BufferSize = BlockIo->Media->BlockSize * BlockCount;
+  if(BlockIo->Media->IoAlign == 0) {
+    BlockIo->Media->IoAlign = 1;
+  }
+
   if (BufferSize > 0) {
-    Buffer     = AllocateZeroPool(BufferSize);
+    OriginalBuffer = AllocateZeroPool(BufferSize + BlockIo->Media->IoAlign);
+    Buffer         = ALIGN_POINTER (OriginalBuffer,BlockIo->Media->IoAlign);
   } else {
     ShellPrintEx(-1,-1,L"  BlockSize: 0x%08x, BlockCount: 0x%08x\r\n", BlockIo->Media->BlockSize, BlockCount);
-    Buffer    = NULL;
+    OriginalBuffer = NULL;
+    Buffer         = NULL;
   }
 
   Status = BlockIo->ReadBlocks(BlockIo, BlockIo->Media->MediaId, Lba, BufferSize, Buffer);
@@ -78,8 +85,8 @@ DisplayTheBlocks(
     ShellStatus = SHELL_DEVICE_ERROR;
   }
 
-  if (Buffer != NULL) {
-    FreePool(Buffer);
+  if (OriginalBuffer != NULL) {
+    FreePool (OriginalBuffer);
   }
 
   gBS->CloseProtocol(BlockIoHandle, &gEfiBlockIoProtocolGuid, gImageHandle, NULL);
-- 
2.12.2.windows.2