* [edk2-platforms PATCH 0/4] Marvell misc improvements
@ 2021-04-16 20:54 Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 1/4] Marvell: PlatInitDxe: Use more adequate print during init Marcin Wojtas
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Marcin Wojtas @ 2021-04-16 20:54 UTC (permalink / raw)
To: devel; +Cc: leif, ardb+tianocore, mw, jaz, kostap, upstream
Hi,
This short patchset applies minor modifications to the
platforms based on the Marvell SoCs. It updates the
initial print, allows to use a new Linux mvpp2 driver
feature with ACPI, adds missing port in MacchiatoBin
description and allows to use (however limited)
ACPI for CN9132 variant.
More details can be found in the commit logs.
The patchest is publicly available in the github:
https://github.com/semihalf-wojtas-marcin/edk2-platforms/commits/misc-uspstream-r20210416
Best regards,
Marcin
Marcin Wojtas (4):
Marvell: PlatInitDxe: Use more adequate print during init
Marvell: Armada7k8/OcteonTx: Enhance NIC ACPI description
SolidRun/Armada80x0McBin: Add 2.5G NIC port description in ACPI
Marvell/Cn9132Db: Enable ACPI support
Platform/Marvell/Cn913xDb/Cn913xDbA.dsc | 2 ++
Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 4 ++++
Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c | 5 +++-
Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc | 6 +++--
Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 1 +
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl | 2 ++
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 24 +++++++++++++++++++-
Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA/Ssdt.asl | 1 +
Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl | 1 +
9 files changed, 42 insertions(+), 4 deletions(-)
--
2.29.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [edk2-platforms PATCH 1/4] Marvell: PlatInitDxe: Use more adequate print during init
2021-04-16 20:54 [edk2-platforms PATCH 0/4] Marvell misc improvements Marcin Wojtas
@ 2021-04-16 20:54 ` Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 2/4] Marvell: Armada7k8/OcteonTx: Enhance NIC ACPI description Marcin Wojtas
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Marcin Wojtas @ 2021-04-16 20:54 UTC (permalink / raw)
To: devel; +Cc: leif, ardb+tianocore, mw, jaz, kostap, upstream
One of first logs visible during DXE initialization is a fixed
string "Armada Platform Init", which is pretty generic and not
true for CN913X platforms. Modify it to use already exesting
vendor/product name PCDs.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 4 ++++
Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
index 9f4447afc2..b63e9b6325 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
+++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf
@@ -40,6 +40,10 @@
gEdkiiPlatformHasAcpiGuid
gEfiEventReadyToBootGuid
+[FixedPcd]
+ gMarvellTokenSpaceGuid.PcdProductManufacturer
+ gMarvellTokenSpaceGuid.PcdProductPlatformName
+
[Protocols]
gMarvellPlatformInitCompleteProtocolGuid ## PRODUCES
diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
index 758412c48c..927abb9400 100644
--- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
+++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c
@@ -95,7 +95,10 @@ ArmadaPlatInitDxeEntryPoint (
EFI_STATUS Status;
EFI_EVENT Event;
- DEBUG ((DEBUG_ERROR, "\nArmada Platform Init\n\n"));
+ DEBUG ((DEBUG_ERROR,
+ "\n%a %a Init\n\n",
+ (CHAR8 *)PcdGetPtr (PcdProductManufacturer),
+ (CHAR8 *)PcdGetPtr (PcdProductPlatformName)));
Status = gBS->InstallProtocolInterface (&ImageHandle,
&gMarvellPlatformInitCompleteProtocolGuid,
--
2.29.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [edk2-platforms PATCH 2/4] Marvell: Armada7k8/OcteonTx: Enhance NIC ACPI description
2021-04-16 20:54 [edk2-platforms PATCH 0/4] Marvell misc improvements Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 1/4] Marvell: PlatInitDxe: Use more adequate print during init Marcin Wojtas
@ 2021-04-16 20:54 ` Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 3/4] SolidRun/Armada80x0McBin: Add 2.5G NIC port description in ACPI Marcin Wojtas
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Marcin Wojtas @ 2021-04-16 20:54 UTC (permalink / raw)
To: devel; +Cc: leif, ardb+tianocore, mw, jaz, kostap, upstream
The early firmware allows to use flow control mechanism via
shared memory region. Include its description in the PP2
NIC nodes.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 1 +
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl | 2 ++
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 2 ++
Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA/Ssdt.asl | 1 +
Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl | 1 +
5 files changed, 7 insertions(+)
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
index 5bac76a3cf..af6dbdaef0 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl
@@ -135,6 +135,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA7K", 3)
{
Memory32Fixed (ReadWrite, 0xf2000000 , 0x100000)
Memory32Fixed (ReadWrite, 0xf2129000 , 0xb000)
+ Memory32Fixed (ReadWrite, 0xf2220000 , 0x800)
})
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
index e373d46de8..faf1846c22 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl
@@ -179,6 +179,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
{
Memory32Fixed (ReadWrite, 0xf2000000 , 0x100000)
Memory32Fixed (ReadWrite, 0xf2129000 , 0xb000)
+ Memory32Fixed (ReadWrite, 0xf2220000 , 0x800)
})
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -235,6 +236,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
{
Memory32Fixed (ReadWrite, 0xf4000000 , 0x100000)
Memory32Fixed (ReadWrite, 0xf4129000 , 0xb000)
+ Memory32Fixed (ReadWrite, 0xf4220000 , 0x800)
})
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
index 9e771afc98..1802a2d07b 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
@@ -237,6 +237,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
{
Memory32Fixed (ReadWrite, 0xf2000000 , 0x100000)
Memory32Fixed (ReadWrite, 0xf2129000 , 0xb000)
+ Memory32Fixed (ReadWrite, 0xf2220000 , 0x800)
})
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
@@ -274,6 +275,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
{
Memory32Fixed (ReadWrite, 0xf4000000 , 0x100000)
Memory32Fixed (ReadWrite, 0xf4129000 , 0xb000)
+ Memory32Fixed (ReadWrite, 0xf4220000 , 0x800)
})
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
diff --git a/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA/Ssdt.asl b/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA/Ssdt.asl
index 99bc7510b2..dc32fe836a 100644
--- a/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA/Ssdt.asl
+++ b/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA/Ssdt.asl
@@ -67,6 +67,7 @@ DefinitionBlock ("Cn9131DbASsdt.aml", "SSDT", 2, "MVEBU ", "CN9131", 3)
{
Memory32Fixed (ReadWrite, 0xf4000000 , 0x100000)
Memory32Fixed (ReadWrite, 0xf4129000 , 0xb000)
+ Memory32Fixed (ReadWrite, 0xf4220000 , 0x800)
})
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
diff --git a/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl b/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl
index 3dcf78a828..470ae047f9 100644
--- a/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl
+++ b/Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl
@@ -135,6 +135,7 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "CN9130", 3)
{
Memory32Fixed (ReadWrite, 0xf2000000 , 0x100000)
Memory32Fixed (ReadWrite, 0xf2129000 , 0xb000)
+ Memory32Fixed (ReadWrite, 0xf2220000 , 0x800)
})
Name (_DSD, Package () {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
--
2.29.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [edk2-platforms PATCH 3/4] SolidRun/Armada80x0McBin: Add 2.5G NIC port description in ACPI
2021-04-16 20:54 [edk2-platforms PATCH 0/4] Marvell misc improvements Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 1/4] Marvell: PlatInitDxe: Use more adequate print during init Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 2/4] Marvell: Armada7k8/OcteonTx: Enhance NIC ACPI description Marcin Wojtas
@ 2021-04-16 20:54 ` Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 4/4] Marvell/Cn9132Db: Enable ACPI support Marcin Wojtas
2021-04-19 7:50 ` [edk2-platforms PATCH 0/4] Marvell misc improvements Ard Biesheuvel
4 siblings, 0 replies; 6+ messages in thread
From: Marcin Wojtas @ 2021-04-16 20:54 UTC (permalink / raw)
To: devel; +Cc: leif, ardb+tianocore, mw, jaz, kostap, upstream
The ACPI tables of MacchiatoBin board were missing 2.5G
NIC port description. Add it.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 22 +++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
index 1802a2d07b..bdc32983d3 100644
--- a/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
+++ b/Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl
@@ -320,7 +320,27 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "MVEBU ", "ARMADA8K", 3)
Package () { "phy-mode", "sgmii"},
}
})
- }
+ }
+ Device (ETH2)
+ {
+ Name (_ADR, 0x0)
+ Name (_CRS, ResourceTemplate ()
+ {
+ Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
+ {
+ CP_GIC_SPI_PP2_CP1_PORT2
+ }
+ })
+ Name (_DSD, Package () {
+ ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+ Package () {
+ Package () { "port-id", 2 },
+ Package () { "gop-port-id", 3 },
+ Package () { "phy-mode", "2500base-x"},
+ Package () { "managed", "in-band-status"},
+ }
+ })
+ }
}
Device (RNG0)
--
2.29.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [edk2-platforms PATCH 4/4] Marvell/Cn9132Db: Enable ACPI support
2021-04-16 20:54 [edk2-platforms PATCH 0/4] Marvell misc improvements Marcin Wojtas
` (2 preceding siblings ...)
2021-04-16 20:54 ` [edk2-platforms PATCH 3/4] SolidRun/Armada80x0McBin: Add 2.5G NIC port description in ACPI Marcin Wojtas
@ 2021-04-16 20:54 ` Marcin Wojtas
2021-04-19 7:50 ` [edk2-platforms PATCH 0/4] Marvell misc improvements Ard Biesheuvel
4 siblings, 0 replies; 6+ messages in thread
From: Marcin Wojtas @ 2021-04-16 20:54 UTC (permalink / raw)
To: devel; +Cc: leif, ardb+tianocore, mw, jaz, kostap, upstream
Because of the limitation in a number of available intterrupts
that can be mapped in a current version of the IcuLib,
the ACPI support for Cn9132 variant remained disabled.
Such hard limitation is not needed though and enable ACPI
boot, however with a the interfaces present only on the
first two CP115 HW blocks.
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
---
Platform/Marvell/Cn913xDb/Cn913xDbA.dsc | 2 ++
Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
index 67355f3988..ff91d10142 100644
--- a/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
+++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.dsc
@@ -54,6 +54,8 @@
!ifndef $(CN9132)
[Components.AARCH64]
Silicon/Marvell/OcteonTx/AcpiTables/T91/$(PLATFORM_NAME).inf
+!else
+ Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA.inf
!endif
[LibraryClasses.common]
diff --git a/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc b/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc
index 78bdb79bed..c2fb71fa8c 100644
--- a/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc
+++ b/Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc
@@ -12,9 +12,11 @@
# DTB
INF RuleOverride = DTB Silicon/Marvell/OcteonTx/DeviceTree/T91/$(PLATFORM_NAME).inf
-!ifndef $(CN9132)
-!if $(ARCH) == AARCH64
# ACPI support
+!if $(ARCH) == AARCH64
+!ifndef $(CN9132)
INF RuleOverride = ACPITABLE Silicon/Marvell/OcteonTx/AcpiTables/T91/$(PLATFORM_NAME).inf
+!else
+ INF RuleOverride = ACPITABLE Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA.inf
!endif
!endif
--
2.29.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [edk2-platforms PATCH 0/4] Marvell misc improvements
2021-04-16 20:54 [edk2-platforms PATCH 0/4] Marvell misc improvements Marcin Wojtas
` (3 preceding siblings ...)
2021-04-16 20:54 ` [edk2-platforms PATCH 4/4] Marvell/Cn9132Db: Enable ACPI support Marcin Wojtas
@ 2021-04-19 7:50 ` Ard Biesheuvel
4 siblings, 0 replies; 6+ messages in thread
From: Ard Biesheuvel @ 2021-04-19 7:50 UTC (permalink / raw)
To: Marcin Wojtas
Cc: edk2-devel-groups-io, Leif Lindholm, Ard Biesheuvel,
Grzegorz Jaszczyk, Kostya Porotchkin, upstream
On Fri, 16 Apr 2021 at 22:54, Marcin Wojtas <mw@semihalf.com> wrote:
>
> Hi,
>
> This short patchset applies minor modifications to the
> platforms based on the Marvell SoCs. It updates the
> initial print, allows to use a new Linux mvpp2 driver
> feature with ACPI, adds missing port in MacchiatoBin
> description and allows to use (however limited)
> ACPI for CN9132 variant.
>
> More details can be found in the commit logs.
> The patchest is publicly available in the github:
> https://github.com/semihalf-wojtas-marcin/edk2-platforms/commits/misc-uspstream-r20210416
>
> Best regards,
> Marcin
>
> Marcin Wojtas (4):
> Marvell: PlatInitDxe: Use more adequate print during init
> Marvell: Armada7k8/OcteonTx: Enhance NIC ACPI description
> SolidRun/Armada80x0McBin: Add 2.5G NIC port description in ACPI
> Marvell/Cn9132Db: Enable ACPI support
>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Pushed as c896c358ad59..f3fe738fe89d
> Platform/Marvell/Cn913xDb/Cn913xDbA.dsc | 2 ++
> Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 4 ++++
> Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c | 5 +++-
> Platform/Marvell/Cn913xDb/Cn913xDbA.fdf.inc | 6 +++--
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada70x0Db/Dsdt.asl | 1 +
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0Db/Dsdt.asl | 2 ++
> Silicon/Marvell/Armada7k8k/AcpiTables/Armada80x0McBin/Dsdt.asl | 24 +++++++++++++++++++-
> Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn9131DbA/Ssdt.asl | 1 +
> Silicon/Marvell/OcteonTx/AcpiTables/T91/Cn913xDbA/Dsdt.asl | 1 +
> 9 files changed, 42 insertions(+), 4 deletions(-)
>
> --
> 2.29.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-19 7:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-16 20:54 [edk2-platforms PATCH 0/4] Marvell misc improvements Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 1/4] Marvell: PlatInitDxe: Use more adequate print during init Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 2/4] Marvell: Armada7k8/OcteonTx: Enhance NIC ACPI description Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 3/4] SolidRun/Armada80x0McBin: Add 2.5G NIC port description in ACPI Marcin Wojtas
2021-04-16 20:54 ` [edk2-platforms PATCH 4/4] Marvell/Cn9132Db: Enable ACPI support Marcin Wojtas
2021-04-19 7:50 ` [edk2-platforms PATCH 0/4] Marvell misc improvements Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox