[edk2] [patch v2] MdeModulePkg/Xhci: Change short packet debug message to verbose level

[Feng Tian]

Short Packet case is a normal case, we shouldn't print it as an error

compared with v1, this patch addes the same fix in XhciPei.

Cc: Star Zeng 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian 
---
 MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 2 +-
 MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c 
b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index b6078b1..e37f674 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -1167,7 +1167,7 @@ XhcCheckUrbResult (
   case TRB_COMPLETION_SHORT_PACKET:
   case TRB_COMPLETION_SUCCESS:
 if (EvtTrb->Completecode == TRB_COMPLETION_SHORT_PACKET) {
-  DEBUG ((EFI_D_ERROR, "XhcCheckUrbResult: short packet happens!\n"));
+  DEBUG ((EFI_D_VERBOSE, "XhcCheckUrbResult: short packet 
happens!\n"));
 }
 
 TRBType = (UINT8) (TRBPtr->Type);
diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c 
b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
index 3632e8a..7f554f5 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c
@@ -683,7 +683,7 @@ XhcPeiCheckUrbResult (
   case TRB_COMPLETION_SHORT_PACKET:
   case TRB_COMPLETION_SUCCESS:
 if (EvtTrb->Completecode == TRB_COMPLETION_SHORT_PACKET) {
-  DEBUG ((EFI_D_ERROR, "XhcPeiCheckUrbResult: short packet 
happens!\n"));
+  DEBUG ((EFI_D_VERBOSE, "XhcPeiCheckUrbResult: short packet 
happens!\n"));
 }
 
 TRBType = (UINT8) (TRBPtr->Type);
-- 
2.7.1.windows.2

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

[edk2] [Patch] UefiCpuPkg PeiCpuExceptionHandlerLib: Add the missing nasm files in INF

[Liming Gao]

All CpuExceptionHandlerLib library instances use nasm source files.

Cc: Reviewed-by: Jeff Fan 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao 
---
 .../Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf 
b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
index d8a2997..7c82219 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf
@@ -29,13 +29,15 @@
 
 [Sources.Ia32]
   Ia32/ExceptionHandlerAsm.asm
-  Ia32/ExceptionHandlerAsm.S   |GCC
+  Ia32/ExceptionHandlerAsm.nasm
+  Ia32/ExceptionHandlerAsm.S
   Ia32/ArchExceptionHandler.c
   Ia32/ArchInterruptDefs.h
 
 [Sources.X64]
   X64/ExceptionHandlerAsm.asm
-  X64/ExceptionHandlerAsm.S   |GCC
+  X64/ExceptionHandlerAsm.nasm
+  X64/ExceptionHandlerAsm.S
   X64/ArchExceptionHandler.c
   X64/ArchInterruptDefs.h
 
-- 
2.8.0.windows.1

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

[edk2] [patch] MdeModulePkg/Xhci: Change short packet debug message to verbose level

[Feng Tian]

Short Packet case is a normal case, we shouldn't print it as an error

Cc: Star Zeng 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian 
---
 MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c 
b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
index b6078b1..e37f674 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
@@ -1167,7 +1167,7 @@ XhcCheckUrbResult (
   case TRB_COMPLETION_SHORT_PACKET:
   case TRB_COMPLETION_SUCCESS:
 if (EvtTrb->Completecode == TRB_COMPLETION_SHORT_PACKET) {
-  DEBUG ((EFI_D_ERROR, "XhcCheckUrbResult: short packet happens!\n"));
+  DEBUG ((EFI_D_VERBOSE, "XhcCheckUrbResult: short packet 
happens!\n"));
 }
 
 TRBType = (UINT8) (TRBPtr->Type);
-- 
2.7.1.windows.2

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

[edk2] using UEFI logo as part of another logo

[Michael Zimmermann]

Hi,

since the uefi logo guidlines are mainly targeted at "pure logo" usage I'm
not sure if the following would be legal:
https://raw.githubusercontent.com/efidroid/android_app_efidroidmanager/9d364dc4e8d59381d6c60404153c5dbf5aa4711a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

I'm not working for a company but I need a logo which I can use everywhere
and however I want so I really need to know if it's allowed to use the logo
like this.

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

Re: [edk2] [patch] IntelFrameworkModulePkg/BootMaint: Show "Change Boot order" page correctly

[Dong, Eric]

Reviewed-by: Eric Dong 

> -Original Message-
> From: Bi, Dandan
> Sent: Friday, October 28, 2016 10:33 AM
> To: edk2-devel@lists.01.org
> Cc: Dong, Eric
> Subject: [patch] IntelFrameworkModulePkg/BootMaint: Show "Change Boot order" 
> page correctly
> 
> Some boot options may be deleted in the "Delete Boot Option page",
> But the data BootOptionOrder in BmmFakeNvData may not be updated.
> So when user enter the "Change Boot Order" page, we should not always
> get the BootOptionOrder in BmmFakeNvData, it will result in incorrect
> UI behaviors. When the Boot Options have been saved,
> we should get the BootOptionOrder through function GetBootOrder.
> 
> For driver option codes need to do the same change.
> 
> This patch is to fix the issue in bugzilla:
> https://bugzilla.tianocore.org/show_bug.cgi?id=39
> 
> Cc: Eric Dong 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Dandan Bi 
> ---
>  .../Universal/BdsDxe/BootMaint/UpdatePage.c| 22 
> +++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
> 
> diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
> b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
> index b13ed11..b7fee3a 100644
> --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
> +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
> @@ -1,9 +1,9 @@
>  /** @file
>  Dynamically update the pages.
> 
> -Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
> +Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
>  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
>  http://opensource.org/licenses/bsd-license.php
> 
> @@ -557,18 +557,34 @@ UpdateOrderPage (
>QuestionId = 0;
>VarOffset = 0;
>switch (UpdatePageId) {
> 
>case FORM_BOOT_CHG_ID:
> -//GetBootOrder (CallbackData);
> +//
> +// If the BootOptionOrder in the BmmFakeNvData are same with the date in 
> the BmmOldFakeNVData,
> +// means all Boot Options has been save in BootOptionMenu, we can get 
> the date from the menu.
> +// else means browser maintains some uncommitted date which are not 
> saved in BootOptionMenu,
> +// so we should not get the data from BootOptionMenu to show it.
> +//
> +if (CompareMem (CallbackData->BmmFakeNvData.BootOptionOrder, 
> CallbackData->BmmOldFakeNVData.BootOptionOrder, sizeof
> (CallbackData->BmmFakeNvData.BootOptionOrder)) == 0) {
> +  GetBootOrder (CallbackData);
> +}
>  OptionOrder = CallbackData->BmmFakeNvData.BootOptionOrder;
>  QuestionId = BOOT_OPTION_ORDER_QUESTION_ID;
>  VarOffset = BOOT_OPTION_ORDER_VAR_OFFSET;
>  break;
> 
>case FORM_DRV_CHG_ID:
> -//GetDriverOrder (CallbackData);
> +//
> +// If the DriverOptionOrder in the BmmFakeNvData are same with the date 
> in the BmmOldFakeNVData,
> +// means all Driver Options has been save in DriverOptionMenu, we can 
> get the DriverOptionOrder from the menu.
> +// else means browser maintains some uncommitted date which are not 
> saved in DriverOptionMenu,
> +// so we should not get the data from DriverOptionMenu to show it.
> +//
> +if (CompareMem (CallbackData->BmmFakeNvData.DriverOptionOrder, 
> CallbackData->BmmOldFakeNVData.DriverOptionOrder,
> sizeof (CallbackData->BmmFakeNvData.DriverOptionOrder)) == 0) {
> +  GetDriverOrder (CallbackData);
> +}
>  OptionOrder = CallbackData->BmmFakeNvData.DriverOptionOrder;
>  QuestionId = DRIVER_OPTION_ORDER_QUESTION_ID;
>  VarOffset = DRIVER_OPTION_ORDER_VAR_OFFSET;
>  break;
>}
> --
> 1.9.5.msysgit.1

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

[edk2] [Patch 0/2] Check for NULL pointer before dereference

[Fu Siyuan]

Fu Siyuan (2):
  MdeModulePkg: Check for NULL pointer before dereference it.
  NetworkPkg: Check for NULL pointer before dereference it.

 MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c |  8 
 NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

-- 
2.7.4.windows.1

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

[edk2] [Patch 2/2] NetworkPkg: Check for NULL pointer before dereference it.

[Fu Siyuan]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan 
Cc: Ye Ting 
Cc: Zhang Lubo 
Cc: Wu Jiaxin 
---
 NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c 
b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
index 52095c5..0552174 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
@@ -2013,10 +2013,14 @@ EfiPxeBcSetStationIP (
 return EFI_INVALID_PARAMETER;
   }
 
-  if (!Mode->UsingIpv6 && NewStationIp != NULL && !NetIp4IsUnicast (NTOHL 
(NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0]))) {
-return EFI_INVALID_PARAMETER;
+  if (!Mode->UsingIpv6 && NewStationIp != NULL) {
+if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) || 
+IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
+(NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL 
(NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0] {
+  return EFI_INVALID_PARAMETER;
+}
   }
-
+  
   if (!Mode->Started) {
 return EFI_NOT_STARTED;
   }
-- 
2.7.4.windows.1

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

[edk2] [Patch 1/2] MdeModulePkg: Check for NULL pointer before dereference it.

[Fu Siyuan]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan 
Cc: Ye Ting 
Cc: Zhang Lubo 
Cc: Wu Jiaxin 
---
 MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c 
b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 4746256..43568ed 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -2317,6 +2317,14 @@ EfiPxeBcSetStationIP (
   if (NewSubnetMask != NULL && !IP4_IS_VALID_NETMASK (NTOHL 
(NewSubnetMask->Addr[0]))) {
 return EFI_INVALID_PARAMETER;
   }
+
+  if (NewStationIp != NULL) {
+if (IP4_IS_UNSPECIFIED(NTOHL (NewStationIp->Addr[0])) || 
+IP4_IS_LOCAL_BROADCAST(NTOHL (NewStationIp->Addr[0])) ||
+(NewSubnetMask != NULL && !NetIp4IsUnicast (NTOHL 
(NewStationIp->Addr[0]), NTOHL (NewSubnetMask->Addr[0] {
+  return EFI_INVALID_PARAMETER;
+}
+  }
   
   if (NewStationIp != NULL && !NetIp4IsUnicast (NTOHL (NewStationIp->Addr[0]), 
NTOHL (NewSubnetMask->Addr[0]))) {
 return EFI_INVALID_PARAMETER;
-- 
2.7.4.windows.1

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