From: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com>
Date: Fri, 4 Mar 2016 03:31:45 +0000 (-0800)
Subject: ShellPkg: Fix smbiosview decode of PCIe Extended Capabilities
X-Git-Tag: edk2-stable201903~7700
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=2c328aca1d5dfd99e7541d85db63318be3d4da62

ShellPkg: Fix smbiosview decode of PCIe Extended Capabilities

Fix SMBIOSVIEW decode of the HeaderLog fields of the PCIe
AER structure . The PCIe 2.1 Base Specification, section 7.10, lists
this as 16 bytes, or 4 DWORDs.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <elhaj@hpe.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
---

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
index df45cd68aa..6956963798 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
@@ -1,8 +1,9 @@
 /** @file
   Main file for Pci shell Debug1 function.
 
-  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
   Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
+  (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<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
@@ -5443,7 +5444,10 @@ PrintInterpretedExtendedCompatibilityAer (
     Header->CorrectableErrorStatus,
     Header->CorrectableErrorMask,
     Header->AdvancedErrorCapabilitiesAndControl,
-    Header->HeaderLog,
+    Header->HeaderLog[0],
+    Header->HeaderLog[1],
+    Header->HeaderLog[2],
+    Header->HeaderLog[3],
     Header->RootErrorCommand,
     Header->RootErrorStatus,
     Header->ErrorSourceIdentification,
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
index 4d9eb1f1db..6206f841eb 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni
@@ -1,7 +1,8 @@
 // /**
 //
-// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
 // Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>
+// (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
+// (C) Copyright 2016 Hewlett Packard Enterprise Development LP<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
@@ -316,7 +317,10 @@
                                                        "    CorrectableErrorStatus         %08x\r\n"
                                                        "    CorrectableErrorMask           %08x\r\n"
                                                        "    AdvancedErrorCapAndControl     %08x\r\n"
-                                                       "    HeaderLog                      %08x\r\n"
+                                                       "    HeaderLog1                     %08x\r\n"
+                                                       "    HeaderLog2                     %08x\r\n"
+                                                       "    HeaderLog3                     %08x\r\n"
+                                                       "    HeaderLog4                     %08x\r\n"
                                                        "    RootErrorCommand               %08x\r\n"
                                                        "    RootErrorStatus                %08x\r\n"
                                                        "    ErrorSourceIdentification      %04x\r\n"