Re: [edk2] [PATCH] ShellPkg SmbiosView: Add missing decoding of SMBIOS spec 3.0.0

2017-01-18 Thread Carsey, Jaben 
Reviewed-by: Jaben Carsey 

> -Original Message-
> From: Zeng, Star
> Sent: Monday, January 16, 2017 7:24 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star ; Carsey, Jaben ;
> Ni, Ruiyu 
> Subject: [PATCH] ShellPkg SmbiosView: Add missing decoding of SMBIOS spec
> 3.0.0
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=345
> 
> When I am adding SMBIOS spec 3.1.0, I found the decoding of SMBIOS spec
> 3.0.0 for some definitions is missing.
> 
> Cc: Jaben Carsey 
> Cc: Ruiyu Ni 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng 
> ---
>  .../SmbiosView/PrintInfo.c | 18 -
>  .../SmbiosView/QueryTable.c| 80 
> ++
>  2 files changed, 97 insertions(+), 1 deletion(-)
> 
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> index d9adb1a7abb9..abbc9835b5d0 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
> @@ -1,7 +1,7 @@
>  /** @file
>Module for clarifying the content of the smbios structure element 
> information.
> 
> -  Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.
> +  Copyright (c) 2005 - 2017, Intel Corporation. All rights
> + reserved.
>(C) Copyright 2014 Hewlett-Packard Development Company, L.P.
>(C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP
>This program and the accompanying materials @@ -1580,6 +1580,10 @@
> DisplayProcessorFamily (
>  ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN
> (STR_SMBIOSVIEW_PRINTINFO_INTEL_ATOM), gShellDebug1HiiHandle);
>  break;
> 
> +  case 0x2C:
> +Print (L"Intel(R) Core(TM) M processor\n");
> +break;
> +
>case 0x30:
>  ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN
> (STR_SMBIOSVIEW_PRINTINFO_ALPHA_FAMILY_2), gShellDebug1HiiHandle);
>  break;
> @@ -1768,6 +1772,18 @@ DisplayProcessorFamily (
>  Print (L"68030\n");
>  break;
> 
> +  case 0x66:
> +Print (L"AMD Athlon(TM) X4 Quad-Core Processor Family\n");
> +break;
> +
> +  case 0x67:
> +Print (L"AMD Opteron(TM) X1000 Series Processor\n");
> +break;
> +
> +  case 0x68:
> +Print (L"AMD Opteron(TM) X2000 Series APU\n");
> +break;
> +
>case 0x70:
>  ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN
> (STR_SMBIOSVIEW_PRINTINFO_HOBBIT_FAMILY), gShellDebug1HiiHandle);
>  break;
> diff --git
> a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
> index bb7a19b04170..acca00d5c37d 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.
> +++ c
> @@ -248,6 +248,18 @@ TABLE_ITEM  SystemEnclosureTypeTable[] = {
>  0x1D,
>  L"  Blade Enclosure"
>},
> +  {
> +0x1E,
> +L"  Tablet"
> +  },
> +  {
> +0x1F,
> +L"  Convertible"
> +  },
> +  {
> +0x20,
> +L"  Detachable"
> +  },
>  };
> 
>  TABLE_ITEM  SystemEnclosureStatusTable[] = { @@ -503,6 +515,22 @@
> TABLE_ITEM  ProcessorUpgradeTable[] = {
>{
>  0x2C,
>  L"Socket LGA1356-3"
> +  },
> +  {
> +0x2D,
> +L"Socket LGA1150"
> +  },
> +  {
> +0x2E,
> +L"Socket BGA1168"
> +  },
> +  {
> +0x2F,
> +L"Socket BGA1234"
> +  },
> +  {
> +0x30,
> +L"Socket BGA1364"
>}
>  };
> 
> @@ -1267,6 +1295,58 @@ TABLE_ITEM  SystemSlotTypeTable[] = {
>  L"AGP 8X"
>},
>{
> +0x14,
> +L"M.2 Socket 1-DP (Mechanical Key A)"
> +  },
> +  {
> +0x15,
> +L"M.2 Socket 1-SD (Mechanical Key E)"
> +  },
> +  {
> +0x16,
> +L"M.2 Socket 2 (Mechanical Key B)"
> +  },
> +  {
> +0x17,
> +L"M.2 Socket 3 (Mechanical Key M)"
> +  },
> +  {
> +0x18,
> +L"MXM Type I"
> +  },
> +  {
> +0x19,
> +L"MXM Type II"
> +  },
> +  {
> +0x1A,
> +L"MXM Type III (standard connector)"
> +  },
> +  {
> +0x1B,
> +L"MXM Type III (HE connector)"
> +  },
> +  {
> +0x1C,
> +L"MXM Type IV"
> +  },
> +  {
> +0x1D,
> +L"MXM 3.0 Type A"
> +  },
> +  {
> +0x1E,
> +L"MXM 3.0 Type B"
> +  },
> +  {
> +0x1F,
> +L"PCI Express Gen 2 SFF-8639"
> +  },
> +  {
> +0x20,
> +L"PCI Express Gen 3 SFF-8639"
> +  },
> +  {
>  0xA0,
>  L"PC-98/C20 "
>},
> --
> 2.7.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

[edk2] [PATCH] ShellPkg SmbiosView: Add missing decoding of SMBIOS spec 3.0.0

2017-01-16 Thread Star Zeng 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=345

When I am adding SMBIOS spec 3.1.0, I found the decoding of
SMBIOS spec 3.0.0 for some definitions is missing.

Cc: Jaben Carsey 
Cc: Ruiyu Ni 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng 
---
 .../SmbiosView/PrintInfo.c | 18 -
 .../SmbiosView/QueryTable.c| 80 ++
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c 
b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
index d9adb1a7abb9..abbc9835b5d0 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c
@@ -1,7 +1,7 @@
 /** @file
   Module for clarifying the content of the smbios structure element 
information.
 
-  Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.
+  Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.
   (C) Copyright 2014 Hewlett-Packard Development Company, L.P.  
   (C) Copyright 2015-2017 Hewlett Packard Enterprise Development LP
   This program and the accompanying materials
@@ -1580,6 +1580,10 @@ DisplayProcessorFamily (
 ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN 
(STR_SMBIOSVIEW_PRINTINFO_INTEL_ATOM), gShellDebug1HiiHandle);
 break;
 
+  case 0x2C:
+Print (L"Intel(R) Core(TM) M processor\n");
+break;
+
   case 0x30:
 ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN 
(STR_SMBIOSVIEW_PRINTINFO_ALPHA_FAMILY_2), gShellDebug1HiiHandle);
 break;
@@ -1768,6 +1772,18 @@ DisplayProcessorFamily (
 Print (L"68030\n");
 break;
 
+  case 0x66:
+Print (L"AMD Athlon(TM) X4 Quad-Core Processor Family\n");
+break;
+
+  case 0x67:
+Print (L"AMD Opteron(TM) X1000 Series Processor\n");
+break;
+
+  case 0x68:
+Print (L"AMD Opteron(TM) X2000 Series APU\n");
+break;
+
   case 0x70:
 ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN 
(STR_SMBIOSVIEW_PRINTINFO_HOBBIT_FAMILY), gShellDebug1HiiHandle);
 break;
diff --git 
a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c 
b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
index bb7a19b04170..acca00d5c37d 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c
@@ -248,6 +248,18 @@ TABLE_ITEM  SystemEnclosureTypeTable[] = {
 0x1D,
 L"  Blade Enclosure"
   },
+  {
+0x1E,
+L"  Tablet"
+  },
+  {
+0x1F,
+L"  Convertible"
+  },
+  {
+0x20,
+L"  Detachable"
+  },
 };
 
 TABLE_ITEM  SystemEnclosureStatusTable[] = {
@@ -503,6 +515,22 @@ TABLE_ITEM  ProcessorUpgradeTable[] = {
   {
 0x2C,
 L"Socket LGA1356-3"
+  },
+  {
+0x2D,
+L"Socket LGA1150"
+  },
+  {
+0x2E,
+L"Socket BGA1168"
+  },
+  {
+0x2F,
+L"Socket BGA1234"
+  },
+  {
+0x30,
+L"Socket BGA1364"
   }
 };
 
@@ -1267,6 +1295,58 @@ TABLE_ITEM  SystemSlotTypeTable[] = {
 L"AGP 8X"
   },
   {
+0x14,
+L"M.2 Socket 1-DP (Mechanical Key A)"
+  },
+  {
+0x15,
+L"M.2 Socket 1-SD (Mechanical Key E)"
+  },
+  {
+0x16,
+L"M.2 Socket 2 (Mechanical Key B)"
+  },
+  {
+0x17,
+L"M.2 Socket 3 (Mechanical Key M)"
+  },
+  {
+0x18,
+L"MXM Type I"
+  },
+  {
+0x19,
+L"MXM Type II"
+  },
+  {
+0x1A,
+L"MXM Type III (standard connector)"
+  },
+  {
+0x1B,
+L"MXM Type III (HE connector)"
+  },
+  {
+0x1C,
+L"MXM Type IV"
+  },
+  {
+0x1D,
+L"MXM 3.0 Type A"
+  },
+  {
+0x1E,
+L"MXM 3.0 Type B"
+  },
+  {
+0x1F,
+L"PCI Express Gen 2 SFF-8639"
+  },
+  {
+0x20,
+L"PCI Express Gen 3 SFF-8639"
+  },
+  {
 0xA0,
 L"PC-98/C20 "
   },
-- 
2.7.0.windows.1

___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel