public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH edk2-platforms 1/1] Platform/RaspberryPi: remove unused variable GpuIndex from PlatformLib
@ 2020-07-14 12:45 Leif Lindholm
  2020-07-14 12:58 ` Pete Batard
  0 siblings, 1 reply; 3+ messages in thread
From: Leif Lindholm @ 2020-07-14 12:45 UTC (permalink / raw)
  To: devel; +Cc: Andrei Warkentin, Pete Batard

Commit 678f6bff3c46 ("RPi4: reserve/map memory above 4GB when present")
removed the only user of the GpuIndex variable in
ArmPlatformGetVirtualMemoryMap, which causes a build error of NOOPT
profile with gcc 8.3. Delete the variable, and its initialization.

Cc: Andrei Warkentin <andrey.warkentin@gmail.com>
Cc: Pete Batard <pete@akeo.ie>
Signed-off-by: Leif Lindholm <leif@nuviainc.com>
---
 Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
index 60a7b43af993..c395e0c75df7 100644
--- a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
+++ b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
@@ -57,7 +57,6 @@ ArmPlatformGetVirtualMemoryMap (
   )
 {
   UINTN                         Index = 0;
-  UINTN                         GpuIndex;
   INT64                         TotalMemorySize;
   INT64                         MemorySizeBelow3GB;
   INT64                         MemorySizeBelow4GB;
@@ -162,7 +161,6 @@ ArmPlatformGetVirtualMemoryMap (
   VirtualMemoryInfo[Index++].Name           = L"System RAM < 1GB";
 
   // GPU Reserved
-  GpuIndex = Index;
   VirtualMemoryTable[Index].PhysicalBase    = mVideoCoreBase;
   VirtualMemoryTable[Index].VirtualBase     = VirtualMemoryTable[Index].PhysicalBase;
   VirtualMemoryTable[Index].Length          = mVideoCoreSize;
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH edk2-platforms 1/1] Platform/RaspberryPi: remove unused variable GpuIndex from PlatformLib
  2020-07-14 12:45 [PATCH edk2-platforms 1/1] Platform/RaspberryPi: remove unused variable GpuIndex from PlatformLib Leif Lindholm
@ 2020-07-14 12:58 ` Pete Batard
  2020-07-14 13:04   ` Leif Lindholm
  0 siblings, 1 reply; 3+ messages in thread
From: Pete Batard @ 2020-07-14 12:58 UTC (permalink / raw)
  To: Leif Lindholm, devel; +Cc: Andrei Warkentin

Good call.

On 2020.07.14 13:45, Leif Lindholm wrote:
> Commit 678f6bff3c46 ("RPi4: reserve/map memory above 4GB when present")
> removed the only user of the GpuIndex variable in
> ArmPlatformGetVirtualMemoryMap, which causes a build error of NOOPT
> profile with gcc 8.3. Delete the variable, and its initialization.
> 
> Cc: Andrei Warkentin <andrey.warkentin@gmail.com>
> Cc: Pete Batard <pete@akeo.ie>
> Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> ---
>   Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
> index 60a7b43af993..c395e0c75df7 100644
> --- a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
> +++ b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
> @@ -57,7 +57,6 @@ ArmPlatformGetVirtualMemoryMap (
>     )
>   {
>     UINTN                         Index = 0;
> -  UINTN                         GpuIndex;
>     INT64                         TotalMemorySize;
>     INT64                         MemorySizeBelow3GB;
>     INT64                         MemorySizeBelow4GB;
> @@ -162,7 +161,6 @@ ArmPlatformGetVirtualMemoryMap (
>     VirtualMemoryInfo[Index++].Name           = L"System RAM < 1GB";
>   
>     // GPU Reserved
> -  GpuIndex = Index;
>     VirtualMemoryTable[Index].PhysicalBase    = mVideoCoreBase;
>     VirtualMemoryTable[Index].VirtualBase     = VirtualMemoryTable[Index].PhysicalBase;
>     VirtualMemoryTable[Index].Length          = mVideoCoreSize;
> 

Reviewed-by: Pete Batard <pete@akeo.ie>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH edk2-platforms 1/1] Platform/RaspberryPi: remove unused variable GpuIndex from PlatformLib
  2020-07-14 12:58 ` Pete Batard
@ 2020-07-14 13:04   ` Leif Lindholm
  0 siblings, 0 replies; 3+ messages in thread
From: Leif Lindholm @ 2020-07-14 13:04 UTC (permalink / raw)
  To: Pete Batard; +Cc: devel, Andrei Warkentin

On Tue, Jul 14, 2020 at 13:58:11 +0100, Pete Batard wrote:
> Good call.
> 
> On 2020.07.14 13:45, Leif Lindholm wrote:
> > Commit 678f6bff3c46 ("RPi4: reserve/map memory above 4GB when present")
> > removed the only user of the GpuIndex variable in
> > ArmPlatformGetVirtualMemoryMap, which causes a build error of NOOPT
> > profile with gcc 8.3. Delete the variable, and its initialization.
> > 
> > Cc: Andrei Warkentin <andrey.warkentin@gmail.com>
> > Cc: Pete Batard <pete@akeo.ie>
> > Signed-off-by: Leif Lindholm <leif@nuviainc.com>
> > ---
> >   Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c | 2 --
> >   1 file changed, 2 deletions(-)
> > 
> > diff --git a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
> > index 60a7b43af993..c395e0c75df7 100644
> > --- a/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
> > +++ b/Platform/RaspberryPi/Library/PlatformLib/RaspberryPiMem.c
> > @@ -57,7 +57,6 @@ ArmPlatformGetVirtualMemoryMap (
> >     )
> >   {
> >     UINTN                         Index = 0;
> > -  UINTN                         GpuIndex;
> >     INT64                         TotalMemorySize;
> >     INT64                         MemorySizeBelow3GB;
> >     INT64                         MemorySizeBelow4GB;
> > @@ -162,7 +161,6 @@ ArmPlatformGetVirtualMemoryMap (
> >     VirtualMemoryInfo[Index++].Name           = L"System RAM < 1GB";
> >     // GPU Reserved
> > -  GpuIndex = Index;
> >     VirtualMemoryTable[Index].PhysicalBase    = mVideoCoreBase;
> >     VirtualMemoryTable[Index].VirtualBase     = VirtualMemoryTable[Index].PhysicalBase;
> >     VirtualMemoryTable[Index].Length          = mVideoCoreSize;
> > 
> 
> Reviewed-by: Pete Batard <pete@akeo.ie>

Thanks!
Pushed as 5d2d48eb8f26.

/
    Leif

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-07-14 13:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-14 12:45 [PATCH edk2-platforms 1/1] Platform/RaspberryPi: remove unused variable GpuIndex from PlatformLib Leif Lindholm
2020-07-14 12:58 ` Pete Batard
2020-07-14 13:04   ` Leif Lindholm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox