Implement firmware upload and R5 control

Added control of the R5 cores and firmware management interface
using sysfs from Linux.

Change-Id: I308e043dc867896d3f9c40d077f96cc01202ba1f

3 files changed, 235 insertions, 95 deletions

diff --git a/recipes-kernel/linux/linux-xlnx/xilinx-4.14.defconfig b/recipes-kernel/linux/linux-xlnx/xilinx-amp-4.14.config
index ec66580..f1b3299 100644
--- a/recipes-kernel/linux/linux-xlnx/xilinx-4.14.defconfig
+++ b/recipes-kernel/linux/linux-xlnx/xilinx-amp-4.14.config
@@ -479,6 +479,8 @@ CONFIG_NO_BOOTMEM=y
 CONFIG_MEMORY_ISOLATION=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 CONFIG_PHYS_ADDR_T_64BIT=y
@@ -558,8 +560,13 @@ CONFIG_SYSVIPC_COMPAT=y
 #
 # CONFIG_SUSPEND is not set
 # CONFIG_HIBERNATION is not set
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_PM_OPP=y
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_OF=y
 CONFIG_CPU_PM=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -1021,6 +1028,7 @@ CONFIG_BT_HCIBTSDIO=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_SERDEV=y
 CONFIG_BT_HCIUART_H4=y
+# CONFIG_BT_HCIUART_NOKIA is not set
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
@@ -1155,6 +1163,7 @@ CONFIG_ARM_CCI400_PMU=y
 # CONFIG_ARM_CCI5xx_PMU is not set
 # CONFIG_ARM_CCN is not set
 # CONFIG_BRCMSTB_GISB_ARB is not set
+# CONFIG_SIMPLE_PM_BUS is not set
 # CONFIG_VEXPRESS_CONFIG is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
@@ -1281,7 +1290,7 @@ CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
-CONFIG_OF_CONFIGFS=y
+# CONFIG_OF_CONFIGFS is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_NULL_BLK is not set
@@ -1331,7 +1340,7 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 # CONFIG_TI_DAC7512 is not set
 # CONFIG_USB_SWITCH_FSA9480 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
-# CONFIG_SRAM is not set
+CONFIG_SRAM=y
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_XILINX_SDFEC=y
 # CONFIG_XILINX_TRAFGEN is not set
@@ -2079,7 +2088,6 @@ CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_VIRTIO_CONSOLE is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 
 #
@@ -2334,6 +2342,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LTC3651 is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
 # CONFIG_CHARGER_BQ24735 is not set
 # CONFIG_CHARGER_BQ25890 is not set
@@ -3380,6 +3389,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #
 # CONFIG_USB_DEFAULT_PERSIST is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
@@ -3446,14 +3456,12 @@ CONFIG_USB_UAS=y
 # CONFIG_USB_MUSB_HDRC is not set
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_HOST=y
-# CONFIG_USB_DWC3_GADGET is not set
 
 #
 # Platform Glue Driver Support
 #
 CONFIG_USB_DWC3_OF_SIMPLE=y
 # CONFIG_USB_DWC2 is not set
-# CONFIG_USB_CHIPIDEA is not set
 # CONFIG_USB_ISP1760 is not set
 
 #
@@ -3496,76 +3504,7 @@ CONFIG_USB_DWC3_OF_SIMPLE=y
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_USB_GPIO_VBUS is not set
 # CONFIG_USB_ISP1301 is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-
