From nobody Sun May 19 20:02:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+47910+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47910+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1569315059; cv=none; d=zoho.com; s=zohoarc; b=jkBWd0ztnZ39rtxL07fUjkvfuTLLFLb/H/u46+PTcwq8YEWaU9v3VdXOnxtM20RATrRMx4xVaO9iTIF11BiAr2A7hQ0JrAleDT66elNWFTEhQk9/24EOZiY6/bkcrznY5S2KxhqGV3LH2i0RHfG8vjVroFosdfi5UwJuU5tISEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569315059; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=M9DxTdYpLo7HIQQCzG1GtxlnrsihBYZ4nYFF+q0lwQ0=; b=dh45mUT2IfhoMuI8FF62m+umfBEsaAd0eE1GjkQzdxTF14F95+JAHlxcnWynHrIBvlkH84EEeqPe6bA4IExTAzPOw2dq8leu0wnBUzhDGj/rFW9+eQ3M0Bi8jhrnATfeNpYn2B+frhsTPYiknvQtMqDSlhPrFHqUOCYw+rPCfEs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+47910+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1569315059003677.1874480209015; Tue, 24 Sep 2019 01:50:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Zr6OYY1788612x50eBFGGaEh; Tue, 24 Sep 2019 01:50:58 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Tue, 24 Sep 2019 01:50:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Sep 2019 01:50:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,543,1559545200"; d="scan'208";a="388788072" X-Received: from xianhu2x-mobl.ccr.corp.intel.com ([10.239.196.243]) by fmsmga005.fm.intel.com with ESMTP; 24 Sep 2019 01:50:55 -0700 From: "xianhui liu" To: devel@edk2.groups.io Cc: Heinrich Schuchardt , Supreeth Venkatesh , Eric Jin Subject: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresentSupported check Date: Tue, 24 Sep 2019 16:50:52 +0800 Message-Id: <20190924085052.8484-1-xianhuix.liu@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xianhuix.liu@intel.com X-Gm-Message-State: AjWCpoQxCqvN9ycR9sggji5ax1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1569315058; bh=nBxEALGEaYCuLVE8RnwYCliMAtvJi64mXc/RDFrpoNw=; h=Cc:Date:From:Reply-To:Subject:To; b=XwR4Mb108DIHJarXiOw6wYIWuEmbk9VN9jmoMs3fJM6relfUAYe7MnjME8MS4CVwLXP KBQ9MUWEOYBpcANLFmrypObcriOMI93myjWKcLG4v2mGO64WUO3ocOeGuj3i60Rmxr9OT 5I/h5F3cbzB6grWhO3vmwtWlgZSF44S3muk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2061 check MediaPresent while MediaPresentSupported is TRUE sync change from EFI to IHV SimpleNetworkBBTestFunction Cc: Heinrich Schuchardt Cc: Supreeth Venkatesh Cc: Eric Jin Signed-off-by: xianhui liu --- .../BlackBoxTest/SimpleNetworkBBTestFunction.c | 64 +++++++++++-------= ---- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/Black= BoxTest/SimpleNetworkBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/IHV/P= rotocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c index b4c7b5ee..8559e894 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/IHV/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestFunction.c @@ -1888,38 +1888,40 @@ BBTestGetStatusFunctionTest ( Status =3D SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &TxB= uf); Status1 =3D SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &Tx= Buf); =20 - if (SnpInterface->Mode->MediaPresent =3D=3D FALSE) { - if ((Status1 =3D=3D EFI_SUCCESS) && (Status =3D=3D EFI_SUCCESS) && (In= terruptStatus =3D=3D 0)) { - AssertionType =3D EFI_TEST_ASSERTION_PASSED; - } else { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; - } - } else { - if ((Status1 =3D=3D EFI_SUCCESS) && (Status =3D=3D EFI_SUCCESS)) { - AssertionType =3D EFI_TEST_ASSERTION_PASSED; - if (InterruptStatus & - ~( EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT | - EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT | - EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT | - EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT)) { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; - } - } else { - AssertionType =3D EFI_TEST_ASSERTION_FAILED; - } + if (SnpInterface->Mode-> MediaPresentSupported =3D=3D TRUE) { + if (SnpInterface->Mode->MediaPresent =3D=3D FALSE) { + if ((Status1 =3D=3D EFI_SUCCESS) && (Status =3D=3D EFI_SUCCESS) && = (InterruptStatus =3D=3D 0)) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + } else { + if ((Status1 =3D=3D EFI_SUCCESS) && (Status =3D=3D EFI_SUCCESS)) { + AssertionType =3D EFI_TEST_ASSERTION_PASSED; + if (InterruptStatus & + ~( EFI_SIMPLE_NETWORK_RECEIVE_INTERRUPT | + EFI_SIMPLE_NETWORK_TRANSMIT_INTERRUPT | + EFI_SIMPLE_NETWORK_COMMAND_INTERRUPT | + EFI_SIMPLE_NETWORK_SOFTWARE_INTERRUPT)) { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + } else { + AssertionType =3D EFI_TEST_ASSERTION_FAILED; + } + } + StandardLib->RecordAssertion ( + StandardLib, + AssertionType, + gSimpleNetworkBBTestFunctionAssertionGuid022, + L"EFI_SIMPLE_NETWORK_PROTOCOL.GetStatus - Invoke GetSt= atus() and verify interface correctness within test case", + L"%a:%d:Status - %r, Status1 - %r, InterruptStatus - %= d", + __FILE__, + (UINTN)__LINE__, + Status, + Status1, + InterruptStatus + ); } - StandardLib->RecordAssertion ( - StandardLib, - AssertionType, - gSimpleNetworkBBTestFunctionAssertionGuid022, - L"EFI_SIMPLE_NETWORK_PROTOCOL.GetStatus - Invoke GetStatu= s() and verify interface correctness within test case", - L"%a:%d:Status - %r, Status1 - %r, InterruptStatus - %d", - __FILE__, - (UINTN)__LINE__, - Status, - Status1, - InterruptStatus - ); =20 // // Restore SNP State --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#47910): https://edk2.groups.io/g/devel/message/47910 Mute This Topic: https://groups.io/mt/34258689/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-