public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Gaurav Jain <gaurav.jain@nxp.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: Jian J Wang <jian.j.wang@intel.com>,
	Hao A Wu <hao.a.wu@intel.com>, Ray Ni <ray.ni@intel.com>,
	Pankaj Bansal <pankaj.bansal@nxp.com>,
	Gaurav Jain <gaurav.jain@nxp.com>
Subject: [PATCH 1/1] MdeModulePkg/Pci: Fixed Asserts in SCT PCIIO Protocol Test.
Date: Thu, 30 Jan 2020 08:18:13 +0000	[thread overview]
Message-ID: <20200130133804.32261-1-gaurav.jain@nxp.com> (raw)

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.jain@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


             reply	other threads:[~2020-01-30  8:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-30  8:18 Gaurav Jain [this message]
2020-02-17  7:18 ` [PATCH 1/1] MdeModulePkg/Pci: Fixed Asserts in SCT PCIIO Protocol Test Gaurav Jain
2020-02-17  8:45   ` [edk2-devel] " Liming Gao
2020-02-19  5:59     ` [EXT] " Gaurav Jain
2020-02-19  6:34 ` Wu, Hao A
2020-02-19  7:48   ` Ard Biesheuvel
2020-02-20 11:33   ` [EXT] " Gaurav Jain

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200130133804.32261-1-gaurav.jain@nxp.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox