From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmx.net header.s=badeba3b8450 header.b=Mi+951Nx; spf=pass (domain: gmx.de, ip: 212.227.17.22, mailfrom: xypron.glpk@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by groups.io with SMTP; Mon, 16 Sep 2019 22:09:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1568696981; bh=ZG7UCWpTyTRox0S8i0VIJDf3djrQscUYMAcJJwHVVJI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=Mi+951NxOod6Gpnkw6o/NKd/muMFnO/DksP6gXE4ILXd3IJ/F4/IHvAXF45ytwEHc QamDWxBMd2b+w5R/CVpwUJG3rWhAmRDCPdnDj1DqfT+cObB8RVg9VgOhU6+gh0ay85 i1ake21oqzJLniSeiSZGRWKK8X+ztBdWibJMOvwo= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.145.122]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MJXEd-1iD6gY0TZT-0032EG; Tue, 17 Sep 2019 07:09:41 +0200 From: "Heinrich Schuchardt" To: EDK II Development Cc: Eric Jin , Supreeth Venkatesh , Stephano Cetola , Heinrich Schuchardt Subject: [edk2-devel] [PATCH 1/1] uefi-sct/SctPkg: SNP ReceiveFilters may be unsupported Date: Tue, 17 Sep 2019 07:09:30 +0200 Message-Id: <20190917050930.3228-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:dV9tDlzh1tzVRlLO1RGki6BFQFzZPfbzHtRjlHmwmw1MuVwdwPP aBfJYnu5rr/xPQlb+5nYCeCUbh5Ct0SJKljPuJTVBOW1rbR8W0x+vTgdSQVkNVtVu82CPHa KbeMhEOieEoMwYjJCo3FECphazOC/kvg9IUNmwwvysJUFEFfeviLLtI5lORfb0P1gnbBWFH ZmY8M5WTRdGJg1cuX9BrQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:mzkSEwFKBbI=:WITS4HEbdpNU2FZMQMrAxy gUvpciKavUCt4HJ+idNm8PdLB3lveCnLYqQLLpn09gRGO857Vlg9OkFLrB9NocwX9POPBF7Su 1khg8YhMH3pycArE1mjD/1zpKR1oYIZa8ks786uaQ27k2RAMk9prw5xCtc+vI9orrHLhZSL3H h06dySFcpjUpKd0KE6qXWsQfc0qCHhzPW20VpPfSfkEERl1sw7m2rr7hmz7FnO2fm75LP661i U2OcMagkO7eA6V0wtmonx6GfR0mCtdhw1qYOY+YOmHQz6/Idym0a4QLk78RA8ZlknOPP1+sp5 7krbyr+yRfatIpHnKPCI8K/o0Jh3sDyKGka/kmZyro06sV4KQ9kcYvbPN2aKPfaFbTe1GM6Ex z7lvXMTRma8harSdhJzHy+9SBEIvlEHbAsk282UpvjsKbD2ZoE778poonD+Gt0Sf21uKX3+5c acVpSh/w7Oiy3fMyF5uK352PRiEwAzXre+u5bNJMCM5JcDu1CF5UpaquggjbqYhIlixxdaL3b q+1uiUBCU/1XX1I6aPhETYNH82Dhgb8QFP1WaxPcCD7IPOgsymCofWufND9lzxBupkTuaes4l evedp3jwWDlnLh6H35H1afDf3WaDWqbtoHDI07mjKPf4miCgZpKHYDdUhWZTc/qxXbLwHiY3d 8SPFNTCsIdbyoYQgZLzfqhcMIokNZrMTK30soADHpfPzTOfYDNAeo2PznwbF2o5iQWKfglHNA EOlJAh1PdF16n4DPcFzxKMvpRRf15OAEEV8plMivPMvf8P10UC4sF5k/M4tKa9DWOciN50Haa yaslN62llr1dkYqM5cy+oQAiVZ+qYrcERKRlgFUm1wCCsWg07//8D5KRFIcjPZbBUIX4YPrQW vijtf0WwBn3b4jNUVTx6GnQP2H+AkU86CoBdDmDPnCf4uvn3C6YSxvVn/7KNIqRYi0trlKqn0 IAaRmJKvAFTVh/2oTiFKBnC5O2O4XnLkj0GEOp0Cs4pPbkC8yjg0k9amZ5KqCpIl/uifnZ5Cw 8cStaf/7bZjOzvBThRaxNtGClZV1OScDIEF3S49qJ0VuJqTPAZoIWl6LRcren6eK6u7GdCui2 7VEecm+bDL+okM4h7Vok1hxoA72BCH5EDSGTje3glF7YUUUkFUWt/Wz4byDHBguzlKLIUMHtw MQzN6Ocm9AfbD5h74tl9KtablugTHs0Amb51SIqyS1cSst7Yxb1ONu+EVuiaUfGZZB5gdtaeC Kv5igqlMqWHYOr5SXp4gkFI5jMU3aniRNqCPq3bLpxiO6a3LRzoujLjz2v7I= Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2197 If EFI_SIMPLE_NETWORK.ReceiveFilters() is not supported, it will return EFI_UNSUPPORTED. In this case do not expect input parameters to be checked for conformance. Signed-off-by: Heinrich Schuchardt --- .../SimpleNetworkBBTestConformance.c | 223 +++++++++++------- 1 file changed, 138 insertions(+), 85 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/Black= BoxTest/SimpleNetworkBBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EF= I/Protocol/SimpleNetwork/BlackBoxTest/SimpleNetworkBBTestConformance.c index 9bd21a76..09b47ee6 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/SimpleNetwork/BlackBoxTest= /SimpleNetworkBBTestConformance.c @@ -626,22 +626,31 @@ BBTestReceiveFilterConformanceTest ( // Call ReceiveFilters() function if network interface not start.=0D //=0D Status =3D SnpInterface->ReceiveFilters (SnpInterface, 0, 0, FALSE, 0, N= ULL);=0D - if ((Status =3D=3D EFI_NOT_STARTED) && (SnpInterface->Mode->State =3D=3D= EfiSimpleNetworkStopped)) {=0D - AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + if (Status =3D=3D EFI_UNSUPPORTED) {=0D + StandardLib->RecordMessage(=0D + StandardLib,=0D + EFI_VERBOSE_LEVEL_QUIET,=0D + L"ReceiveFilters isn't supported, Status - %r\n",=0D + Status=0D + );=0D } else {=0D - AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D - }=0D + if ((Status =3D=3D EFI_NOT_STARTED) && (SnpInterface->Mode->State =3D= =3D EfiSimpleNetworkStopped)) {=0D + AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + } else {=0D + AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + }=0D =0D - StandardLib->RecordAssertion (=0D - StandardLib,=0D - AssertionType,=0D - gSimpleNetworkBBTestConformanceAssertionGuid006,=0D - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke Rec= eiveFilters() when network interface not start.",=0D - L"%a:%d:Status - %r",=0D - __FILE__,=0D - (UINTN)__LINE__,=0D - Status=0D - );=0D + StandardLib->RecordAssertion (=0D + StandardLib,=0D + AssertionType,=0D + gSimpleNetworkBBTestConformanceAssertionGuid006,=0D + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke R= eceiveFilters() when network interface not start.",=0D + L"%a:%d:Status - %r",=0D + __FILE__,=0D + (UINTN)__LINE__,=0D + Status=0D + );=0D + }=0D =0D //=0D // Assertion Point 5.6.2.2=0D @@ -653,22 +662,31 @@ BBTestReceiveFilterConformanceTest ( }=0D =0D Status =3D SnpInterface->ReceiveFilters (SnpInterface, 0, 0, FALSE, 0, N= ULL);=0D - if (Status =3D=3D EFI_DEVICE_ERROR) {=0D - AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + if (Status =3D=3D EFI_UNSUPPORTED) {=0D + StandardLib->RecordMessage(=0D + StandardLib,=0D + EFI_VERBOSE_LEVEL_QUIET,=0D + L"ReceiveFilters isn't supported, Status - %r\n",=0D + Status=0D + );=0D } else {=0D - AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D - }=0D + if (Status =3D=3D EFI_DEVICE_ERROR) {=0D + AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + } else {=0D + AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + }=0D =0D - StandardLib->RecordAssertion (=0D - StandardLib,=0D - AssertionType,=0D - gSimpleNetworkBBTestConformanceAssertionGuid007,=0D - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke Rec= eiveFilters() when network interface not initialized.",=0D - L"%a:%d:Status - %r",=0D - __FILE__,=0D - (UINTN)__LINE__,=0D - Status=0D - );=0D + StandardLib->RecordAssertion (=0D + StandardLib,=0D + AssertionType,=0D + gSimpleNetworkBBTestConformanceAssertionGuid007,=0D + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke R= eceiveFilters() when network interface not initialized.",=0D + L"%a:%d:Status - %r",=0D + __FILE__,=0D + (UINTN)__LINE__,=0D + Status=0D + );=0D + }=0D =0D //=0D // Assertion Point 5.6.2.3=0D @@ -683,22 +701,31 @@ BBTestReceiveFilterConformanceTest ( // Call ReceiveFilters with invalide Enable=0D //=0D Status =3D SnpInterface->ReceiveFilters (SnpInterface, ~(SnpInterface->M= ode->ReceiveFilterMask), 0, FALSE, 0, NULL);=0D - if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D - AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + if (Status =3D=3D EFI_UNSUPPORTED) {=0D + StandardLib->RecordMessage(=0D + StandardLib,=0D + EFI_VERBOSE_LEVEL_QUIET,=0D + L"ReceiveFilters isn't supported, Status - %r\n",=0D + Status=0D + );=0D } else {=0D - AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D - }=0D + if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D + AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + } else {=0D + AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + }=0D =0D - StandardLib->RecordAssertion (=0D - StandardLib,=0D - AssertionType,=0D - gSimpleNetworkBBTestConformanceAssertionGuid008,=0D - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke Rec= eiveFilters() with invalid Enable.",=0D - L"%a:%d:Status - %r",=0D - __FILE__,=0D - (UINTN)__LINE__,=0D - Status=0D - ); =0D + StandardLib->RecordAssertion (=0D + StandardLib,=0D + AssertionType,=0D + gSimpleNetworkBBTestConformanceAssertionGuid008,=0D + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke R= eceiveFilters() with invalid Enable.",=0D + L"%a:%d:Status - %r",=0D + __FILE__,=0D + (UINTN)__LINE__,=0D + Status=0D + );=0D + }=0D =0D //=0D // Call ReceiveFilters with invalide MCastFilterCnt=0D @@ -713,59 +740,85 @@ BBTestReceiveFilterConformanceTest ( MAC.Addr[5] =3D 0x02;=0D =0D Status =3D SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETW= ORK_RECEIVE_MULTICAST, 0, FALSE, SnpInterface->Mode->MaxMCastFilterCount + = 1, &MAC);=0D - if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D - AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + if (Status =3D=3D EFI_UNSUPPORTED) {=0D + StandardLib->RecordMessage(=0D + StandardLib,=0D + EFI_VERBOSE_LEVEL_QUIET,=0D + L"ReceiveFilters isn't supported, Status - %r\n",=0D + Status=0D + );=0D } else {=0D - AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D + AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + } else {=0D + AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + }=0D +=0D + StandardLib->RecordAssertion (=0D + StandardLib,=0D + AssertionType,=0D + gSimpleNetworkBBTestConformanceAssertionGuid009,=0D + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke= ReceiveFilters() with invalid MCastFilterCnt is greater than Snp->Mode->Ma= xMCastFilterCount.",=0D + L"%a:%d:Status - %r",=0D + __FILE__,=0D + (UINTN)__LINE__,=0D + Status=0D + );=0D }=0D =0D - StandardLib->RecordAssertion (=0D - StandardLib,=0D - AssertionType,=0D - gSimpleNetworkBBTestConformanceAssertionGuid009,=0D - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke R= eceiveFilters() with invalid MCastFilterCnt is greater than Snp->Mode->MaxM= CastFilterCount.",=0D - L"%a:%d:Status - %r",=0D - __FILE__,=0D - (UINTN)__LINE__,=0D - Status=0D - );=0D -=0D Status =3D SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETW= ORK_RECEIVE_MULTICAST, 0, FALSE, 0, &MAC);=0D - if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D - AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + if (Status =3D=3D EFI_UNSUPPORTED) {=0D + StandardLib->RecordMessage(=0D + StandardLib,=0D + EFI_VERBOSE_LEVEL_QUIET,=0D + L"ReceiveFilters isn't supported, Status - %r\n",=0D + Status=0D + );=0D } else {=0D - AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D + AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + } else {=0D + AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + }=0D +=0D + StandardLib->RecordAssertion (=0D + StandardLib,=0D + AssertionType,=0D + gSimpleNetworkBBTestConformanceAssertionGuid043,=0D + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke= ReceiveFilters() with invalid MCastFilterCnt is 0.",=0D + L"%a:%d:Status - %r",=0D + __FILE__,=0D + (UINTN)__LINE__,=0D + Status=0D + );=0D }=0D =0D - StandardLib->RecordAssertion (=0D - StandardLib,=0D - AssertionType,=0D - gSimpleNetworkBBTestConformanceAssertionGuid043,=0D - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke R= eceiveFilters() with invalid MCastFilterCnt is 0.",=0D - L"%a:%d:Status - %r",=0D - __FILE__,=0D - (UINTN)__LINE__,=0D - Status=0D - );=0D -=0D Status =3D SnpInterface->ReceiveFilters (SnpInterface, EFI_SIMPLE_NETW= ORK_RECEIVE_MULTICAST, 0, FALSE, 1, NULL);=0D - if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D - AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + if (Status =3D=3D EFI_UNSUPPORTED) {=0D + StandardLib->RecordMessage(=0D + StandardLib,=0D + EFI_VERBOSE_LEVEL_QUIET,=0D + L"ReceiveFilters isn't supported, Status - %r\n",=0D + Status=0D + );=0D } else {=0D - AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + if (Status =3D=3D EFI_INVALID_PARAMETER) {=0D + AssertionType =3D EFI_TEST_ASSERTION_PASSED;=0D + } else {=0D + AssertionType =3D EFI_TEST_ASSERTION_FAILED;=0D + }=0D +=0D + StandardLib->RecordAssertion (=0D + StandardLib,=0D + AssertionType,=0D + gSimpleNetworkBBTestConformanceAssertionGuid010,=0D + L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invo= ke ReceiveFilters() with MCastFilterCnt not match MCastFilter.",=0D + L"%a:%d:Status - %r",=0D + __FILE__,=0D + (UINTN)__LINE__,=0D + Status=0D + );=0D }=0D -=0D - StandardLib->RecordAssertion (=0D - StandardLib,=0D - AssertionType,=0D - gSimpleNetworkBBTestConformanceAssertionGuid010,=0D - L"EFI_SIMPLE_NETWORK_PROTOCOL.ReceiveFilters - Invoke R= eceiveFilters() with MCastFilterCnt not match MCastFilter.",=0D - L"%a:%d:Status - %r",=0D - __FILE__,=0D - (UINTN)__LINE__,=0D - Status=0D - );=0D -=0D }=0D =0D //=0D --=20 2.23.0