From: "Marcin Wojtas" <mw@semihalf.com>
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-platforms PATCH 2/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpReceiveFilters
Date: Mon, 14 Mar 2022 16:38:31 +0100 [thread overview]
Message-ID: <20220314153837.1885852-3-mw@semihalf.com> (raw)
In-Reply-To: <20220314153837.1885852-1-mw@semihalf.com>
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 <mw@semihalf.com>
---
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 == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ SavedTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
+ Pp2Context = INSTANCE_FROM_SNP(This);
+
+ /* Check whether the driver was started and initialized. */
+ if (This->Mode->State != 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->Instance));
+ 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) != 0) {
+ ReturnUnlock (SavedTpl, EFI_INVALID_PARAMETER);
+ }
+
+ if (!ResetMCastFilter &&
+ (Disable & EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST) == 0 &&
+ (Enable & EFI_SIMPLE_NETWORK_RECEIVE_MULTICAST) != 0) {
+ if (MCastFilterCnt == 0 ||
+ MCastFilterCnt > This->Mode->MaxMCastFilterCount ||
+ MCastFilter == NULL) {
+ ReturnUnlock (SavedTpl, EFI_INVALID_PARAMETER);
+ }
+
+ for (Count = 0; Count < MCastFilterCnt; Count++) {
+ if ((MCastFilter[Count].Addr[0] & 1) == 0) {
+ ReturnUnlock (SavedTpl, EFI_INVALID_PARAMETER);
+ }
+ CopyMem (&This->Mode->MCastFilter[Count],
+ &MCastFilter[Count],
+ sizeof (EFI_MAC_ADDRESS));
+ }
+ This->Mode->MCastFilterCount = MCastFilterCnt;
+ } else if (ResetMCastFilter) {
+ This->Mode->MCastFilterCount = 0;
+ }
+
+ This->Mode->ReceiveFilterSetting |= Enable;
+ This->Mode->ReceiveFilterSetting &= ~Disable;
+
+ ReturnUnlock (SavedTpl, EFI_SUCCESS);
}
EFI_STATUS
--
2.29.0
next prev parent reply other threads:[~2022-03-14 15:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-14 15:38 [edk2-platforms PATCH 0/8] Marvell Pp2Dxe fixes Marcin Wojtas
2022-03-14 15:38 ` [edk2-platforms PATCH 1/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpShutdown Marcin Wojtas
2022-03-14 15:38 ` Marcin Wojtas [this message]
2022-03-14 15:38 ` [edk2-platforms PATCH 3/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpStart & Pp2SnpStop Marcin Wojtas
2022-03-14 15:38 ` [edk2-platforms PATCH 4/8] Marvell/Drivers: Pp2Dxe: Implement Pp2SnpIpToMac Marcin Wojtas
2022-03-14 15:38 ` [edk2-platforms PATCH 5/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpGetStatus Marcin Wojtas
2022-03-14 15:38 ` [edk2-platforms PATCH 6/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpTransmit Marcin Wojtas
2022-03-14 15:38 ` [edk2-platforms PATCH 7/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpReset Marcin Wojtas
2022-03-14 15:38 ` [edk2-platforms PATCH 8/8] Marvell/Drivers: Pp2Dxe: Fix Pp2SnpReceive Marcin Wojtas
2022-04-06 20:01 ` [edk2-platforms PATCH 0/8] Marvell Pp2Dxe fixes Marcin Wojtas
2022-04-07 10:51 ` Sunny Wang
2022-04-20 8:26 ` Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220314153837.1885852-3-mw@semihalf.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox