From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87540+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87540+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272334; cv=none; d=zohomail.com; s=zohoarc; b=OvrS6pCSjaZ3YEHtTfbnhuJdJwqxgj4WW6mcRIevzMEdcQu1CBx1WKCeRAJMOywR6F0gyHlc1z2MGwIqcon8BoPWFaspmVZd5vQV2ntI9wSMGdcNmK+BQpYJM1KX7VI7AaYYgBiVUBpMnN+vH8dLj4C1lusGr/c/4PFSy9LxqnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272334; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=BusS4bOwbwUCNkGxE+3sQ4lnI6lptyvrYeTkJcdcqCk=; b=gIUtowmOcpTBwD/yxMn+kZ6oGDrPTe5VMJbDSlIb1EuUvfCpBPWFfVKETrCOAtF+eLJp3g/vSmbCmBA8qbUts3G4Onnglhz2Hs4iKuLNuT8iNimG4Nv1kcaCzzjGuDcCCTp7T9tIkraM64zYJynqR5mliGEsBoAL3urgYoUdS0g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87540+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272334618963.0056398696739; Mon, 14 Mar 2022 08:38:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id l8sQYY1788612xDIz30kpsCr; Mon, 14 Mar 2022 08:38:54 -0700 X-Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by mx.groups.io with SMTP id smtpd.web11.27839.1647272333274262389 for ; Mon, 14 Mar 2022 08:38:53 -0700 X-Received: by mail-lf1-f51.google.com with SMTP id bu29so28020448lfb.0 for ; Mon, 14 Mar 2022 08:38:53 -0700 (PDT) X-Gm-Message-State: SYQripemNSClnoUFh7Kj0XoMx1787277AA= X-Google-Smtp-Source: ABdhPJzKHQJDqj4OW+S26CjniU4SNLM5biTM5+55QmWl1pPcwsVE+uMgZrEBZEo+QdUYtHMKphzFFA== X-Received: by 2002:a05:6512:104a:b0:448:67ce:d718 with SMTP id c10-20020a056512104a00b0044867ced718mr12408608lfb.26.1647272331556; Mon, 14 Mar 2022 08:38:51 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:51 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 1/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpShutdown Date: Mon, 14 Mar 2022 16:38:30 +0100 Message-Id: <20220314153837.1885852-2-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272334; bh=yKLjICC8108yGD345h8XmPzWQWJBZiSkTFp85m7Rsxo=; h=Cc:Date:From:Reply-To:Subject:To; b=gvb5fpI3VHEvQDi3YPB0DLaV7GIuw5scpXlC6fO/dQLShpMWPBLvdsvLl2QlZTkhcSu UPvwCE3e64w6PnpoqnN/V2PAAfoSPnHykAp3vzvvZ7a2/5CCXSzVmc+b96X9Dno3nEiP7 3UfnWlZwXAUwjtlx9mWKDtakiYsxnl4fR6s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647273237684100002 Content-Type: text/plain; charset="utf-8" The SnpShutdown callback requires updating the instance state and also disabling hardware interfaces. For that purpose reuse Pp2Halt routine. Signed-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 50 +++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 0872f17889..30e091f807 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -633,14 +633,12 @@ Pp2SnpReset ( return EFI_SUCCESS; } =20 +STATIC VOID -EFIAPI Pp2DxeHalt ( - IN EFI_EVENT Event, - IN VOID *Context + IN PP2DXE_CONTEXT *Pp2Context ) { - PP2DXE_CONTEXT *Pp2Context =3D Context; PP2DXE_PORT *Port =3D &Pp2Context->Port; MVPP2_SHARED *Mvpp2Shared =3D Pp2Context->Port.Priv; INTN Index; @@ -661,30 +659,58 @@ Pp2DxeHalt ( MvGop110PortDisable(Port); } =20 +VOID +EFIAPI +Pp2DxeHaltEvent ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + PP2DXE_CONTEXT *Pp2Context =3D Context; + + Pp2DxeHalt (Pp2Context); +} + EFI_STATUS EFIAPI Pp2SnpShutdown ( IN EFI_SIMPLE_NETWORK_PROTOCOL *This ) { + PP2DXE_CONTEXT *Pp2Context; EFI_TPL SavedTpl; + + /* Check Snp Instance. */ + if (This =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); - PP2DXE_CONTEXT *Pp2Context =3D INSTANCE_FROM_SNP(This); - UINT32 State =3D This->Mode->State; =20 - if (State !=3D EfiSimpleNetworkInitialized) { - switch (State) { + Pp2Context =3D INSTANCE_FROM_SNP (This); + + /* Check whether the driver was started and initialized. */ + if (This->Mode->State !=3D EfiSimpleNetworkInitialized) { + switch (This->Mode->State) { case EfiSimpleNetworkStopped: - DEBUG((DEBUG_WARN, "Pp2Dxe%d: not started\n", Pp2Context->Instance)); + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not started\n", Pp2Context->Instance)= ); ReturnUnlock (SavedTpl, EFI_NOT_STARTED); case EfiSimpleNetworkStarted: - /* Fall through */ + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not initialized\n", Pp2Context->Insta= nce)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); default: - DEBUG((DEBUG_ERROR, "Pp2Dxe%d: wrong state\n", Pp2Context->Instance)= ); + DEBUG ((DEBUG_WARN, + "Pp2Dxe%d: wrong state: %u\n", + Pp2Context->Instance, + This->Mode->State)); ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); } } =20 + Pp2DxeHalt (Pp2Context); + + This->Mode->State =3D EfiSimpleNetworkStarted; + ReturnUnlock (SavedTpl, EFI_SUCCESS); } =20 @@ -1458,7 +1484,7 @@ Pp2DxeInitialiseController ( Status =3D gBS->CreateEvent ( EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_NOTIFY, - Pp2DxeHalt, + Pp2DxeHaltEvent, Pp2Context, &Pp2Context->EfiExitBootServicesEvent ); --=20 2.29.0 -=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 (#87540): https://edk2.groups.io/g/devel/message/87540 Mute This Topic: https://groups.io/mt/89776250/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- From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87541+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87541+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272335; cv=none; d=zohomail.com; s=zohoarc; b=IW+xoJdBX8axOKk31YJOyUgHAii8OpYIlkAs9Ne6kivMqRxkZRup3MSLhLvphvdUtvWiiWO+0mUOpK5fiByWA5lvo7v5KdFkLqtmpsgRayJ3ooL7sJ+zyJqOjEI0703mN1sljrEp3nFTvRllwn/RRpQhMD/DwCNMrwh56Ul0I+Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272335; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=xJFUp9asAuKj5Bkfmv2wgX0dzZw+NSZlFDUuS9gzAK4=; b=Yu9uEf/Qh6iCT2RMPYRwj0Nx3r590odVH+yCscdpjv2VRwFZWa42ye9BoTiU2YCyuYdenYpuuB975EjD1Ceqm6hmytFy3qp9jfnlL8JnM8oH7KBK+wzkch5O/AIKAt5dM+o5UHNh8AzQtuwamRqKaeIEEWSu6FRgAnRcsj5Co5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87541+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272335841178.90288869557594; Mon, 14 Mar 2022 08:38:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id H8lEYY1788612xg4Vs5yAhvE; Mon, 14 Mar 2022 08:38:55 -0700 X-Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by mx.groups.io with SMTP id smtpd.web09.27887.1647272334527429946 for ; Mon, 14 Mar 2022 08:38:54 -0700 X-Received: by mail-lf1-f54.google.com with SMTP id n19so27846531lfh.8 for ; Mon, 14 Mar 2022 08:38:54 -0700 (PDT) X-Gm-Message-State: TX1eeiXYsBxnobWJmwtrKOQVx1787277AA= X-Google-Smtp-Source: ABdhPJx5D2N5kbGMQ6lT/On9rBkK1ddcj/ze3o6FxpFXd+GTf9Qt6xjOGR5e00zoFMvMOkP2wHKVhw== X-Received: by 2002:ac2:544e:0:b0:448:4baf:a9e8 with SMTP id d14-20020ac2544e000000b004484bafa9e8mr13941566lfn.63.1647272332691; Mon, 14 Mar 2022 08:38:52 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:52 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 2/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpReceiveFilters Date: Mon, 14 Mar 2022 16:38:31 +0100 Message-Id: <20220314153837.1885852-3-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272335; bh=llfPlE6eyorU/S93PH/IbUv1Oxqv1gUBUqSrjLt/UDM=; h=Cc:Date:From:Reply-To:Subject:To; b=Dwt/1YELeaLkwC15PCMThgkWNfVnv8Zseo8Ycwba+dqIzmXnj8ace16d9Gjz0KvkXqv 4ucbUQC2Iv0iL52bkR1y2En29lT+0T40ruH7Jpcmc9dVitnyCT7SKrtUPJuG+3jDCpBWc yiyE+j1GCPQOM3k2l+vMx6NttbXJvz7kxzs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647272336467100007 Content-Type: text/plain; charset="utf-8" Until now the Pp2SnpReceiveFilters callback unconditionally returned EFI_SUCCESS. Allow proper handling of the input values on the protocol level. Keep the HW registers intact. Signed-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 62 +++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 30e091f807..3e09fafc4c 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -725,7 +725,67 @@ Pp2SnpReceiveFilters ( IN EFI_MAC_ADDRESS *MCastFilter OPTIONAL ) { - return EFI_SUCCESS; + PP2DXE_CONTEXT *Pp2Context; + EFI_TPL SavedTpl; + UINTN Count; + + /* Check Snp Instance. */ + if (This =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); + + Pp2Context =3D INSTANCE_FROM_SNP(This); + + /* Check whether the driver was started and initialized. */ + if (This->Mode->State !=3D EfiSimpleNetworkInitialized) { + switch (This->Mode->State) { + case EfiSimpleNetworkStopped: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not started\n", Pp2Context->Instance)= ); + ReturnUnlock (SavedTpl, EFI_NOT_STARTED); + case EfiSimpleNetworkStarted: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not initialized\n", Pp2Context->Insta= nce)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + default: + DEBUG ((DEBUG_WARN, + "Pp2Dxe%d: wrong state: %u\n", + Pp2Context->Instance, + This->Mode->State)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + } + } + + if (((Enable | Disable) & ~This->Mode->ReceiveFilterMask) !=3D 0) { + ReturnUnlock (SavedTpl, EFI_INVALID_PARAMETER); + } + + if (!ResetMCastFilter && + (Disable & EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST) =3D=3D 0 && + (Enable & EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST) !=3D 0) { + if (MCastFilterCnt =3D=3D 0 || + MCastFilterCnt > This->Mode->MaxMCastFilterCount || + MCastFilter =3D=3D NULL) { + ReturnUnlock (SavedTpl, EFI_INVALID_PARAMETER); + } + + for (Count =3D 0; Count < MCastFilterCnt; Count++) { + if ((MCastFilter[Count].Addr[0] & 1) =3D=3D 0) { + ReturnUnlock (SavedTpl, EFI_INVALID_PARAMETER); + } + CopyMem (&This->Mode->MCastFilter[Count], + &MCastFilter[Count], + sizeof (EFI_MAC_ADDRESS)); + } + This->Mode->MCastFilterCount =3D MCastFilterCnt; + } else if (ResetMCastFilter) { + This->Mode->MCastFilterCount =3D 0; + } + + This->Mode->ReceiveFilterSetting |=3D Enable; + This->Mode->ReceiveFilterSetting &=3D ~Disable; + + ReturnUnlock (SavedTpl, EFI_SUCCESS); } =20 EFI_STATUS --=20 2.29.0 -=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 (#87541): https://edk2.groups.io/g/devel/message/87541 Mute This Topic: https://groups.io/mt/89776251/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- From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87542+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87542+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272336; cv=none; d=zohomail.com; s=zohoarc; b=VCc/fkybtUkUvisdDTJ0rR/MKhETlevFn0uxGgTiTPda90ThCKLwC8EGHNI3k7/O80nh4+hbgFDZ7AIi3a57MvDULenK5TcopRr3wCk9GeJ9VCmws4pWKdv4E2hvxo5bstXRLcadJVwyNP2rq8PO/U9FOlghtdcJP2ovMHSoGaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272336; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=OHkY3OE3gT95OLrQm2ue9CpvDTYCxg1AMKP4f25AEaI=; b=GmqRPqPzWaDzEbr+/ZBN9x7e9kdxwY6K170jUZ6kXWswWsVK397yJkGDSmcY7VeAWMOS7nAXigYfXOi4clBkRsw3TQXZtmBZCcb0YcvsDHS3zxvTjdi7iLKnP47mPLOhOTolO0Cb1uCuhvZRMJZ1KMovDWGzUfrjuTG8hzY1mOA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87542+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272336926605.3243100046271; Mon, 14 Mar 2022 08:38:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jedUYY1788612xniy3q9DYVm; Mon, 14 Mar 2022 08:38:56 -0700 X-Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by mx.groups.io with SMTP id smtpd.web10.27653.1647272335721630571 for ; Mon, 14 Mar 2022 08:38:56 -0700 X-Received: by mail-lf1-f49.google.com with SMTP id bt26so27901553lfb.3 for ; Mon, 14 Mar 2022 08:38:55 -0700 (PDT) X-Gm-Message-State: JuE1nwkcs0l11aC74Ex46Snfx1787277AA= X-Google-Smtp-Source: ABdhPJz96KRXfeVrhXObx17kOUrGwuxHTNlOpiQA6eDbFBYCLlc6Cxe6FCEtZNq6j2iH6Rd1X0pirw== X-Received: by 2002:a05:6512:401f:b0:448:429f:186a with SMTP id br31-20020a056512401f00b00448429f186amr13886181lfb.414.1647272333867; Mon, 14 Mar 2022 08:38:53 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:53 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 3/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpStart & Pp2SnpStop Date: Mon, 14 Mar 2022 16:38:32 +0100 Message-Id: <20220314153837.1885852-4-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272336; bh=EysDVnmLRGoU35i/0Yyq42lq9bS1VFZKBZe3nHp147s=; h=Cc:Date:From:Reply-To:Subject:To; b=in3haW7jc5jMObmvdQohrPq9w6vK1qZavIiox5lElRFjMaRt+STULWugzNeGUTC4XGm cbwC69QGqA88YGCUB8K9zc2lbJUY+vFBToTireAmj58UZgcbh4La0C1ENFVNd2UEwSCIf 7gzLpASxpApvM+1fwS5Q6XOFYmtrEGJdNVM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647272338483100015 Content-Type: text/plain; charset="utf-8" Add sanity check if the SNP instance pointer is not NULL in SnpStart/Stop callbacks. Signed-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 23 +++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 3e09fafc4c..5f487c4dc6 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -575,11 +575,19 @@ Pp2SnpStart ( ) { PP2DXE_CONTEXT *Pp2Context; - UINT32 State =3D This->Mode->State; EFI_TPL SavedTpl; + UINT32 State; + + /* Check Snp Instance. */ + if (This =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + =20 SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); + Pp2Context =3D INSTANCE_FROM_SNP(This); + State =3D This->Mode->State; =20 if (State !=3D EfiSimpleNetworkStopped) { switch (State) { @@ -604,9 +612,18 @@ Pp2SnpStop ( ) { EFI_TPL SavedTpl; + PP2DXE_CONTEXT *Pp2Context; + UINT32 State; + + // Check Snp Instance + if (This =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); - PP2DXE_CONTEXT *Pp2Context =3D INSTANCE_FROM_SNP(This); - UINT32 State =3D This->Mode->State; + + Pp2Context =3D INSTANCE_FROM_SNP(This); + State =3D This->Mode->State; =20 if (State !=3D EfiSimpleNetworkStarted && State !=3D EfiSimpleNetworkIni= tialized) { switch (State) { --=20 2.29.0 -=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 (#87542): https://edk2.groups.io/g/devel/message/87542 Mute This Topic: https://groups.io/mt/89776252/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- From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87543+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87543+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272337; cv=none; d=zohomail.com; s=zohoarc; b=IbURI0ACAolVrbHJi9YSGhe291Qvc9ldNMOfYoQZU0c84age04qu80swSpgxr0LHiUksoceTQ9XjlIGbKdFXrVSI/LEZmwqoB1JBbMnyOR7VsjA/mqxDDw5e8hzH8ojQSWdCf+4Lw1Ty+8cAnGe5NIvvmwRpwi+wCzBaGcQ4bes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272337; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=rDsw+WWhsw9ByiSaymu2iBNopGvJkPjT9uaLoEYYuXE=; b=CLVagLoaobWkw7w6XYffD9ErsWb7DWNSjJ0U7oP5M/gG7Autb9ZTIHuRjFkzwB7DbGDJ2Nb6/YXfcev4DKyX5jBDiXbuJKc3nLAWtnApFS0IitNRT/CUz53o5HfAhaN2Oc1ABkOFOyhfh4wOFI+A0CzRyKxuHi8Da4/X5m4BMhY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87543+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272337837226.31447846201615; Mon, 14 Mar 2022 08:38:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AOwdYY1788612xdZ0DgnhfUV; Mon, 14 Mar 2022 08:38:57 -0700 X-Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by mx.groups.io with SMTP id smtpd.web12.27703.1647272336695866379 for ; Mon, 14 Mar 2022 08:38:57 -0700 X-Received: by mail-lf1-f44.google.com with SMTP id g17so27904098lfh.2 for ; Mon, 14 Mar 2022 08:38:56 -0700 (PDT) X-Gm-Message-State: 3cw9E45fiAnbH7t3VGWUqzosx1787277AA= X-Google-Smtp-Source: ABdhPJz6QCF/txB/O42ENBt3SRPW5z91Z5b0vn3QyzGC2DcPIj63sQzuDy+d1XM9dAxKkaADk7RyPA== X-Received: by 2002:a05:6512:1511:b0:448:36d9:df26 with SMTP id bq17-20020a056512151100b0044836d9df26mr13624247lfb.652.1647272334973; Mon, 14 Mar 2022 08:38:54 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:54 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 4/8] Marvell/Drivers: Pp2Dxe: Implement Pp2SnpIpToMac Date: Mon, 14 Mar 2022 16:38:33 +0100 Message-Id: <20220314153837.1885852-5-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272337; bh=b115GRlXU++jnSxqSZQ8Gv93ydzcSUjB7Ad0jRzdlhM=; h=Cc:Date:From:Reply-To:Subject:To; b=t7qH9JQMelOpmgpt6TKiatqAqsZVq5CyzG9GDgc5FPYC+VnhQ/Zbz0X5RyR/Y/tPtWU OzSd758TrMo+UIqmgmfSWmPUbWKdtqmGpWei3QjK69h4HTO8UckHKndYM4GxSFMBbi9tz sMdQ0+KpwKnMDY5BsuDutLha1GUCkDdQtkg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647272338507100016 Content-Type: text/plain; charset="utf-8" The SNP MCastIpToMac callback was unsupported in Pp2Dxe driver. Implement it. Signed-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 81 +++++++++++++++++++- 1 file changed, 77 insertions(+), 4 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 5f487c4dc6..91cd573b87 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -889,12 +889,85 @@ EFI_STATUS EFIAPI Pp2SnpIpToMac ( IN EFI_SIMPLE_NETWORK_PROTOCOL *This, - IN BOOLEAN IPv6, - IN EFI_IP_ADDRESS *IP, - OUT EFI_MAC_ADDRESS *MAC + IN BOOLEAN IsIpv6, + IN EFI_IP_ADDRESS *Ip, + OUT EFI_MAC_ADDRESS *McastMac ) { - return EFI_UNSUPPORTED; + PP2DXE_CONTEXT *Pp2Context; + EFI_TPL SavedTpl; + + /* Check Snp Instance. */ + if (This =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); + + Pp2Context =3D INSTANCE_FROM_SNP (This); + + /* Check that driver was started and initialised. */ + if (This->Mode->State !=3D EfiSimpleNetworkInitialized) { + switch (This->Mode->State) { + case EfiSimpleNetworkStopped: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not started\n", Pp2Context->Instance)= ); + ReturnUnlock (SavedTpl, EFI_NOT_STARTED); + case EfiSimpleNetworkStarted: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not initialized\n", Pp2Context->Insta= nce)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + default: + DEBUG ((DEBUG_WARN, + "Pp2Dxe%d: wrong state: %u\n", + Pp2Context->Instance, + This->Mode->State)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + } + } + + /* Check parameters. */ + if ((McastMac =3D=3D NULL) || (Ip =3D=3D NULL)) { + ReturnUnlock (SavedTpl, EFI_INVALID_PARAMETER); + } + + /* Make sure MAC address is empty. */ + ZeroMem (McastMac, sizeof(EFI_MAC_ADDRESS)); + + /* If we need ipv4 address. */ + if (!IsIpv6) { + /* + * Most significant 25 bits of a multicast HW address are set. + * 01-00-5E is the IPv4 Ethernet Multicast Address (see RFC 1112). + */ + McastMac->Addr[0] =3D 0x01; + McastMac->Addr[1] =3D 0x00; + McastMac->Addr[2] =3D 0x5E; + + /* + * Lower 23 bits from ipv4 address + * Clear the most significant bit (25th bit of MAC must be 0). + */ + McastMac->Addr[3] =3D Ip->v4.Addr[1] & 0x7F; + McastMac->Addr[4] =3D Ip->v4.Addr[2]; + McastMac->Addr[5] =3D Ip->v4.Addr[3]; + } else { + /* + * Most significant 16 bits of multicast v6 HW address are set + * 33-33 is the IPv6 Ethernet Multicast Address (see RFC 2464). + */ + McastMac->Addr[0] =3D 0x33; + McastMac->Addr[1] =3D 0x33; + + /* Lower four octets are taken from ipv6 address. */ + McastMac->Addr[2] =3D Ip->v6.Addr[8]; + McastMac->Addr[3] =3D Ip->v6.Addr[9]; + McastMac->Addr[4] =3D Ip->v6.Addr[10]; + McastMac->Addr[5] =3D Ip->v6.Addr[11]; + } + + /* Restore TPL and return. */ + gBS->RestoreTPL (SavedTpl); + + return EFI_SUCCESS; } =20 EFI_STATUS --=20 2.29.0 -=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 (#87543): https://edk2.groups.io/g/devel/message/87543 Mute This Topic: https://groups.io/mt/89776253/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- From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87544+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87544+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272339; cv=none; d=zohomail.com; s=zohoarc; b=UQHvK5ZB830yX4TnqQX4Dq+T99IPDsc21tqttnJiUQXW8YHE9badOOZGViuWDdhxDQGBgNRz92sjD5Gu02EwrjqGSg/MN2wwNkWwu/gYl5NARsu0RlJl8wcT/PqZnp9cZPARqyufVYlQ7bQ3gNWHvgKOtHGdZZT5m+AAUdwfMaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272339; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=QmI1AaXY1Xcr1fwPK7rKF2Y+/xm/XRBS3LWEt14jBH0=; b=TvcgXbSyoFpiNbQvHucwIQwPKTUz+7w9E+i2phKpNAcviFHZf5PBcvq11KxLtEnMOQC1hpFDZVdL/1gRjqVwtoqkh3Vjb31xhKpYKTYrRffULJzNemPK0jvuwbIJGWPs9cKXw9jCBuarYp98Oy4mZK0n3ICbMzqXStx4jbZBYPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87544+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272339441421.7384443891606; Mon, 14 Mar 2022 08:38:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id iKmYYY1788612xb4xCCmamhn; Mon, 14 Mar 2022 08:38:59 -0700 X-Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by mx.groups.io with SMTP id smtpd.web10.27655.1647272337847442844 for ; Mon, 14 Mar 2022 08:38:58 -0700 X-Received: by mail-lj1-f176.google.com with SMTP id q5so22476947ljb.11 for ; Mon, 14 Mar 2022 08:38:57 -0700 (PDT) X-Gm-Message-State: aAhENplvVyFMJJHmf0pveGWQx1787277AA= X-Google-Smtp-Source: ABdhPJx7ZiWwtCDYgQFNu0lONVW0YPJl235VWwixQH220kmYkXN6j2GsDJ+ZvX6Y59jofLAnAMyK3A== X-Received: by 2002:a2e:3914:0:b0:247:f8fa:5070 with SMTP id g20-20020a2e3914000000b00247f8fa5070mr14613308lja.191.1647272336095; Mon, 14 Mar 2022 08:38:56 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:55 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 5/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpGetStatus Date: Mon, 14 Mar 2022 16:38:34 +0100 Message-Id: <20220314153837.1885852-6-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272339; bh=HnBKMp7qgHD1QPEzmyCnAcWhJ9OZwQXycwZynegPmlo=; h=Cc:Date:From:Reply-To:Subject:To; b=cWt1/D5XrFIUKtrxKmkF1qK9MjiWEL0Jhy/M3WtuFhLAsOEj3qdiiOQz8vbS6TX7AQz yiO0zas9ixpi3vaepSwCP0R+tPo69E/SdvVmvyVbAlxT9GkIgKc8L652g6mwRINHeiYle F7MyTomQcD4a6rVLV4BvDY0zlSaPGsTKPK0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647272340690100001 Content-Type: text/plain; charset="utf-8" This patch adds missing parameter's and SNP instance status checks in SnpGetStatus callback. Signed-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 31 ++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 91cd573b87..8a4c4545c8 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -991,16 +991,43 @@ Pp2SnpGetStatus ( OUT VOID **TxBuf OPTIONAL ) { - PP2DXE_CONTEXT *Pp2Context =3D INSTANCE_FROM_SNP(Snp); - PP2DXE_PORT *Port =3D &Pp2Context->Port; + PP2DXE_CONTEXT *Pp2Context; + PP2DXE_PORT *Port; BOOLEAN LinkUp; EFI_TPL SavedTpl; =20 + /* Check Snp Instance. */ + if (Snp =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); =20 + Pp2Context =3D INSTANCE_FROM_SNP (Snp); + + /* Check whether the driver was started and initialized. */ + if (Snp->Mode->State !=3D EfiSimpleNetworkInitialized) { + switch (Snp->Mode->State) { + case EfiSimpleNetworkStopped: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not started\n", Pp2Context->Instance)= ); + ReturnUnlock (SavedTpl, EFI_NOT_STARTED); + case EfiSimpleNetworkStarted: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not initialized\n", Pp2Context->Insta= nce)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + default: + DEBUG ((DEBUG_WARN, + "Pp2Dxe%d: wrong state: %u\n", + Pp2Context->Instance, + Snp->Mode->State)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + } + } + if (!Pp2Context->Initialized) ReturnUnlock(SavedTpl, EFI_NOT_READY); =20 + Port =3D &Pp2Context->Port; + LinkUp =3D Port->AlwaysUp ? TRUE : MvGop110PortIsLinkUp(Port); =20 if (LinkUp !=3D Snp->Mode->MediaPresent) { --=20 2.29.0 -=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 (#87544): https://edk2.groups.io/g/devel/message/87544 Mute This Topic: https://groups.io/mt/89776255/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- From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87545+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87545+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272340; cv=none; d=zohomail.com; s=zohoarc; b=BgrvI7dkeUDPi5mz0JgNgja/xJOhSnliK45FdII6Lu3tGX5nbfOe25lsPnqzazoFFISxYIHHScz6kY//MhDiNfF4r2jbyuX4PWAX1+DxSGCTTHAHvJE22y2uzAIO63w1G70eianCgWV8aO2OSowslJNggc/UOx4++2uRRm50TJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272340; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=kDnN0Ph7zPDDV98Oia+1viAa0d2mtWc/F7y1u4IGvPs=; b=mJ5mNOWBXxeRjVneRrs/BcDG58uLFL90P54ZKgKXjU0T7/xAW4pGwrzR3DYw5KLilQ4wzAX0uaw4o6k/mpUsM8+NdNOcMiVOspY7cPoiA/kicvLIc2CBZvTzoC0au4VAzfvg/uCSAFk0DHcBQh0Kf+cGaT5Xxle2fxwYXcZfVEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87545+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272340903819.7841939034867; Mon, 14 Mar 2022 08:39:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id N807YY1788612xedr87MIbao; Mon, 14 Mar 2022 08:39:00 -0700 X-Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by mx.groups.io with SMTP id smtpd.web08.27467.1647272338987838684 for ; Mon, 14 Mar 2022 08:38:59 -0700 X-Received: by mail-lf1-f47.google.com with SMTP id bt26so27901896lfb.3 for ; Mon, 14 Mar 2022 08:38:58 -0700 (PDT) X-Gm-Message-State: Jld1H2r5xCiSYGL5IGKwJSJvx1787277AA= X-Google-Smtp-Source: ABdhPJz/FdmpoORZkqwSmN17PVLoC2P43JodCrkShMN0jyPOEwFNOEqRPz0dkS4EVwc127a3GiKC9A== X-Received: by 2002:a05:6512:308e:b0:448:5d75:9729 with SMTP id z14-20020a056512308e00b004485d759729mr13312078lfd.663.1647272337238; Mon, 14 Mar 2022 08:38:57 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:56 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 6/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpTransmit Date: Mon, 14 Mar 2022 16:38:35 +0100 Message-Id: <20220314153837.1885852-7-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272340; bh=r1yiUqCMM38wIvVtVxbvo+mqGsHPluxQMMNABmSbZTI=; h=Cc:Date:From:Reply-To:Subject:To; b=tpfZTOOHT1gi0QEkGls/hK56QhX+s3B84FO6mKj3alBxBnlHUoQcet6Ja2rxawBu5T+ zrIU2NJJJbnizA3eCfu9lCoOtVJv0HCk5TTmn2PWzH0ebitvoiMIS3vhtMuYFV7YrRQl+ M+wO8+/7KezG0AniGjVC0pNrDsAfrYx2YrI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647272344549100003 Content-Type: text/plain; charset="utf-8" Error checking for invalid input parameters was too hard. Replace ASSERT with returning error value. Moreover set EtherType only when we are sure it won't be dereferencing NULL pointer. Signed-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 8a4c4545c8..deb3f34625 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -1074,9 +1074,15 @@ Pp2SnpTransmit ( } =20 if (HeaderSize !=3D 0) { - ASSERT (HeaderSize =3D=3D This->Mode->MediaHeaderSize); - ASSERT (EtherTypePtr !=3D NULL); - ASSERT (DestAddr !=3D NULL); + if (HeaderSize !=3D This->Mode->MediaHeaderSize || + EtherTypePtr =3D=3D NULL || + DestAddr =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + } + + if (BufferSize < This->Mode->MediaHeaderSize) { + return EFI_BUFFER_TOO_SMALL; } =20 SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); @@ -1100,8 +1106,6 @@ Pp2SnpTransmit ( ReturnUnlock(SavedTpl, EFI_NOT_READY); } =20 - EtherType =3D HTONS (*EtherTypePtr); - /* Fetch next descriptor */ TxDesc =3D Mvpp2TxqNextDescGet(AggrTxq); =20 @@ -1118,6 +1122,8 @@ Pp2SnpTransmit ( else CopyMem(DataPtr + NET_ETHER_ADDR_LEN, &This->Mode->CurrentAddress, N= ET_ETHER_ADDR_LEN); =20 + EtherType =3D HTONS (*EtherTypePtr); + CopyMem(DataPtr + NET_ETHER_ADDR_LEN * 2, &EtherType, 2); } =20 --=20 2.29.0 -=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 (#87545): https://edk2.groups.io/g/devel/message/87545 Mute This Topic: https://groups.io/mt/89776256/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- From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87546+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87546+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1647272340592221.9307917166151; Mon, 14 Mar 2022 08:39:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id kNJEYY1788612x6inuB4xswx; Mon, 14 Mar 2022 08:39:01 -0700 X-Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mx.groups.io with SMTP id smtpd.web11.27842.1647272340092751863 for ; Mon, 14 Mar 2022 08:39:00 -0700 X-Received: by mail-lf1-f46.google.com with SMTP id n19so27847109lfh.8 for ; Mon, 14 Mar 2022 08:38:59 -0700 (PDT) X-Gm-Message-State: OpdNDNWioTuEvAyCaPrvUVxrx1787277AA= X-Google-Smtp-Source: ABdhPJz+L6q7IfA5Z5SKs7v4PeZ6GU3iB3Lh3fXfIvgRvbB7jvy/LK2dR9u4JizC9uhdjXlMENBgUw== X-Received: by 2002:a05:6512:a81:b0:445:c06b:a531 with SMTP id m1-20020a0565120a8100b00445c06ba531mr14090939lfu.364.1647272338339; Mon, 14 Mar 2022 08:38:58 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:58 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 7/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpReset Date: Mon, 14 Mar 2022 16:38:36 +0100 Message-Id: <20220314153837.1885852-8-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272341; bh=lCc8v8rpn0MEDADN61Okv2yAYR1eG+W2N39GWzU2HUE=; h=Cc:Date:From:Reply-To:Subject:To; b=VWItcQu1xIW95LfSidylrGm4IVCvzg1re8TAUandhYPVFiofv2t1tPRshCQp53hbVNN CJK+2wxYuCORuFKhmHuCxeyuTWZdgJTMWn1oxXBRRr5DVnqQfbNncdUaHDIrFWwNIGeUr eYS+8WW8JrgB0gg3z2ZrYR+okzvib77ueWI= X-ZohoMail-DKIM: fail (Signature date is -1 seconds in the future.) X-ZM-MESSAGEID: 1647272344558100004 Content-Type: text/plain; charset="utf-8" This patch adds missing parameter's and SNP instance status checks. igned-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 27 ++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index deb3f34625..841a1c8f84 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -647,6 +647,33 @@ Pp2SnpReset ( IN BOOLEAN ExtendedVerification ) { + PP2DXE_CONTEXT *Pp2Context; + + /* Check This Instance. */ + if (This =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + Pp2Context =3D INSTANCE_FROM_SNP (This); + + /* Check that driver was started and initialized. */ + if (This->Mode->State !=3D EfiSimpleNetworkInitialized) { + switch (This->Mode->State) { + case EfiSimpleNetworkStopped: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not started\n", Pp2Context->Instance)= ); + return EFI_NOT_STARTED; + case EfiSimpleNetworkStarted: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not initialized\n", Pp2Context->Insta= nce)); + return EFI_DEVICE_ERROR; + default: + DEBUG ((DEBUG_WARN, + "Pp2Dxe%d: wrong state: %u\n", + Pp2Context->Instance, + This->Mode->State)); + return EFI_DEVICE_ERROR; + } + } + return EFI_SUCCESS; } =20 --=20 2.29.0 -=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 (#87546): https://edk2.groups.io/g/devel/message/87546 Mute This Topic: https://groups.io/mt/89776258/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- From nobody Tue May 14 00:30:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+87547+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87547+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1647272343; cv=none; d=zohomail.com; s=zohoarc; b=Td2vgfAyi6t7HnjfXQjciiWE3XSJjVKPue68hLGcRI17LDhagVM22vf88zCViy3l5Tj8xCZoUzIKpQtMunrpAl20g4grQp25fQ4AA5IabzmBMynZiD1JCAHbMrCiFZJFAS42sKzMNcx51F6PnOZs0pAUV2n/H8+JlwLK/xan1CI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647272343; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ZC3+744O4XBHQPkuaaBoKXBW5uW2ZuFXxUlo7dDZ6f4=; b=lZyhTMjJFXswspLKqs+gl33dWTsjRZH/MR8BFeEtuywV10Kegv1prXNQW+uGBJK9782MM+imBZC5y4LZywucD52jTxmXbHNz7R4b6YpOkLBsZJoXwXKr+TQjzW7+NZaAA7bbKkZwBbLKc8CsKXPgC/4IcVbfBOyy/cYz4YFzN3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+87547+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16472723428647.715059189936369; Mon, 14 Mar 2022 08:39:02 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id SLpAYY1788612xcI9bR4W71F; Mon, 14 Mar 2022 08:39:02 -0700 X-Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by mx.groups.io with SMTP id smtpd.web09.27888.1647272341361631965 for ; Mon, 14 Mar 2022 08:39:01 -0700 X-Received: by mail-lj1-f171.google.com with SMTP id z26so22491521lji.8 for ; Mon, 14 Mar 2022 08:39:01 -0700 (PDT) X-Gm-Message-State: Wtmq8utCovsdlS4adWLE3o8bx1787277AA= X-Google-Smtp-Source: ABdhPJx4bt+61rYN0OVTY61Ef3BUmbSOiRZjr1f84Vg+N8I2BCZwI0eUZSF36drcMi++saqdTdJDpQ== X-Received: by 2002:a05:651c:1989:b0:247:933b:3938 with SMTP id bx9-20020a05651c198900b00247933b3938mr14281117ljb.228.1647272339521; Mon, 14 Mar 2022 08:38:59 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b8-20020ac25628000000b004484bd1be5esm3325401lff.256.2022.03.14.08.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Mar 2022 08:38:59 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: quic_llindhol@quicinc.com, ardb+tianocore@kernel.org, mw@semihalf.com, jaz@semihalf.com, gjb@semihalf.com, upstream@semihalf.com, sunny.Wang@arm.com Subject: [edk2-devel] [edk2-platforms PATCH 8/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpReceive Date: Mon, 14 Mar 2022 16:38:37 +0100 Message-Id: <20220314153837.1885852-9-mw@semihalf.com> In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com> References: <20220314153837.1885852-1-mw@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,mw@semihalf.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1647272342; bh=xtI+TqnO0mWaJTCYqrpQMC3nB3g0rcZV6PPjiS5ltP8=; h=Cc:Date:From:Reply-To:Subject:To; b=IEDQaq+6rNyHNHkDf+3ppA4TgkvHI3U2/TnookeFeP5ga4ApY6VyaXuiN8P3kJkhrhv ffESO/joAwWzshFjk4bncpDovAPwpms/uxyGA0GrO+/Z77Z7JeKXe5apPQ3uB/QX7Zlio HKtohRd15h6Clz4uJ4tb5Wh4/UjpFA7YF5g= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1647272344660100006 Content-Type: text/plain; charset="utf-8" This patch adds missing parameter's and SNP instance status checks in SnpReceive callback. Additionally, the local variables declarations are cleaned-up. Signed-off-by: Marcin Wojtas Reviewed-by: Sunny Wang --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 43 ++++++++++++++++---- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/= Drivers/Net/Pp2Dxe/Pp2Dxe.c index 841a1c8f84..5e463ac932 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -1214,23 +1214,50 @@ Pp2SnpReceive ( ) { INTN ReceivedPackets; - PP2DXE_CONTEXT *Pp2Context =3D INSTANCE_FROM_SNP(This); - PP2DXE_PORT *Port =3D &Pp2Context->Port; - MVPP2_SHARED *Mvpp2Shared =3D Pp2Context->Port.Priv; + PP2DXE_CONTEXT *Pp2Context; + PP2DXE_PORT *Port; UINTN PhysAddr, VirtAddr; - EFI_STATUS Status =3D EFI_SUCCESS; + EFI_STATUS Status; EFI_TPL SavedTpl; UINT32 StatusReg; INTN PoolId; UINTN PktLength; UINT8 *DataPtr; MVPP2_RX_DESC *RxDesc; - MVPP2_RX_QUEUE *Rxq =3D &Port->Rxqs[0]; + MVPP2_RX_QUEUE *Rxq; + + /* Check input parameters. */ + if (This =3D=3D NULL || Buffer =3D=3D NULL || BufferSize =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); + + Pp2Context =3D INSTANCE_FROM_SNP (This); =20 + /* Check whether the driver was started and initialized. */ + if (This->Mode->State !=3D EfiSimpleNetworkInitialized) { + switch (This->Mode->State) { + case EfiSimpleNetworkStopped: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not started\n", Pp2Context->Instance)= ); + ReturnUnlock (SavedTpl, EFI_NOT_STARTED); + case EfiSimpleNetworkStarted: + DEBUG ((DEBUG_WARN, "Pp2Dxe%d: not initialized\n", Pp2Context->Insta= nce)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + default: + DEBUG ((DEBUG_WARN, + "Pp2Dxe%d: wrong state: %u\n", + Pp2Context->Instance, + This->Mode->State)); + ReturnUnlock (SavedTpl, EFI_DEVICE_ERROR); + } + } + + Port =3D &Pp2Context->Port; ASSERT (Port !=3D NULL); + Rxq =3D &Port->Rxqs[0]; ASSERT (Rxq !=3D NULL); =20 - SavedTpl =3D gBS->RaiseTPL (TPL_CALLBACK); ReceivedPackets =3D Mvpp2RxqReceived(Port, Rxq->Id); =20 if (ReceivedPackets =3D=3D 0) { @@ -1285,10 +1312,12 @@ Pp2SnpReceive ( *EtherType =3D NTOHS (*(UINT16 *)(&DataPtr[12])); } =20 + Status =3D EFI_SUCCESS; + drop: /* Refill: pass packet back to BM */ PoolId =3D (StatusReg & MVPP2_RXD_BM_POOL_ID_MASK) >> MVPP2_RXD_BM_POOL_= ID_OFFS; - Mvpp2BmPoolPut(Mvpp2Shared, PoolId, PhysAddr, VirtAddr); + Mvpp2BmPoolPut (Pp2Context->Port.Priv, PoolId, PhysAddr, VirtAddr); =20 /* Update counters with 1 packet received and 1 packet refilled */ Mvpp2RxqStatusUpdate(Port, Rxq->Id, 1, 1); --=20 2.29.0 -=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 (#87547): https://edk2.groups.io/g/devel/message/87547 Mute This Topic: https://groups.io/mt/89776259/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-