-#
-# USB Peripheral Controller
-#
-# CONFIG_USB_FOTG210_UDC is not set
-# CONFIG_USB_GR_UDC is not set
-# CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_PXA27X is not set
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_SNP_UDC_PLAT is not set
-# CONFIG_USB_M66592 is not set
-# CONFIG_USB_BDC_UDC is not set
-# CONFIG_USB_AMD5536UDC is not set
-# CONFIG_USB_NET2272 is not set
-# CONFIG_USB_NET2280 is not set
-# CONFIG_USB_GOKU is not set
-# CONFIG_USB_EG20T is not set
-CONFIG_USB_GADGET_XILINX=y
-# CONFIG_USB_DUMMY_HCD is not set
-CONFIG_USB_LIBCOMPOSITE=y
-CONFIG_USB_U_ETHER=y
-CONFIG_USB_F_ECM=m
-CONFIG_USB_F_EEM=y
-CONFIG_USB_F_SUBSET=m
-CONFIG_USB_F_RNDIS=m
-CONFIG_USB_F_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS=y
-# CONFIG_USB_CONFIGFS_SERIAL is not set
-# CONFIG_USB_CONFIGFS_ACM is not set
-# CONFIG_USB_CONFIGFS_OBEX is not set
-# CONFIG_USB_CONFIGFS_NCM is not set
-# CONFIG_USB_CONFIGFS_ECM is not set
-# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set
-# CONFIG_USB_CONFIGFS_RNDIS is not set
-CONFIG_USB_CONFIGFS_EEM=y
-CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-# CONFIG_USB_CONFIGFS_F_LB_SS is not set
-# CONFIG_USB_CONFIGFS_F_FS is not set
-# CONFIG_USB_CONFIGFS_F_UAC1 is not set
-# CONFIG_USB_CONFIGFS_F_UAC1_LEGACY is not set
-# CONFIG_USB_CONFIGFS_F_UAC2 is not set
-# CONFIG_USB_CONFIGFS_F_MIDI is not set
-# CONFIG_USB_CONFIGFS_F_HID is not set
-# CONFIG_USB_CONFIGFS_F_UVC is not set
-# CONFIG_USB_CONFIGFS_F_PRINTER is not set
-# CONFIG_USB_ZERO is not set
-# CONFIG_USB_AUDIO is not set
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH_EEM=y
-# CONFIG_USB_G_NCM is not set
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FUNCTIONFS is not set
-CONFIG_USB_MASS_STORAGE=m
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_MIDI_GADGET is not set
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
-# CONFIG_USB_G_ACM_MS is not set
-# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_HID is not set
-# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
+# CONFIG_USB_GADGET is not set
 
 #
 # USB Power Delivery and Type-C drivers
@@ -3793,6 +3732,7 @@ CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_AMBA_PL08X is not set
+# CONFIG_BCM_SBA_RAID is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
 # CONFIG_MV_XOR_V2 is not set
@@ -3827,8 +3767,8 @@ CONFIG_SYNC_FILE=y
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=y
 # CONFIG_UIO_CIF is not set
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_PDRV_GENIRQ=y
+CONFIG_UIO_DMEM_GENIRQ=y
 # CONFIG_UIO_AEC is not set
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_UIO_PCI_GENERIC is not set
@@ -3836,17 +3776,26 @@ CONFIG_UIO_DMEM_GENIRQ=m
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
 CONFIG_UIO_XILINX_APM=y
-# CONFIG_VFIO is not set
-# CONFIG_VIRT_DRIVERS is not set
+CONFIG_VFIO_IOMMU_TYPE1=y
+# CONFIG_VFIO_VIRQFD is not set
+CONFIG_VFIO=y
+# CONFIG_VFIO_NOIOMMU is not set
+# CONFIG_VFIO_PCI is not set
+# CONFIG_VFIO_PLATFORM is not set
+# CONFIG_VFIO_MDEV is not set
+CONFIG_VIRT_DRIVERS=y
+# CONFIG_JAILHOUSE_DBGCON is not set
 CONFIG_VIRTIO=y
 
 #
 # Virtio drivers
 #
-# CONFIG_VIRTIO_PCI is not set
-# CONFIG_VIRTIO_BALLOON is not set
-# CONFIG_VIRTIO_INPUT is not set
-# CONFIG_VIRTIO_MMIO is not set
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 
 #
 # Microsoft Hyper-V guest support
@@ -4018,7 +3967,14 @@ CONFIG_ARM64_ERRATUM_858921=y
 # CONFIG_SH_TIMER_MTU2 is not set
 # CONFIG_SH_TIMER_TMU is not set
 # CONFIG_EM_TIMER_STI is not set
-# CONFIG_MAILBOX is not set
+CONFIG_MAILBOX=y
+# CONFIG_ARM_MHU is not set
+# CONFIG_PLATFORM_MHU is not set
+# CONFIG_PL320_MBOX is not set
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_MAILBOX_TEST=m
+# CONFIG_BCM_FLEXRM_MBOX is not set
+CONFIG_ZYNQMP_IPI_MBOX=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
 
@@ -4039,10 +3995,15 @@ CONFIG_ARM_SMMU=y
 # Remoteproc drivers
 #
 CONFIG_REMOTEPROC=y
+CONFIG_ZYNQMP_R5_REMOTEPROC=y
 
 #
 # Rpmsg drivers
 #
+CONFIG_RPMSG=y
+CONFIG_RPMSG_CHAR=y
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+CONFIG_RPMSG_VIRTIO=y
 
 #
 # SOC (System On Chip) specific Drivers
@@ -4075,8 +4036,20 @@ CONFIG_XILINX_VCU=m
 #
 # Zynq MPSoC SoC Drivers
 #
+CONFIG_ZYNQMP_POWER=y
+CONFIG_ZYNQMP_PM_DOMAINS=y
 # CONFIG_PM_DEVFREQ is not set
-# CONFIG_EXTCON is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_USB_GPIO is not set
 # CONFIG_MEMORY is not set
 CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
@@ -4475,13 +4448,19 @@ CONFIG_FPGA_BRIDGE=y
 # FSI support
 #
 # CONFIG_FSI is not set
-# CONFIG_TEE is not set
+CONFIG_TEE=m
+
+#
+# TEE drivers
+#
+CONFIG_OPTEE=m
 
 #
 # Firmware Drivers
 #
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set
+# CONFIG_ARM_SCPI_PROTOCOL is not set
 CONFIG_FIRMWARE_MEMMAP=y
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_HAVE_ARM_SMCCC=y
diff --git a/recipes-kernel/linux/linux-xlnx/zynqmp-zcu102-amp-rev1.0.dts b/recipes-kernel/linux/linux-xlnx/zynqmp-zcu102-amp-rev1.0.dts
new file mode 100644
index 0000000..390aa18
--- /dev/null
+++ b/recipes-kernel/linux/linux-xlnx/zynqmp-zcu102-amp-rev1.0.dts
@@ -0,0 +1,160 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * dts file for Xilinx ZynqMP ZCU102 Rev1.0
+ *
+ * (C) Copyright 2016 - 2018, Xilinx, Inc.
+ *
+ * Michal Simek <michal.simek@xilinx.com>
+ */
+
+#include "zynqmp-zcu102-revB.dts"
+
+/ {
+        model = "ZynqMP ZCU102 Rev1.0";
+        compatible = "xlnx,zynqmp-zcu102-rev1.0", "xlnx,zynqmp-zcu102", "xlnx,zynqmp";
+
+    reserved-memory {
+        #address-cells = <2>;
+        #size-cells = <2>;
+        ranges;
+        rproc_0_reserved: rproc@3ed00000 {
+            no-map;
+            reg = <0x0 0x3ed00000 0x0 0x8000000>;
+        };
+    };
+
+    power-domains {
+        pd_r5_0: pd_r5_0 {
+            #power-domain-cells = <0x0>;
+            pd-id = <0x7>;
+        };
+        pd_r5_1: pd_r5_1 {
+            #power-domain-cells = <0x0>;
+            pd-id = <0x8>;
+        };
+        pd_tcm_0_a: pd_tcm_0_a {
+            #power-domain-cells = <0x0>;
+            pd-id = <0xf>;
+        };
+        pd_tcm_0_b: pd_tcm_0_b {
+            #power-domain-cells = <0x0>;
+            pd-id = <0x10>;
+        };
+        pd_tcm_1_a: pd_tcm_1_a {
+            #power-domain-cells = <0x0>;
+            pd-id = <0x11>;
+        };
+        pd_tcm_1_b: pd_tcm_1_b {
+            #power-domain-cells = <0x0>;
+            pd-id = <0x12>;
+        };
+    };
+
+    amba {
+        r5_0_tcm_a: tcm@ffe00000 {
+            compatible = "mmio-sram";
+            reg = <0 0xFFE00000 0x0 0x10000>;
+            pd-handle = <&pd_tcm_0_a>;
+        };
+        r5_0_tcm_b: tcm@ffe20000 {
+            compatible = "mmio-sram";
+            reg = <0 0xFFE20000 0x0 0x10000>;
+            pd-handle = <&pd_tcm_0_b>;
+        };
+        r5_1_tcm_a: tcm@ffe90000 {
+            compatible = "mmio-sram";
+            reg = <0 0xFFE90000 0x0 0x10000>;
+            pd-handle = <&pd_tcm_1_a>;
+        };
+        r5_1_tcm_b: tcm@ffe92000 {
+            compatible = "mmio-sram";
+            reg = <0 0xFFEB0000 0x0 0x10000>;
+            pd-handle = <&pd_tcm_1_b>;
+        };
+
+        elf_ddr_0: ddr@3ed00000 {
+            compatible = "mmio-sram";
+            reg = <0 0x3ed00000 0x0 0x40000>;
+        };
+
+        elf_ddr_1: ddr@3ed40000 {
+            compatible = "mmio-sram";
+            reg = <0 0x3ed40000 0x0 0x40000>;
+        };
+
+        test_r50: zynqmp_r5_rproc@0 {
+            compatible = "xlnx,zynqmp-r5-remoteproc-1.0";
+            reg = <0x0 0xff9a0100 0 0x100>, <0x0 0xff340000 0 0x100>, <0x0 0xff9a0000 0 0x100>;
+            reg-names = "rpu_base", "ipi", "rpu_glbl_base";
+            dma-ranges;
+            core_conf = "split0";
+            srams = <&r5_0_tcm_a &r5_0_tcm_b &elf_ddr_0>;
+            pd-handle = <&pd_r5_0>;
+            interrupt-parent = <&gic>;
+            interrupts = <0 29 4>;
+
+        } ;
+
+        test_r51: zynqmp_r5_rproc@1 {
+            compatible = "xlnx,zynqmp-r5-remoteproc-1.0";
+            reg =<0x0 0xff9a0200 0 0x100>, <0x0 0xff340000 0 0x100>, <0x0 0xff9a0000 0 0x100>;
+            reg-names = "rpu_base", "ipi", "rpu_glbl_base";
+            dma-ranges;
+            core_conf = "split1";
+            srams = <&r5_1_tcm_a &r5_1_tcm_b &elf_ddr_1>;
+            pd-handle = <&pd_r5_1>;
+            interrupt-parent = <&gic>;
+            interrupts = <0 29 4>;
+
+        } ;
+
+        vring: vring@0 {
+            compatible = "vring_uio";
+            reg = <0x0 0x3ed40000 0x0 0x40000>;
+        };
+        shm0: shm@0 {
+            compatible = "shm_uio";
+            reg = <0x0 0x3ed80000 0x0 0x80000>;
+        };
+
+        vring1: vring@1 {
+            compatible = "vring_uio";
+            reg = <0x0 0x3ef00000 0x0 0x40000>;
+        };
+        shm1: shm@1 {
+            compatible = "shm_uio";
+            reg = <0x0 0x3ef40000 0x0 0x80000>;
+        };
+
+        ipi0: ipi@0 {
+            compatible = "ipi_uio";
+            reg = <0x0 0xff340000 0x0 0x1000>;
+            interrupt-parent = <&gic>;
+            interrupts = <0 29 4>;
+        };
+
+    };
+};
+
+&eeprom {
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        board_sn: board-sn@0 {
+                reg = <0x0 0x14>;
+        };
+
+        eth_mac: eth-mac@20 {
+                reg = <0x20 0x6>;
+        };
+
+        board_name: board-name@d0 {
+                reg = <0xd0 0x6>;
+        };
+
+        board_revision: board-revision@e0 {
+                reg = <0xe0 0x3>;
+        };
+};
+
+
diff --git a/recipes-kernel/linux/linux-xlnx_%.bbappend b/recipes-kernel/linux/linux-xlnx_%.bbappend
index f146fde..b7e04b0 100644
--- a/recipes-kernel/linux/linux-xlnx_%.bbappend
+++ b/recipes-kernel/linux/linux-xlnx_%.bbappend
@@ -1,14 +1,14 @@
 KENEABRANCH = "xilinx-4.14"
 SRCREV_metaenea = "3ad4487e93fcbfeead0a29457e803b43c2e38468"
 
