[edk2-devel] [PATCH edk2-platforms 0/4] Platform,Silicon: fix SiFive U540 and Opensbi builds

[edk2-devel] [PATCH edk2-platforms 0/4] Platform,Silicon: fix SiFive U540 and Opensbi builds

[Leif Lindholm]

Heinrich reported a build breakage of U540, due to it lacking a
mapping for RiscVMmuLib. While looking into that, I found that
1) The Opensbi submodule version has been corrupted by a recent commit.
2) The Maintainers.txt entry for this group of platforms is incorrect.

Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Daniel Schaefer <git@danielschaefer.me>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Abner Chang <abner.chang@amd.com>

Leif Lindholm (4):
  Maintainers.txt: fix entry for SiFive U5SeriesPkg
  Platform/SiFive: CRLF fixup in U540.dsc
  Platform/SiFive: add RiscVMmuLib mapping for U540
  Silicon/RiscVOpensbiLib: fix submodule version

 Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc | 3 ++-
 Maintainers.txt                                                      | 4 ++--
 Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

-- 
2.39.2


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119691): https://edk2.groups.io/g/devel/message/119691
Mute This Topic: https://groups.io/mt/106849450/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 1/4] Maintainers.txt: fix entry for SiFive U5SeriesPkg

[Leif Lindholm]

There was an error in the wildcard path described for U5SeriesPkg, so
it failed to match. Fix the mistake.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Daniel Schaefer <git@danielschaefer.me>
Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
---
 Maintainers.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Maintainers.txt b/Maintainers.txt
index af688c3813f1..824838486072 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -285,8 +285,8 @@ F: Platform/RISC-V/PlatformPkg/
 M: Sunil V L <sunilvl@ventanamicro.com>
 R: Daniel Schaefer <git@danielschaefer.me>
 
-Platform/SiFive/U5Series
-F:Platform/SiFive/U5Series/
+Platform/SiFive/U5SeriesPkg
+F: Platform/SiFive/U5SeriesPkg/
 M: Daniel Schaefer <git@danielschaefer.me>
 
 Silicon/Intel
-- 
2.39.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119690): https://edk2.groups.io/g/devel/message/119690
Mute This Topic: https://groups.io/mt/106849448/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 2/4] Platform/SiFive: CRLF fixup in U540.dsc

[Leif Lindholm]

Cc: Daniel Schaefer <git@danielschaefer.me>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Abner Chang <abner.chang@amd.com>
Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
---
 Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
index 7f73065a5153..a297702952a0 100644
--- a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
+++ b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
@@ -103,7 +103,7 @@ [LibraryClasses]
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
   VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
   VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
-  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
+  ImagePropertiesRecordLib|MdeModulePkg/Library/ImagePropertiesRecordLib/ImagePropertiesRecordLib.inf
 
 # RISC-V Platform Library
   TimeBaseLib|EmbeddedPkg//Library/TimeBaseLib/TimeBaseLib.inf
-- 
2.39.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119692): https://edk2.groups.io/g/devel/message/119692
Mute This Topic: https://groups.io/mt/106849452/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 3/4] Platform/SiFive: add RiscVMmuLib mapping for U540

[Leif Lindholm]

The freedom unleashed platform currently fails to build due to a
missing mapping for RiscVMmuLib, so add one.

Cc: Daniel Schaefer <git@danielschaefer.me>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Abner Chang <abner.chang@amd.com>
Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
---
 Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
index a297702952a0..40bb790a485f 100644
--- a/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
+++ b/Platform/SiFive/U5SeriesPkg/FreedomU540HiFiveUnleashedBoard/U540.dsc
@@ -150,6 +150,7 @@ [LibraryClasses.common]
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
 !endif
   RiscVCpuLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVCpuLib/RiscVCpuLib.inf
+  RiscVMmuLib|UefiCpuPkg/Library/BaseRiscVMmuLib/BaseRiscVMmuLib.inf
   RiscVSbiLib|MdePkg/Library/BaseRiscVSbiLib/BaseRiscVSbiLib.inf
   RiscVPlatformTimerLib|Platform/SiFive/U5SeriesPkg/Library/RiscVPlatformTimerLib/RiscVPlatformTimerLib.inf
   #MachineModeTimerLib|Silicon/RISC-V/ProcessorPkg/Library/RiscVReadMachineModeTimer/MachineModeTimerLib/MachineModeTimerLib.inf
-- 
2.39.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119693): https://edk2.groups.io/g/devel/message/119693
Mute This Topic: https://groups.io/mt/106849455/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH edk2-platforms 4/4] Silicon/RiscVOpensbiLib: fix submodule version

[Leif Lindholm]

Commit 4f32c34865de,
("Platform/AMD: Initial commit of cross platform/board interfaces")
presumably by accident reverts the opensbi submodule update done in
commmit 2d8289634ec9 ("ProcessorPkg/opensbi: Update opensbi library").

Correct this and restore the submodule version.

Cc: Daniel Schaefer <git@danielschaefer.me>
Cc: Sunil V L <sunilvl@ventanamicro.com>
Cc: Abner Chang <abner.chang@amd.com>
Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
---
 Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi b/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
index 937caee08331..a731c7e36988 160000
--- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
+++ b/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
@@ -1 +1 @@
-Subproject commit 937caee0833115f69d697ca190001ba0aa5c7368
+Subproject commit a731c7e36988c3308e1978ecde491f2f6182d490
-- 
2.39.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119694): https://edk2.groups.io/g/devel/message/119694
Mute This Topic: https://groups.io/mt/106849456/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 1/4] Maintainers.txt: fix entry for SiFive U5SeriesPkg

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

> -----Original Message-----
> From: Leif Lindholm <quic_llindhol@quicinc.com>
> Sent: Monday, June 24, 2024 6:33 AM
> To: devel@edk2.groups.io
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Daniel Schaefer
> <git@danielschaefer.me>
> Subject: [PATCH edk2-platforms 1/4] Maintainers.txt: fix entry for SiFive
> U5SeriesPkg
> 
> There was an error in the wildcard path described for U5SeriesPkg, so
> it failed to match. Fix the mistake.
> 
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Daniel Schaefer <git@danielschaefer.me>
> Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
> ---
>  Maintainers.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Maintainers.txt b/Maintainers.txt
> index af688c3813f1..824838486072 100644
> --- a/Maintainers.txt
> +++ b/Maintainers.txt
> @@ -285,8 +285,8 @@ F: Platform/RISC-V/PlatformPkg/
>  M: Sunil V L <sunilvl@ventanamicro.com>
>  R: Daniel Schaefer <git@danielschaefer.me>
> 
> -Platform/SiFive/U5Series
> -F:Platform/SiFive/U5Series/
> +Platform/SiFive/U5SeriesPkg
> +F: Platform/SiFive/U5SeriesPkg/
>  M: Daniel Schaefer <git@danielschaefer.me>
> 
>  Silicon/Intel
> --
> 2.39.2



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119696): https://edk2.groups.io/g/devel/message/119696
Mute This Topic: https://groups.io/mt/106849448/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 0/4] Platform,Silicon: fix SiFive U540 and Opensbi builds

[Sunil V L]

On Mon, Jun 24, 2024 at 02:32:33PM +0100, Leif Lindholm wrote:
> Heinrich reported a build breakage of U540, due to it lacking a
> mapping for RiscVMmuLib. While looking into that, I found that
> 1) The Opensbi submodule version has been corrupted by a recent commit.
> 2) The Maintainers.txt entry for this group of platforms is incorrect.
> 
The series LGTM.

Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

Thanks!


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119699): https://edk2.groups.io/g/devel/message/119699
Mute This Topic: https://groups.io/mt/106849450/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 4/4] Silicon/RiscVOpensbiLib: fix submodule version

[Alistair Francis]

