From 80c05d9736dd86f7561f93aca13878a26846b552 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 23 Apr 2025 12:05:26 -0400 Subject: [PATCH] Remove old Xen configuration bits Since there has been no maintenance of it for several years, and we are soon going to start a brand new integration of Xen support, remove the various pieces of configuration from the previously contributed support. Bug-AGL: SPEC-5202 Change-Id: I458044657b200e92bd4456f81aa0487b913f25f8 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30933 ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 3 - meta-agl-bsp/conf/include/agl_m3ulcb.inc | 3 - .../recipes-bsp/bootfiles/rpi-config_git.bbappend | 4 - .../recipes-bsp/rpi-u-boot-scr/files/boot_xen.cmd | 45 ----------- .../rpi-u-boot-scr/rpi-u-boot-scr.bbappend | 18 ----- .../linux/linux-raspberrypi/xen-be.cfg | 50 ------------ .../linux/linux-raspberrypi_%.bbappend | 15 ---- .../linux/files/r8a77960-ulcb-xen.dts | 91 ---------------------- .../recipes-kernel/linux/files/xen-be.cfg | 1 - .../recipes-kernel/linux/linux-renesas_%.bbappend | 12 --- .../recipes-kernel/linux/linux-agl-config.inc | 2 - .../recipes-kernel/linux/linux/xen_domu.cfg | 25 ------ .../feature/agl-virt-guest-xen/50_local.conf.inc | 3 - templates/feature/agl-virt-xen/50_local.conf.inc | 3 - templates/feature/agl-virt-xen/included.dep | 1 - 15 files changed, 276 deletions(-) delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot_xen.cmd delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend delete mode 100644 meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/xen-be.cfg delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/xen-be.cfg delete mode 100644 meta-agl-core/recipes-kernel/linux/linux/xen_domu.cfg delete mode 100644 templates/feature/agl-virt-guest-xen/50_local.conf.inc delete mode 100644 templates/feature/agl-virt-xen/50_local.conf.inc delete mode 100644 templates/feature/agl-virt-xen/included.dep diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 31d99c342..ebe9db114 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -23,6 +23,3 @@ BBMASK += "meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend" # do use software rendering to display the compositor # used for images w/o binary-only driver WESTON_USE_PIXMAN = "1" - -DISTRO_FEATURES:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" -IMAGE_INSTALL:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index 4f788324c..5abae4248 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -3,6 +3,3 @@ SOC_FAMILY = "r8a7796" BOARD_NAME = "m3ulcb" DTB_SUFFIX = "r8a77960-ulcb" - -DISTRO_FEATURES:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen', '', d)}" -IMAGE_INSTALL:append = "${@bb.utils.contains('AGL_XEN_WANTED', '1', ' xen-base xen-mkimage', '', d)}" diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend index 248623699..3d9a0a5b3 100644 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend +++ b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/bootfiles/rpi-config_git.bbappend @@ -18,10 +18,6 @@ do_deploy:append:raspberrypi4() { ;; esac fi - - if [ "${AGL_XEN_WANTED}" = "1" ]; then - echo "total_mem=${TOTAL_BOARD_MEM}" >> ${DEPLOYDIR}/bootfiles/config.txt - fi } do_deploy:append() { diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot_xen.cmd b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot_xen.cmd deleted file mode 100644 index 24cfb1658..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/files/boot_xen.cmd +++ /dev/null @@ -1,45 +0,0 @@ -# -# SPDX-License-Identifier: MIT -# -# Copyright (c) 2020, MERA -# -# Author: Leonid Lazarev -# -# Xen Boot Script -# -# https://www.raspberrypi.org/documentation/configuration/device-tree.md -# We do not set fdt_addr, because device tree initially is loaded by raspberry pi firmware loader and the particular -# modification are performed. The prepared DTS is propagated to u-boot and this prepared device tree has to be reused. - -setenv kernel_addr_r 0x00480000 # 16M -setenv xen_addr_r 0x00200000 # 2M - -# Load xen to ${xen_addr_r}. -fatload mmc 0:1 ${xen_addr_r} /xen-@@MACHINE@@ - -#configure dom0 -fdt addr ${fdt_addr} - -#read prepared bootargs, rapsberry pi prepared initial list of the parameters for loading -fdt get value bootargs /chosen bootargs -fdt resize 8192 - -# add device type for raspberry -fdt set pcie0 device_type "pci" - -fdt chosen -fdt set /chosen \#address-cells <1> -fdt set /chosen \#size-cells <1> - -# Load Linux Image to ${kernel_addr_r} -fatload mmc 0:1 ${kernel_addr_r} /@@KERNEL_IMAGETYPE@@ - -# we load dom0 with 1512 MB of memory -fdt mknod /chosen dom0 -fdt set /chosen xen,xen-bootargs "console=dtuart dtuart=/soc/serial@7e215040 sync_console dom0_mem=1512M bootscrub=0" -fdt set /chosen xen,dom0-bootargs "${bootargs}" - -fdt set /chosen/dom0 compatible "xen,linux-zimage", "xen,multiboot-module" -fdt set /chosen/dom0 reg <${kernel_addr_r} 0x${filesize} > - -@@KERNEL_BOOTCMD@@ ${xen_addr_r} - ${fdt_addr} diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend deleted file mode 100644 index 1e9f47d23..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:append =" \ - ${@bb.utils.contains('AGL_XEN_WANTED','1',' file://boot_xen.cmd','',d)} \ -" - -do_compile:append() { - - # if xen feature is activated we overwirte the boot script with xen specific one - if [ "${AGL_XEN_WANTED}" = "1" ]; then - sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \ - -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \ - -e 's/@@MACHINE@@/${MACHINE}/' \ - "${WORKDIR}/boot_xen.cmd" > "${WORKDIR}/boot.cmd" - - mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr - fi -} \ No newline at end of file diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/xen-be.cfg b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/xen-be.cfg deleted file mode 100644 index 36f390187..000000000 --- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/xen-be.cfg +++ /dev/null @@ -1,50 +0,0 @@ -# global stuff - these enable us to allow some -# of the not so generic stuff below for xen -CONFIG_PARAVIRT=y -CONFIG_NET=y -CONFIG_NET_CORE=y -CONFIG_NETDEVICES=y -CONFIG_BLOCK=y -CONFIG_WATCHDOG=y -CONFIG_TARGET_CORE=y -CONFIG_SCSI=y -CONFIG_FB=y -CONFIG_INPUT_MISC=y -CONFIG_MEMORY_HOTPLUG=y -CONFIG_TTY=y -# Technically not required but otherwise produces -# pretty useless systems starting from allnoconfig -# You want TCP/IP and ELF binaries right? -CONFIG_INET=y -CONFIG_BINFMT_ELF=y -# generic config -CONFIG_XEN=y -CONFIG_XEN_DOM0=y -# backend drivers -CONFIG_XEN_BACKEND=y -CONFIG_XEN_BLKDEV_BACKEND=m -CONFIG_XEN_NETDEV_BACKEND=m -CONFIG_HVC_XEN=y -CONFIG_XEN_WDT=m -CONFIG_XEN_SCSI_BACKEND=m -# frontend drivers -CONFIG_XEN_FBDEV_FRONTEND=m -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m -CONFIG_XEN_SCSI_FRONTEND=m -# others -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SCRUB_PAGES=y -CONFIG_XEN_DEV_EVTCHN=m -CONFIG_XEN_BLKDEV_FRONTEND=m -CONFIG_XEN_NETDEV_FRONTEND=m -CONFIG_XENFS=m -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=m -CONFIG_XEN_GRANT_DEV_ALLOC=m -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_PRIVCMD=m -CONFIG_DEBUG_INFO=y -CONFIG_FRAME_POINTER=y diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend index 1064f5276..70384c694 100644 --- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend +++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend @@ -13,23 +13,8 @@ AGL_KCONFIG_FRAGMENTS += "raspberrypi-hciuart.cfg" # ENABLE NETWORK (built-in) AGL_KCONFIG_FRAGMENTS += "raspberrypi_network.cfg" -# For Xen -AGL_KCONFIG_FRAGMENTS += " \ - ${@bb.utils.contains('AGL_XEN_WANTED','1','xen-be.cfg','',d)} \ -" - -# Take in account that linux under Xen should use the hvc0 console -SERIAL_OPTION = "${@bb.utils.contains('AGL_XEN_WANTED','1','hvc0','ttyS0,115200',d)}" -SERIAL = "${@oe.utils.conditional("ENABLE_UART", "1", "console=${SERIAL_OPTION}", "", d)}" - CMDLINE_DEBUG = "" -# Xen related option -CMDLINE:append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','clk_ignore_unused','',d)}' - -# Workaround for crash during brcmfmac loading. Disable it at this moment -CMDLINE:append = ' ${@bb.utils.contains('AGL_XEN_WANTED','1','modprobe.blacklist=brcmfmac','',d)}' - CMDLINE:append = " usbhid.mousepoll=0" # Add options to allow CMA to operate diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts deleted file mode 100644 index 6947a62c2..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/r8a77960-ulcb-xen.dts +++ /dev/null @@ -1,91 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for the M3ULCB (R-Car Starter Kit Pro) board - * - * Copyright (C) 2016-2018 Renesas Electronics Corp. - * Copyright (C) 2016 Cogent Embedded, Inc. - */ - -/dts-v1/; -#include "r8a77960.dtsi" -#include "ulcb.dtsi" - -/ { - model = "Renesas M3ULCB board based on r8a7796"; - compatible = "renesas,m3ulcb", "renesas,r8a7796"; - - - chosen { - /delete-property/ bootargs; - xen,xen-bootargs = "dom0_mem=752M console=dtuart dtuart=serial0 dom0_max_vcpus=4"; - xen,dom0-bootargs = "console=hvc0 clk_ignore_unused root=/dev/mmcblk1p2 rw rootwait ignore_loglevel cma=32M earlyprintk"; - - #address-cells = <2>; - #size-cells = <2>; - modules { - module@0 { - compatible = "xen,linux-zimage", - "xen,multiboot-module"; - reg = <0x0 0x7a000000 0x0 0x02000000>; - }; - }; - }; - - cpus { - idle-states { - /delete-node/ cpu-sleep-1; - }; - }; - - memory@48000000 { - device_type = "memory"; - /* first 128MB is reserved for secure area. */ - reg = <0x0 0x48000000 0x0 0x38000000>, <0x6 0x00000000 0x0 0x40000000>; - }; - - vspm_if { - compatible = "renesas,vspm_if"; - }; - - versaclock5_out3: versaclk-3 { - compatible = "fixed-clock"; - #clock-cells = <0>; - /* Initial value of versaclock out3 */ - clock-frequency = <33000000>; - }; -}; - -&a53_0 { - /delete-property/ cpu-idle-states; -}; - -&a53_1 { - /delete-property/ cpu-idle-states; -}; - -&a53_2 { - /delete-property/ cpu-idle-states; -}; - -&a53_3 { - /delete-property/ cpu-idle-states; -}; - -&du { - clocks = <&cpg CPG_MOD 724>, - <&cpg CPG_MOD 723>, - <&cpg CPG_MOD 722>, - <&versaclock5 1>, - <&versaclock5_out3>, - <&versaclock5 2>; - clock-names = "du.0", "du.1", "du.2", - "dclkin.0", "dclkin.1", "dclkin.2"; -}; - -&vspb { - status = "okay"; -}; - -&vspi0 { - status = "okay"; -}; diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/xen-be.cfg b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/xen-be.cfg deleted file mode 100644 index c9fc6d756..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/xen-be.cfg +++ /dev/null @@ -1 +0,0 @@ -CONFIG_XEN_BLKDEV_BACKEND=y diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend index 78996bf0a..644a8c70f 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend @@ -10,15 +10,3 @@ SRC_URI:append = " \ AGL_KCONFIG_FRAGMENTS += "namespace_fix.cfg" AGL_KCONFIG_FRAGMENTS += "Set_GOV_PERFORMANCE.cfg" AGL_KCONFIG_FRAGMENTS += "vivid.cfg" - -# For Xen -AGL_KCONFIG_FRAGMENTS += " \ - ${@bb.utils.contains('AGL_XEN_WANTED','1','xen-be.cfg','',d)} \ -" - -SRC_URI:append:m3ulcb = " \ - ${@bb.utils.contains('AGL_XEN_WANTED','1','file://r8a77960-ulcb-xen.dts;subdir=git/arch/${ARCH}/boot/dts/renesas','',d)} \ -" -KERNEL_DEVICETREE:append:m3ulcb = " \ - ${@bb.utils.contains('AGL_XEN_WANTED','1','renesas/r8a77960-ulcb-xen.dtb','',d)} \ -" diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc index 5cf008a77..274897769 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc @@ -46,8 +46,6 @@ AGL_KCONFIG_FRAGMENTS += " \ lttng.cfg \ " -AGL_KCONFIG_FRAGMENTS += " ${@bb.utils.contains('AGL_XEN_GUEST_WANTED','1','xen_domu.cfg','',d)}" - # Base ALSA support and other sound related configuration AGL_KCONFIG_FRAGMENTS += "sound.cfg" diff --git a/meta-agl-core/recipes-kernel/linux/linux/xen_domu.cfg b/meta-agl-core/recipes-kernel/linux/linux/xen_domu.cfg deleted file mode 100644 index 8bc59eb1e..000000000 --- a/meta-agl-core/recipes-kernel/linux/linux/xen_domu.cfg +++ /dev/null @@ -1,25 +0,0 @@ -CONFIG_XEN=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_SCSI_FRONTEND=y -CONFIG_XEN_NETDEV_FRONTEND=y -CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y -CONFIG_HVC_XEN=y -CONFIG_HVC_XEN_FRONTEND=y -CONFIG_XEN_FBDEV_FRONTEND=y -CONFIG_MMC_SDHCI_XENON=y -CONFIG_XEN_BALLOON=y -CONFIG_XEN_SCRUB_PAGES_DEFAULT=y -CONFIG_XEN_DEV_EVTCHN=y -CONFIG_XEN_BACKEND=y -CONFIG_XENFS=y -CONFIG_XEN_COMPAT_XENFS=y -CONFIG_XEN_SYS_HYPERVISOR=y -CONFIG_XEN_XENBUS_FRONTEND=y -CONFIG_XEN_GNTDEV=y -CONFIG_XEN_GNTDEV_DMABUF=y -CONFIG_XEN_GRANT_DEV_ALLOC=y -CONFIG_XEN_GRANT_DMA_ALLOC=y -CONFIG_SWIOTLB_XEN=y -CONFIG_XEN_PVCALLS_FRONTEND=y -CONFIG_XEN_PRIVCMD=y -CONFIG_XEN_AUTO_XLATE=y \ No newline at end of file diff --git a/templates/feature/agl-virt-guest-xen/50_local.conf.inc b/templates/feature/agl-virt-guest-xen/50_local.conf.inc deleted file mode 100644 index 07950559e..000000000 --- a/templates/feature/agl-virt-guest-xen/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Set Xen flag - -AGL_XEN_GUEST_WANTED = "1" diff --git a/templates/feature/agl-virt-xen/50_local.conf.inc b/templates/feature/agl-virt-xen/50_local.conf.inc deleted file mode 100644 index 48f4b2b7d..000000000 --- a/templates/feature/agl-virt-xen/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Set Xen flag - -AGL_XEN_WANTED = "1" diff --git a/templates/feature/agl-virt-xen/included.dep b/templates/feature/agl-virt-xen/included.dep deleted file mode 100644 index e4acef2bf..000000000 --- a/templates/feature/agl-virt-xen/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-virt -- 2.16.6