-KERNEL_DEFCONFIG = "xilinx-4.14.defconfig"
-KBUILD_DEFCONFIG_zynqmp = "${KERNEL_DEFCONFIG}"
+KERNEL_CONFIG = "xilinx-amp-4.14.config"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
 
 SRC_URI_append = " \
     git://git@git.enea.com/linux/enea-kernel-cache.git;protocol=ssh;type=kmeta;name=metaenea;branch=${KENEABRANCH};destsuffix=enea-kernel-meta \
-    file://${KERNEL_DEFCONFIG} \
+    file://${KERNEL_CONFIG} \
+    file://zynqmp-zcu102-amp-rev1.0.dts \
     "
 
 KERNEL_FEATURES_append_zcu102-zynqmp = " \
@@ -17,9 +17,10 @@ KERNEL_FEATURES_append_zcu102-zynqmp = " \
     patches/cve/4.14.x.scc \
     "
 
-do_install_kernel_defconfig() {
-   # overwrite the original defconfig
-   install -m 0644 ${WORKDIR}/${KERNEL_DEFCONFIG} ${S}/arch/arm64/configs/${KERNEL_DEFCONFIG}
-}
+do_configure_prepend() {
+    # overwrite the .config file
+   install -m 0644 ${WORKDIR}/${KERNEL_CONFIG} ${B}/.config
 
-addtask install_kernel_defconfig after do_kernel_checkout before do_kernel_metadata
+   # overwrite the original DTS
+   install -m 0644 ${WORKDIR}/zynqmp-zcu102-amp-rev1.0.dts ${S}/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts
+}