On Mon, Jun 24, 2024 at 11:33 PM Leif Lindholm via groups.io
<quic_llindhol=quicinc.com@groups.io> wrote:
>
> Commit 4f32c34865de,
> ("Platform/AMD: Initial commit of cross platform/board interfaces")
> presumably by accident reverts the opensbi submodule update done in
> commmit 2d8289634ec9 ("ProcessorPkg/opensbi: Update opensbi library").
>
> Correct this and restore the submodule version.
>
> Cc: Daniel Schaefer <git@danielschaefer.me>
> Cc: Sunil V L <sunilvl@ventanamicro.com>
> Cc: Abner Chang <abner.chang@amd.com>
> Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
> ---
>  Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi b/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
> index 937caee08331..a731c7e36988 160000
> --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
> +++ b/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
> @@ -1 +1 @@
> -Subproject commit 937caee0833115f69d697ca190001ba0aa5c7368
> +Subproject commit a731c7e36988c3308e1978ecde491f2f6182d490

While this is being updated why not just update to the latest 1.4 release?

This commit is 3 years old and not an official release (it's not even 1.0)

Alistair

> --
> 2.39.2
>
>
>
> 
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119702): https://edk2.groups.io/g/devel/message/119702
Mute This Topic: https://groups.io/mt/106849456/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 4/4] Silicon/RiscVOpensbiLib: fix submodule version

[Sunil V L]

On Tue, Jun 25, 2024 at 10:07:37AM +1000, Alistair Francis wrote:
> On Mon, Jun 24, 2024 at 11:33 PM Leif Lindholm via groups.io
> <quic_llindhol=quicinc.com@groups.io> wrote:
> >
> > Commit 4f32c34865de,
> > ("Platform/AMD: Initial commit of cross platform/board interfaces")
> > presumably by accident reverts the opensbi submodule update done in
> > commmit 2d8289634ec9 ("ProcessorPkg/opensbi: Update opensbi library").
> >
> > Correct this and restore the submodule version.
> >
> > Cc: Daniel Schaefer <git@danielschaefer.me>
> > Cc: Sunil V L <sunilvl@ventanamicro.com>
> > Cc: Abner Chang <abner.chang@amd.com>
> > Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
> > ---
> >  Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi b/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
> > index 937caee08331..a731c7e36988 160000
> > --- a/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
> > +++ b/Silicon/RISC-V/ProcessorPkg/Library/RiscVOpensbiLib/opensbi
> > @@ -1 +1 @@
> > -Subproject commit 937caee0833115f69d697ca190001ba0aa5c7368
> > +Subproject commit a731c7e36988c3308e1978ecde491f2f6182d490
> 
> While this is being updated why not just update to the latest 1.4 release?
> 
> This commit is 3 years old and not an official release (it's not even 1.0)
> 
Hi Alistair,

The plan is to obsolete this and move to payload based design. All new
platforms including qemu virt are already using the payload design.
Upgrading opensbi in EDK2 is not a trivial effort.

Thanks,
Sunil


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119703): https://edk2.groups.io/g/devel/message/119703
Mute This Topic: https://groups.io/mt/106849456/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH edk2-platforms 0/4] Platform,Silicon: fix SiFive U540 and Opensbi builds

[Leif Lindholm]

On Mon, Jun 24, 2024 at 22:37:27 +0530, Sunil V L wrote:
> On Mon, Jun 24, 2024 at 02:32:33PM +0100, Leif Lindholm wrote:
> > Heinrich reported a build breakage of U540, due to it lacking a
> > mapping for RiscVMmuLib. While looking into that, I found that
> > 1) The Opensbi submodule version has been corrupted by a recent commit.
> > 2) The Maintainers.txt entry for this group of platforms is incorrect.
> > 
> The series LGTM.
> 
> Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>

Thanks!

Series pushed as c7ed8deaa8c1..ff6e91e106cc,
adding a reported-by for Heinrich that should have been
there in the original submission.

/
    Leif

> Thanks!
> 
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119792): https://edk2.groups.io/g/devel/message/119792
Mute This Topic: https://groups.io/mt/106849450/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-