[edk2-devel] [PATCH 1/1] MdeModulePkg/Pci: Fixed Asserts in SCT PCIIO Protocol Test.

[Gaurav Jain]

ASSERT in CopyMem_Conf, PollMem_Conf, SetBarAttributes_Conf
Conformance Test.
SCT Test expect return as Invalid Parameter.
So removed ASSERT().

Signed-off-by: Gaurav Jain <gaurav.j...@nxp.com>
---
 .../NonDiscoverablePciDeviceIo.c              | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git 
a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c 
b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
index 2d55c9699322..76cb000602fc 100644
--- 
a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
+++ 
b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
@@ -93,7 +93,15 @@ PciIoPollMem (
   OUT UINT64                      *Result
   )
 {
-  ASSERT (FALSE);
+  if ((UINT32)Width >= EfiPciIoWidthMaximum ||
+      Width > EfiPciIoWidthUint64) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  if (Result == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   return EFI_UNSUPPORTED;
 }
 
@@ -556,7 +564,10 @@ PciIoCopyMem (
   IN     UINTN                        Count
   )
 {
-  ASSERT (FALSE);
+  if ((UINT32)Width >= EfiPciIoWidthMaximum ||
+      Width > EfiPciIoWidthUint64) {
+    return EFI_INVALID_PARAMETER;
+  }
   return EFI_UNSUPPORTED;
 }
 
@@ -1414,7 +1425,10 @@ PciIoSetBarAttributes (
   IN OUT UINT64                       *Length
   )
 {
-  ASSERT (FALSE);
+  if (Offset == NULL || Length == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
   return EFI_UNSUPPORTED;
 }
 
-- 
2.17.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#53566): https://edk2.groups.io/g/devel/message/53566
Mute This Topic: https://groups.io/mt/70267136/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-