[edk2,v4,2/9] ArmVirtPkg: move QEMU based platforms to ArmVirtPL031FdtClientLib

Message ID 1460557933-23346-3-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel April 13, 2016, 2:32 p.m.
This moves QEMU based platforms to ArmVirtPL031FdtClientLib, so that we no
longer have to rely on VirtFdtDxe to execute first and set the PL031 base
address in a dynamic PCD.

The only driver which [transitively] depends on this PcdPL031RtcBase PCD is
EmbeddedPkg/RealTimeClockRuntimeDxe, so this conversion cannot affect any
other users and is thus safe.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 ArmVirtPkg/ArmVirtQemu.dsc       | 5 ++++-
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.5.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek April 13, 2016, 2:53 p.m. | #1
On 04/13/16 16:32, Ard Biesheuvel wrote:
> This moves QEMU based platforms to ArmVirtPL031FdtClientLib, so that we no

> longer have to rely on VirtFdtDxe to execute first and set the PL031 base

> address in a dynamic PCD.

> 

> The only driver which [transitively] depends on this PcdPL031RtcBase PCD is

> EmbeddedPkg/RealTimeClockRuntimeDxe, so this conversion cannot affect any

> other users and is thus safe.

> 

> Contributed-under: TianoCore Contribution Agreement 1.0

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

> ---

>  ArmVirtPkg/ArmVirtQemu.dsc       | 5 ++++-

>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 7 +++++--

>  2 files changed, 9 insertions(+), 3 deletions(-)

> 

> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

> index c42092f54163..70419ff3f856 100644

> --- a/ArmVirtPkg/ArmVirtQemu.dsc

> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

> @@ -293,7 +293,10 @@ [Components.common]

>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

> -  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

> +  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

> +    <LibraryClasses>

> +      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf

> +  }

>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

>  

>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> index 2cbeced695f9..65991baaf680 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -271,7 +271,10 @@ [Components.common]

>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

> -  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

> +  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

> +    <LibraryClasses>

> +      NULL|ArmVirtPkg/Library/ArmVirtRtcFdtClientLib/ArmVirtPL031FdtClientLib.inf

> +  }

>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

>  

>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

> @@ -285,7 +288,7 @@ [Components.common]

>    ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

>    ArmPkg/Drivers/TimerDxe/TimerDxe.inf {

>      <LibraryClasses>

> -      NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf

> +      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtTimerFdtClientLib.inf

>    }

>  !if $(SECURE_BOOT_ENABLE) == TRUE

>    ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf

> 


I think you missed my v3 feedback for this patch. It is identical
between v3 and v4.

Thanks
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Ard Biesheuvel April 13, 2016, 2:54 p.m. | #2
On 13 April 2016 at 16:53, Laszlo Ersek <lersek@redhat.com> wrote:
> On 04/13/16 16:32, Ard Biesheuvel wrote:

>> This moves QEMU based platforms to ArmVirtPL031FdtClientLib, so that we no

>> longer have to rely on VirtFdtDxe to execute first and set the PL031 base

>> address in a dynamic PCD.

>>

>> The only driver which [transitively] depends on this PcdPL031RtcBase PCD is

>> EmbeddedPkg/RealTimeClockRuntimeDxe, so this conversion cannot affect any

>> other users and is thus safe.

>>

>> Contributed-under: TianoCore Contribution Agreement 1.0

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

>> ---

>>  ArmVirtPkg/ArmVirtQemu.dsc       | 5 ++++-

>>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 7 +++++--

>>  2 files changed, 9 insertions(+), 3 deletions(-)

>>

>> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

>> index c42092f54163..70419ff3f856 100644

>> --- a/ArmVirtPkg/ArmVirtQemu.dsc

>> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

>> @@ -293,7 +293,10 @@ [Components.common]

>>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

>>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

>>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

>> -  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

>> +  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

>> +    <LibraryClasses>

>> +      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf

>> +  }

>>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

>>

>>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

>> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> index 2cbeced695f9..65991baaf680 100644

>> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>> @@ -271,7 +271,10 @@ [Components.common]

>>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

>>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

>>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

>> -  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

>> +  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

>> +    <LibraryClasses>

>> +      NULL|ArmVirtPkg/Library/ArmVirtRtcFdtClientLib/ArmVirtPL031FdtClientLib.inf

>> +  }

>>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

>>

>>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

>> @@ -285,7 +288,7 @@ [Components.common]

