From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: eric.jin@intel.com) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by groups.io with SMTP; Mon, 23 Sep 2019 20:33:14 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 20:33:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,542,1559545200"; d="scan'208";a="195565870" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by FMSMGA003.fm.intel.com with ESMTP; 23 Sep 2019 20:33:14 -0700 Received: from fmsmsx102.amr.corp.intel.com (10.18.124.200) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 23 Sep 2019 20:33:13 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX102.amr.corp.intel.com (10.18.124.200) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 23 Sep 2019 20:33:13 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.140]) by shsmsx102.ccr.corp.intel.com ([169.254.2.113]) with mapi id 14.03.0439.000; Tue, 24 Sep 2019 11:33:11 +0800 From: "Eric Jin" To: "devel@edk2.groups.io" , "Liu, XianhuiX" CC: Heinrich Schuchardt , Supreeth Venkatesh Subject: Re: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresentSupported check Thread-Topic: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresentSupported check Thread-Index: AQHVcbA/WGXhNQQNE0Kgxp91C/Gjzqc6LfCA Date: Tue, 24 Sep 2019 03:33:11 +0000 Message-ID: References: <20190923014221.14780-1-xianhuix.liu@intel.com> In-Reply-To: <20190923014221.14780-1-xianhuix.liu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: eric.jin@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Xianhui, The content is clear to me. Two comments: 1. The copyright year is not updated. I will help to update when I commit,= but hold one day to wait for possible comments. Reviewed-by: Eric Jin 2. Could you please provide the patch on the IHV part? Thanks. Best Regards Eric -----Original Message----- From: devel@edk2.groups.io On Behalf Of xianhui liu Sent: Monday, September 23, 2019 9:42 AM To: devel@edk2.groups.io Cc: Heinrich Schuchardt ; Supreeth Venkatesh ; Jin, Eric Subject: [edk2-devel] [edk2-test][Patch] uefi-sct/SctPkg: Add MediaPresent= Supported check REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2061 check MediaPresent while MediaPresentSupported is TRUE 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/EFI/Protocol/SimpleNetwork/Blac= kBoxTest/SimpleNetworkBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/= Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c index 133ef8a9..563e5361 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTes= t/SimpleNetworkBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTes= t/SimpleNetworkBBTestFunction.c @@ -1888,38 +1888,40 @@ BBTestGetStatusFunctionTest ( Status =3D SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &Tx= Buf); Status1 =3D SnpInterface->GetStatus (SnpInterface, &InterruptStatus, &T= xBuf); =20 - if (SnpInterface->Mode->MediaPresent =3D=3D FALSE) { - if ((Status1 =3D=3D EFI_SUCCESS) && (Status =3D=3D EFI_SUCCESS) && (I= nterruptStatus =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 GetS= tatus() 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 GetStat= us() 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