From nobody Mon May 20 14:38:33 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+47783+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+47783+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1569202982; cv=none; d=zoho.com; s=zohoarc; b=hWoPZPgz2jTfT7mNWXfe+nr3eHUCX0mCog7lDZA+5N8ne7Lmgvwt38oQGfyJKKcVsY+IeBVjuH2fpzhdVN173PjPzAOhqtftm9T1wQD0SLUrpRlj6ORNjXDt2ryDsA9bUFr07gVVA1F5/gGo3FKerdWgeQFQYCwjl6i6FMRq8HA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569202982; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=0m0UMEXt2PQTp+zkaSdKwnV5iqYG7HnERPFrf27KoWI=; b=k8DFstb/KSibrD4ZAqKkz7f88TfndKrGOxd1VYWy+KBa5+MZ4TlIrSo0SCE/6HXDu7GcOw62nQ+r1LLbIZ7wlQS3Wj+Kc1aJoOybEIZhrEwaA2BKYi0vkmwIUMqicim36Js4dP6lpffrBTu5Dx2WL7iMkM5T+5Eka9tY2Z2lVGU= 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+47783+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 1569202982021921.9261162784212; Sun, 22 Sep 2019 18:43:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id x2XbYY1788612xvXiyZzxPlT; Sun, 22 Sep 2019 18:43:01 -0700 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Sun, 22 Sep 2019 18:43:00 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Sep 2019 18:43:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,538,1559545200"; d="scan'208";a="389321068" X-Received: from xianhu2x-mobl.ccr.corp.intel.com ([10.239.196.243]) by fmsmga006.fm.intel.com with ESMTP; 22 Sep 2019 18:42:59 -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: Mon, 23 Sep 2019 09:42:21 +0800 Message-Id: <20190923014221.14780-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: a8fCi2Xxiew6DyjDIVhPveGhx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1569202981; bh=Z33f8wU2QZayxUPnkLKxmvctFue7HqZMLHFWDzVuwXU=; h=Cc:Date:From:Reply-To:Subject:To; b=YNwFcFO1XpW3Q5JTOgSzSEu0LJvA4JxVvUUnW4/YYSVbltww5wrmpe+hSVOeojuP9vR Sx3JsqwTB+LJdjgHqBkluPy5w2lwvXoDVvq0vlvub9W4VRlxoGN9SNwjZwqchb7zQxnU5 nOCIJpWl2AOWiXhfOqodgvmNVL9tHWbIK1M= 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 Cc: Heinrich Schuchardt Cc: Supreeth Venkatesh Cc: Eric Jin Signed-off-by: xianhui liu Reviewed-by: Eric Jin --- .../BlackBoxTest/SimpleNetworkBBTestFunction.c | 64 +++++++++++-------= ---- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/Black= BoxTest/SimpleNetworkBBTestFunction.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/P= rotocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestFunction.c index 133ef8a9..563e5361 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestFunction.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/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 (#47783): https://edk2.groups.io/g/devel/message/47783 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-