>>    ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

>>    ArmPkg/Drivers/TimerDxe/TimerDxe.inf {

>>      <LibraryClasses>

>> -      NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf

>> +      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtTimerFdtClientLib.inf

>>    }

>>  !if $(SECURE_BOOT_ENABLE) == TRUE

>>    ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf

>>

>

> I think you missed my v3 feedback for this patch. It is identical

> between v3 and v4.

>


Whoops, wrong version. I did fix it, honestly :-)
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Laszlo Ersek April 13, 2016, 3:10 p.m. | #3
On 04/13/16 16:54, Ard Biesheuvel wrote:
> On 13 April 2016 at 16:53, Laszlo Ersek <lersek@redhat.com> wrote:

>> On 04/13/16 16:32, Ard Biesheuvel wrote:

>>> This moves QEMU based platforms to ArmVirtPL031FdtClientLib, so that we no

>>> longer have to rely on VirtFdtDxe to execute first and set the PL031 base

>>> address in a dynamic PCD.

>>>

>>> The only driver which [transitively] depends on this PcdPL031RtcBase PCD is

>>> EmbeddedPkg/RealTimeClockRuntimeDxe, so this conversion cannot affect any

>>> other users and is thus safe.

>>>

>>> Contributed-under: TianoCore Contribution Agreement 1.0

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

>>> ---

>>>  ArmVirtPkg/ArmVirtQemu.dsc       | 5 ++++-

>>>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 7 +++++--

>>>  2 files changed, 9 insertions(+), 3 deletions(-)

>>>

>>> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

>>> index c42092f54163..70419ff3f856 100644

>>> --- a/ArmVirtPkg/ArmVirtQemu.dsc

>>> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

>>> @@ -293,7 +293,10 @@ [Components.common]

>>>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

>>>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

>>>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

>>> -  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

>>> +  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

>>> +    <LibraryClasses>

>>> +      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf

>>> +  }

>>>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

>>>

>>>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

>>> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>>> index 2cbeced695f9..65991baaf680 100644

>>> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

>>> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

>>> @@ -271,7 +271,10 @@ [Components.common]

>>>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

>>>    MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

>>>    EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf

>>> -  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

>>> +  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {

>>> +    <LibraryClasses>

>>> +      NULL|ArmVirtPkg/Library/ArmVirtRtcFdtClientLib/ArmVirtPL031FdtClientLib.inf

>>> +  }

>>>    EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf

>>>

>>>    MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

>>> @@ -285,7 +288,7 @@ [Components.common]

>>>    ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

>>>    ArmPkg/Drivers/TimerDxe/TimerDxe.inf {

>>>      <LibraryClasses>

>>> -      NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf

>>> +      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtTimerFdtClientLib.inf

>>>    }

>>>  !if $(SECURE_BOOT_ENABLE) == TRUE

>>>    ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf

>>>

>>

>> I think you missed my v3 feedback for this patch. It is identical

>> between v3 and v4.

>>

> 

> Whoops, wrong version. I did fix it, honestly :-)

> 


If you say so... I just don't understand how you managed to send an
unchanged version of this patch, if you fixed it, given that patches in
the series both before and after this patch (that is, probably on the
same branch in your repo) *have* undergone changes. Perhaps you
formatted the patches for posting first, and then updated 2/9?

Anyway, the fix is not complex, so with my v3 feedback at
<http://thread.gmane.org/gmane.comp.bios.edk2.devel/10679/focus=10704>
addressed:

Reviewed-by: Laszlo Ersek <lersek@redhat.com>


Thanks!
Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index c42092f54163..70419ff3f856 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -293,7 +293,10 @@  [Components.common]
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
   EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
-  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
+  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {
+    <LibraryClasses>
+      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.inf
+  }
   EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
 
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 2cbeced695f9..65991baaf680 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -271,7 +271,10 @@  [Components.common]
   MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
   MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
   EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
-  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
+  EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf {
+    <LibraryClasses>
+      NULL|ArmVirtPkg/Library/ArmVirtRtcFdtClientLib/ArmVirtPL031FdtClientLib.inf
+  }
   EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
 
   MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
@@ -285,7 +288,7 @@  [Components.common]
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
   ArmPkg/Drivers/TimerDxe/TimerDxe.inf {
     <LibraryClasses>
-      NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf
+      NULL|ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtTimerFdtClientLib.inf
   }
 !if $(SECURE_BOOT_ENABLE) == TRUE
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf