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

["Liming Gao" <liming.gao@intel.com>]

Gaurav:
  Does this patch catch to edk2 stable tag 202002? 

Thanks
Liming
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gaurav Jain
> Sent: Monday, February 17, 2020 3:18 PM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray <ray.ni@intel.com>; Pankaj Bansal
> <pankaj.bansal@nxp.com>
> Subject: Re: [edk2-devel] [PATCH 1/1] MdeModulePkg/Pci: Fixed Asserts in SCT PCIIO Protocol Test.
> 
> Gentle Reminder!!
> Please review..
> 
> > -----Original Message-----
> > From: Gaurav Jain <gaurav.jain@nxp.com>
> > Sent: Thursday, January 30, 2020 1:48 PM
> > To: 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.
> >
> > 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/NonDiscoverablePciD
> > eviceIo.c
> > b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciD
> > eviceIo.c
> > index 2d55c9699322..76cb000602fc 100644
> > ---
> > a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciD
> > eviceIo.c
> > +++
> > b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePc
> > +++ iDeviceIo.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
> 
> 
>