[platforms PATCH 1/1] Marvell/Drivers: Pp2Dxe: Fix cleaning of the BM pools

[platforms PATCH 1/1] Marvell/Drivers: Pp2Dxe: Fix cleaning of the BM pools

[Marcin Wojtas]

Hitherto mechanism of using static flag indicating
Buffer Manager disabled state was wrong and resulted
in cleaning only one controller's pools. This caused
bad page state when OS booted and attempted to
use the buffers.

This patch implements a fix, ensuring all controllers
will clean the Buffer Manager during ExitBootServices.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
 Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 7 ++++---
 Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
index b0a38b3..3ed10f6 100644
--- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
@@ -258,6 +258,8 @@ Pp2DxeBmStart (
     }
   }
 
+  Mvpp2Shared->BmEnabled = TRUE;
+
   return EFI_SUCCESS;
 }
 
@@ -669,15 +671,14 @@ Pp2DxeHalt (
   PP2DXE_CONTEXT *Pp2Context = Context;
   PP2DXE_PORT *Port = &Pp2Context->Port;
   MVPP2_SHARED *Mvpp2Shared = Pp2Context->Port.Priv;
-  STATIC BOOLEAN CommonPartHalted = FALSE;
   INTN Index;
 
-  if (!CommonPartHalted) {
+  if (Mvpp2Shared->BmEnabled) {
     for (Index = 0; Index < MVPP2_MAX_PORT; Index++) {
       Mvpp2BmStop(Mvpp2Shared, Index);
     }
 
-    CommonPartHalted = TRUE;
+    Mvpp2Shared->BmEnabled = FALSE;
   }
 
   Mvpp2TxqDrainSet(Port, 0, TRUE);
diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
index 60f40be..b8a5dae 100644
--- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
+++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
@@ -290,6 +290,7 @@ typedef struct {
 
   /* BM pools */
   MVPP2_BMS_POOL *BmPools[MVPP2_MAX_PORT];
+  BOOLEAN BmEnabled;
 
   /* PRS shadow table */
   MVPP2_PRS_SHADOW *PrsShadow;
-- 
2.7.4

Re: [platforms PATCH 1/1] Marvell/Drivers: Pp2Dxe: Fix cleaning of the BM pools

[Ard Biesheuvel]

On 7 June 2018 at 14:55, Marcin Wojtas <mw@semihalf.com> wrote:
> Hitherto mechanism of using static flag indicating
> Buffer Manager disabled state was wrong and resulted
> in cleaning only one controller's pools. This caused
> bad page state when OS booted and attempted to
> use the buffers.
>
> This patch implements a fix, ensuring all controllers
> will clean the Buffer Manager during ExitBootServices.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Marcin Wojtas <mw@semihalf.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Pushed as 1e918658459577c6c6a865b835fa9fb460045b6d

> ---
>  Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 7 ++++---
>  Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h | 1 +
>  2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
> index b0a38b3..3ed10f6 100644
> --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
> +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c
> @@ -258,6 +258,8 @@ Pp2DxeBmStart (
>      }
>    }
>
> +  Mvpp2Shared->BmEnabled = TRUE;
> +
>    return EFI_SUCCESS;
>  }
>
> @@ -669,15 +671,14 @@ Pp2DxeHalt (
>    PP2DXE_CONTEXT *Pp2Context = Context;
>    PP2DXE_PORT *Port = &Pp2Context->Port;
>    MVPP2_SHARED *Mvpp2Shared = Pp2Context->Port.Priv;
> -  STATIC BOOLEAN CommonPartHalted = FALSE;
>    INTN Index;
>
> -  if (!CommonPartHalted) {
> +  if (Mvpp2Shared->BmEnabled) {
>      for (Index = 0; Index < MVPP2_MAX_PORT; Index++) {
>        Mvpp2BmStop(Mvpp2Shared, Index);
>      }
>
> -    CommonPartHalted = TRUE;
> +    Mvpp2Shared->BmEnabled = FALSE;
>    }
>
>    Mvpp2TxqDrainSet(Port, 0, TRUE);
> diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
> index 60f40be..b8a5dae 100644
> --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
> +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h
> @@ -290,6 +290,7 @@ typedef struct {
>
>    /* BM pools */
>    MVPP2_BMS_POOL *BmPools[MVPP2_MAX_PORT];
> +  BOOLEAN BmEnabled;
>
>    /* PRS shadow table */
>    MVPP2_PRS_SHADOW *PrsShadow;
> --
> 2.7.4
>