From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.52]) by mx.groups.io with SMTP id smtpd.web11.5086.1580372296781855619 for ; Thu, 30 Jan 2020 00:18:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nxp.com header.s=selector2 header.b=Nxl+UVdc; spf=pass (domain: nxp.com, ip: 40.107.7.52, mailfrom: gaurav.jain@nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OIVvOE+JLZrItD5l66MHvwFIn7L4JyPHVV3E1IRuYLMXI8pne6yZN0R0JKLG5VWMu1GcGOAINP6wSXwj7tSc1NzPfnwGl5b3TFWmBJl/L9K4Jxcw9iElxuneX4swsDuiF+3Tl5kQ080mA4dHNLc/lHEnWjEcNF/8wPOkfl1HYvNubXQ63wk5BbpvJ9qAmPUaIZsF5fuyVlwLUbk7fUq3eOG225KGlmVxTxsdreWiFBNIiyLloJhfHyv+fq/Wkyh6eE6HEyF2lZD59T1kBYzN8crgIZAO35BZG0iSuZ/6k3v34p2pO42vkaWYC/Z08zps1w90BNfd928qLMyzl4oPPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=79jYDiDUz3439gO3tS73YsuoGPe5zv+O6XJy37WQ62w=; b=nGCVkRlKwfsMSJlT6ulPEdyQHVpYLOoEXGN2UZzfs44bYtrVpDCbJCgsBkB8O4o0O3mgYAv7Z2aHTostXiHnSiD36jVh0IgHHzm9u1vg9YpVmADv50NJN3RDLmCN/Ge+v+oytZwlGnJasE2uUoMTXxrITMMDLKVx8YO1bo4Z9yVL9oa/Qdu5rNl1gqOi0u0FqUvlXWLC57aOJgh+bOC7wLbpY5j62Epw/3Umt2HqBzWcXeUvdTaxWPttkD0JUjQgQ6jTqzdC9CZ26x4gWsK/bidajpb8ONVRrl4+yYKY19lT48uLYIKcwtI9LbN7xYPdxjiz265YxZ+clJXC8LXFYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=79jYDiDUz3439gO3tS73YsuoGPe5zv+O6XJy37WQ62w=; b=Nxl+UVdccNf3VKR6+B4RrCMyYrun81VSHbzg913x1xWrXrf4m+/UAXbSHO64Tkhd+iegtuPAghfAIGgs9TMLoEPJrUngaO2+bL5kUGVNoq8wAwHEEdn/2Whau4xz+lmEMV0vyJWE68Vm8v40x2tlXSBWTPkbglOZnWVzk/ZKVnU= Received: from DB7PR04MB4091.eurprd04.prod.outlook.com (52.134.110.144) by DB7PR04MB4380.eurprd04.prod.outlook.com (52.135.136.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2665.22; Thu, 30 Jan 2020 08:18:14 +0000 Received: from DB7PR04MB4091.eurprd04.prod.outlook.com ([fe80::811d:4963:2158:c3f7]) by DB7PR04MB4091.eurprd04.prod.outlook.com ([fe80::811d:4963:2158:c3f7%5]) with mapi id 15.20.2665.027; Thu, 30 Jan 2020 08:18:14 +0000 Received: from uefi-workstation.ap.freescale.net (92.120.1.69) by BMXPR01CA0028.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2665.21 via Frontend Transport; Thu, 30 Jan 2020 08:18:12 +0000 From: Gaurav Jain To: "devel@edk2.groups.io" CC: Jian J Wang , Hao A Wu , Ray Ni , Pankaj Bansal , Gaurav Jain Subject: [PATCH 1/1] MdeModulePkg/Pci: Fixed Asserts in SCT PCIIO Protocol Test. Thread-Topic: [PATCH 1/1] MdeModulePkg/Pci: Fixed Asserts in SCT PCIIO Protocol Test. Thread-Index: AQHV10XR5XjIzUYbAkmv942vGaqAFA== Date: Thu, 30 Jan 2020 08:18:13 +0000 Message-ID: <20200130133804.32261-1-gaurav.jain@nxp.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BMXPR01CA0028.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::14) To DB7PR04MB4091.eurprd04.prod.outlook.com (2603:10a6:5:1e::16) authentication-results: spf=none (sender IP is ) smtp.mailfrom=gaurav.jain@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [92.120.1.69] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 4d7fa928-9d9f-44ec-f6b0-08d7a55cf393 x-ms-traffictypediagnostic: DB7PR04MB4380:|DB7PR04MB4380: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1284; x-forefront-prvs: 02981BE340 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(136003)(346002)(366004)(376002)(39860400002)(396003)(189003)(199004)(6506007)(71200400001)(2906002)(66946007)(8676002)(64756008)(66476007)(66556008)(66446008)(1076003)(81156014)(316002)(478600001)(54906003)(8936002)(52116002)(81166006)(26005)(6512007)(16526019)(186003)(6486002)(4326008)(5660300002)(2616005)(44832011)(86362001)(36756003)(6916009)(956004);DIR:OUT;SFP:1101;SCL:1;SRVR:DB7PR04MB4380;H:DB7PR04MB4091.eurprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vNzIHVozQVucufdT5rd19r0Z8dEB4FrUpwF6OY7RP4/IYyc6hVfeILX8y029neAkwwWpzreHNne734JOvzNYepsn+uqwjDIAJwAiatpfvJXYvPOLlEPMyZqAoq/Uw5329EfcvF89sW9Kv6ct8aagVrqtvQ5VkUSlqbVIGtJE+t1xHspLUSPCs2DcldAiQjZLaM8JiVc4b6KJTu66iB1igbS2ocljFTbSKFYRGW6xV/gl/mmF4TlNLrFv4lx95wikMl9ZrmyeS1Sn7kLkJq7nMaXEVDC8+byznHJ0PuCyBgJcC1P+SNArygN9tTRqdCLQcQqeyw3UL5hTsSJuLSAMuitM0fZigsdHeFLXhhVWiD9e7XZCPTTsha5UDhIuYdYdctZXZTQ+yFxq8DPO+OaAdNCgbR8E89dv4zntZTcPsB4Hj4QNo4lgXUgqaUZZ0HHN x-ms-exchange-antispam-messagedata: 8lohDByFstKhjyrz01Kvphz20ZO5usuk7y2AyyJ0G1jC02WKTcNQHixEGD7qkZVYynIEmvJ5yz1RV7e7abIQppxbrE27GxygUKnFsDuDkT4R4OIv0ImIbmMrHf2EDYoGWBLpumnjamQWOy1mMGMLnw== MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d7fa928-9d9f-44ec-f6b0-08d7a55cf393 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jan 2020 08:18:14.0268 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 3cOUI/91UzJtYxsPW+VnYiOhLyQoRv5iFA2SWoH/xBGoKDz6c8zIA96VDtUQwNBatY2IxlR80hkxEPnkXBRoKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4380 Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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 --- .../NonDiscoverablePciDeviceIo.c | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverab= lePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDisco= verablePciDeviceIo.c index 2d55c9699322..76cb000602fc 100644 --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDe= viceIo.c +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDe= viceIo.c @@ -93,7 +93,15 @@ PciIoPollMem ( OUT UINT64 *Result ) { - ASSERT (FALSE); + if ((UINT32)Width >=3D EfiPciIoWidthMaximum || + Width > EfiPciIoWidthUint64) { + return EFI_INVALID_PARAMETER; + } + + if (Result =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + return EFI_UNSUPPORTED; } =20 @@ -556,7 +564,10 @@ PciIoCopyMem ( IN UINTN Count ) { - ASSERT (FALSE); + if ((UINT32)Width >=3D EfiPciIoWidthMaximum || + Width > EfiPciIoWidthUint64) { + return EFI_INVALID_PARAMETER; + } return EFI_UNSUPPORTED; } =20 @@ -1414,7 +1425,10 @@ PciIoSetBarAttributes ( IN OUT UINT64 *Length ) { - ASSERT (FALSE); + if (Offset =3D=3D NULL || Length =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + return EFI_UNSUPPORTED; } =20 --=20 2.17.1