From 809b401938e7f7f786b3afce1c388836c42af052 Mon Sep 17 00:00:00 2001 From: Debbie Martin Date: Fri, 20 Oct 2023 13:38:25 +0100 Subject: [PATCH] arm-bsp/trusted-firmware-a/fvp-base: Add stdout path and virtio net and rng Set the Trusted Firmware devicetree to fvp-base-gicv3-psci-1t. Patch the devicetree to include: the stdout path for console access, a virtio net node and a virtio rng node. This is necessary in the case that the Trusted Firmware devicetree is passed to Linux from U-boot (rather than sideloading). Also rename the include file to change the suffix from "fvp" to "fvp-base". Signed-off-by: Debbie Martin Signed-off-by: Jon Mason --- ...d-stdout-path-and-virtio-net-and-rng.patch | 64 +++++++++++++++++++ ...vp.inc => trusted-firmware-a-fvp-base.inc} | 5 ++ .../trusted-firmware-a_%.bbappend | 2 +- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a-fvp.inc => trusted-firmware-a-fvp-base.inc} (50%) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch new file mode 100644 index 00000000..4d0019a5 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/fvp-base/0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch @@ -0,0 +1,64 @@ +From b79d3cf319cc5698311ef83247110c93d3c2de2c Mon Sep 17 00:00:00 2001 +Message-Id: +From: Diego Sueiro +Date: Wed, 27 Sep 2023 18:05:26 +0100 +Subject: [PATCH] fdts/fvp-base: Add stdout-path and virtio net and rng nodes + +Upstream-Status: Pending +Signed-off-by: Diego Sueiro +--- + fdts/fvp-base-psci-common.dtsi | 8 ++++++-- + fdts/rtsm_ve-motherboard.dtsi | 12 ++++++++++++ + 2 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/fdts/fvp-base-psci-common.dtsi b/fdts/fvp-base-psci-common.dtsi +index 79cf37d3b0..b1ba5ce703 100644 +--- a/fdts/fvp-base-psci-common.dtsi ++++ b/fdts/fvp-base-psci-common.dtsi +@@ -30,7 +30,9 @@ + #if (ENABLE_RME == 1) + chosen { bootargs = "console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=on";}; + #else +- chosen {}; ++ chosen { ++ stdout-path = &v2m_serial0; ++ }; + #endif + + aliases { +@@ -243,6 +245,8 @@ + <0 0 39 &gic 0 GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>, + <0 0 40 &gic 0 GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>, + <0 0 41 &gic 0 GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>, +- <0 0 42 &gic 0 GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; ++ <0 0 42 &gic 0 GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>, ++ <0 0 44 &gic 0 GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>, ++ <0 0 46 &gic 0 GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; + }; + }; +diff --git a/fdts/rtsm_ve-motherboard.dtsi b/fdts/rtsm_ve-motherboard.dtsi +index 0a824b349a..21a083a51a 100644 +--- a/fdts/rtsm_ve-motherboard.dtsi ++++ b/fdts/rtsm_ve-motherboard.dtsi +@@ -230,6 +230,18 @@ + interrupts = <42>; + }; + ++ virtio@150000 { ++ compatible = "virtio,mmio"; ++ reg = <0x150000 0x200>; ++ interrupts = <44>; ++ }; ++ ++ virtio@200000 { ++ compatible = "virtio,mmio"; ++ reg = <0x200000 0x200>; ++ interrupts = <46>; ++ }; ++ + rtc@170000 { + compatible = "arm,pl031", "arm,primecell"; + reg = <0x170000 0x1000>; +-- +2.39.1 + diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc similarity index 50% rename from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc rename to meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc index ca96b448..d773e41c 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-fvp-base.inc @@ -4,9 +4,14 @@ # Armv8-A Base Platform FVP # +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" +SRC_URI:append = " file://0001-fdts-fvp-base-Add-stdout-path-and-virtio-net-and-rng.patch" + COMPATIBLE_MACHINE = "fvp-base" TFA_PLATFORM = "fvp" TFA_DEBUG = "1" TFA_MBEDTLS = "1" TFA_UBOOT ?= "1" TFA_BUILD_TARGET = "bl1 bl2 bl31 dtbs fip" + +EXTRA_OEMAKE:append = " FVP_DT_PREFIX=fvp-base-gicv3-psci-1t" diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 7fbcd3ab..cb482a6f 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -4,7 +4,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" MACHINE_TFA_REQUIRE ?= "" MACHINE_TFA_REQUIRE:corstone1000 = "trusted-firmware-a-corstone1000.inc" -MACHINE_TFA_REQUIRE:fvp-base = "trusted-firmware-a-fvp.inc" +MACHINE_TFA_REQUIRE:fvp-base = "trusted-firmware-a-fvp-base.inc" MACHINE_TFA_REQUIRE:juno = "trusted-firmware-a-juno.inc" MACHINE_TFA_REQUIRE:n1sdp = "trusted-firmware-a-n1sdp.inc" MACHINE_TFA_REQUIRE:sgi575 = "trusted-firmware-a-sgi575.inc"