Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git] / arch / arm / cpu / armv8 / fsl-layerscape / fdt.c
index 1a8321b0e4064d9c7f780b18e72d72cd286b2528..9c7546028a1c01b2a2a5184bc12dbe3d7fcc5a99 100644 (file)
@@ -1,11 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright 2020 NXP
  */
 
 #include <common.h>
-#include <libfdt.h>
+#include <clock_legacy.h>
+#include <efi_loader.h>
+#include <log.h>
+#include <asm/cache.h>
+#include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <phy.h>
 #ifdef CONFIG_FSL_LSCH3
 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
 #include <asm/armv8/sec_firmware.h>
 #endif
+#include <asm/arch/speed.h>
+#include <fsl_qbman.h>
 
 int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc)
 {
+       const char *conn;
+
+       /* Do NOT apply fixup for backplane modes specified in DT */
+       if (phyc == PHY_INTERFACE_MODE_XGMII) {
+               conn = fdt_getprop(blob, offset, "phy-connection-type", NULL);
+               if (is_backplane_mode(conn))
+                       return 0;
+       }
        return fdt_setprop_string(blob, offset, "phy-connection-type",
                                         phy_string_for_interface(phyc));
 }
@@ -41,7 +55,35 @@ void ft_fixup_cpu(void *blob)
        int addr_cells;
        u64 val, core_id;
        size_t *boot_code_size = &(__secondary_boot_code_size);
-#if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && defined(CONFIG_ARMV8_PSCI)
+       u32 mask = cpu_pos_mask();
+       int off_prev = -1;
+
+       off = fdt_path_offset(blob, "/cpus");
+       if (off < 0) {
+               puts("couldn't find /cpus node\n");
+               return;
+       }
+
+       fdt_support_default_count_cells(blob, off, &addr_cells, NULL);
+
+       off = fdt_node_offset_by_prop_value(blob, off_prev, "device_type",
+                                           "cpu", 4);
+       while (off != -FDT_ERR_NOTFOUND) {
+               reg = (fdt32_t *)fdt_getprop(blob, off, "reg", 0);
+               if (reg) {
+                       core_id = fdt_read_number(reg, addr_cells);
+                       if (!test_bit(id_to_core(core_id), &mask)) {
+                               fdt_del_node(blob, off);
+                               off = off_prev;
+                       }
+               }
+               off_prev = off;
+               off = fdt_node_offset_by_prop_value(blob, off_prev,
+                                                   "device_type", "cpu", 4);
+       }
+
+#if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && \
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        int node;
        u32 psci_ver;
 
@@ -77,13 +119,13 @@ remove_psci_node:
                puts("couldn't find /cpus node\n");
                return;
        }
-       of_bus_default_count_cells(blob, off, &addr_cells, NULL);
+       fdt_support_default_count_cells(blob, off, &addr_cells, NULL);
 
        off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4);
        while (off != -FDT_ERR_NOTFOUND) {
                reg = (fdt32_t *)fdt_getprop(blob, off, "reg", 0);
                if (reg) {
-                       core_id = of_read_number(reg, addr_cells);
+                       core_id = fdt_read_number(reg, addr_cells);
                        if (core_id  == 0 || (is_core_online(core_id))) {
                                val = spin_tbl_addr;
                                val += id_to_core(core_id) *
@@ -105,6 +147,10 @@ remove_psci_node:
 
        fdt_add_mem_rsv(blob, (uintptr_t)&secondary_boot_code,
                        *boot_code_size);
+#if CONFIG_IS_ENABLED(EFI_LOADER)
+       efi_add_memory_map((uintptr_t)&secondary_boot_code, *boot_code_size,
+                          EFI_RESERVED_MEMORY_TYPE);
+#endif
 }
 #endif
 
@@ -126,11 +172,276 @@ void fsl_fdt_disable_usb(void *blob)
        }
 }
 
+#ifdef CONFIG_HAS_FEATURE_GIC64K_ALIGN
+static void fdt_fixup_gic(void *blob)
+{
+       int offset, err;
+       u64 reg[8];
+       struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
+       unsigned int val;
+       struct ccsr_scfg __iomem *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR;
+       int align_64k = 0;
+
+       val = gur_in32(&gur->svr);
+
+       if (!IS_SVR_DEV(val, SVR_DEV(SVR_LS1043A))) {
+               align_64k = 1;
+       } else if (SVR_REV(val) != REV1_0) {
+               val = scfg_in32(&scfg->gic_align) & (0x01 << GIC_ADDR_BIT);
+               if (!val)
+                       align_64k = 1;
+       }
+
+       offset = fdt_subnode_offset(blob, 0, "interrupt-controller@1400000");
+       if (offset < 0) {
+               printf("WARNING: fdt_subnode_offset can't find node %s: %s\n",
+                      "interrupt-controller@1400000", fdt_strerror(offset));
+               return;
+       }
+
+       /* Fixup gic node align with 64K */
+       if (align_64k) {
+               reg[0] = cpu_to_fdt64(GICD_BASE_64K);
+               reg[1] = cpu_to_fdt64(GICD_SIZE_64K);
+               reg[2] = cpu_to_fdt64(GICC_BASE_64K);
+               reg[3] = cpu_to_fdt64(GICC_SIZE_64K);
+               reg[4] = cpu_to_fdt64(GICH_BASE_64K);
+               reg[5] = cpu_to_fdt64(GICH_SIZE_64K);
+               reg[6] = cpu_to_fdt64(GICV_BASE_64K);
+               reg[7] = cpu_to_fdt64(GICV_SIZE_64K);
+       } else {
+       /* Fixup gic node align with default */
+               reg[0] = cpu_to_fdt64(GICD_BASE);
+               reg[1] = cpu_to_fdt64(GICD_SIZE);
+               reg[2] = cpu_to_fdt64(GICC_BASE);
+               reg[3] = cpu_to_fdt64(GICC_SIZE);
+               reg[4] = cpu_to_fdt64(GICH_BASE);
+               reg[5] = cpu_to_fdt64(GICH_SIZE);
+               reg[6] = cpu_to_fdt64(GICV_BASE);
+               reg[7] = cpu_to_fdt64(GICV_SIZE);
+       }
+
+       err = fdt_setprop(blob, offset, "reg", reg, sizeof(reg));
+       if (err < 0) {
+               printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
+                      "reg", "interrupt-controller@1400000",
+                      fdt_strerror(err));
+               return;
+       }
+
+       return;
+}
+#endif
+
+#ifdef CONFIG_HAS_FEATURE_ENHANCED_MSI
+static int _fdt_fixup_msi_node(void *blob, const char *name,
+                                 int irq_0, int irq_1, int rev)
+{
+       int err, offset, len;
+       u32 tmp[4][3];
+       void *p;
+
+       offset = fdt_path_offset(blob, name);
+       if (offset < 0) {
+               printf("WARNING: fdt_path_offset can't find path %s: %s\n",
+                      name, fdt_strerror(offset));
+               return 0;
+       }
+
+       /*fixup the property of interrupts*/
+
+       tmp[0][0] = cpu_to_fdt32(0x0);
+       tmp[0][1] = cpu_to_fdt32(irq_0);
+       tmp[0][2] = cpu_to_fdt32(0x4);
+
+       if (rev > REV1_0) {
+               tmp[1][0] = cpu_to_fdt32(0x0);
+               tmp[1][1] = cpu_to_fdt32(irq_1);
+               tmp[1][2] = cpu_to_fdt32(0x4);
+               tmp[2][0] = cpu_to_fdt32(0x0);
+               tmp[2][1] = cpu_to_fdt32(irq_1 + 1);
+               tmp[2][2] = cpu_to_fdt32(0x4);
+               tmp[3][0] = cpu_to_fdt32(0x0);
+               tmp[3][1] = cpu_to_fdt32(irq_1 + 2);
+               tmp[3][2] = cpu_to_fdt32(0x4);
+               len = sizeof(tmp);
+       } else {
+               len = sizeof(tmp[0]);
+       }
+
+       err = fdt_setprop(blob, offset, "interrupts", tmp, len);
+       if (err < 0) {
+               printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
+                      "interrupts", name, fdt_strerror(err));
+               return 0;
+       }
+
+       /*fixup the property of reg*/
+       p = (char *)fdt_getprop(blob, offset, "reg", &len);
+       if (!p) {
+               printf("WARNING: fdt_getprop can't get %s from node %s\n",
+                      "reg", name);
+               return 0;
+       }
+
+       memcpy((char *)tmp, p, len);
+
+       if (rev > REV1_0)
+               *((u32 *)tmp + 3) = cpu_to_fdt32(0x1000);
+       else
+               *((u32 *)tmp + 3) = cpu_to_fdt32(0x8);
+
+       err = fdt_setprop(blob, offset, "reg", tmp, len);
+       if (err < 0) {
+               printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
+                      "reg", name, fdt_strerror(err));
+               return 0;
+       }
+
+       /*fixup the property of compatible*/
+       if (rev > REV1_0)
+               err = fdt_setprop_string(blob, offset, "compatible",
+                                        "fsl,ls1043a-v1.1-msi");
+       else
+               err = fdt_setprop_string(blob, offset, "compatible",
+                                        "fsl,ls1043a-msi");
+       if (err < 0) {
+               printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
+                      "compatible", name, fdt_strerror(err));
+               return 0;
+       }
+
+       return 1;
+}
+
+static int _fdt_fixup_pci_msi(void *blob, const char *name, int rev)
+{
+       int offset, len, err;
+       void *p;
+       int val;
+       u32 tmp[4][8];
+
+       offset = fdt_path_offset(blob, name);
+       if (offset < 0) {
+               printf("WARNING: fdt_path_offset can't find path %s: %s\n",
+                      name, fdt_strerror(offset));
+               return 0;
+       }
+
+       p = (char *)fdt_getprop(blob, offset, "interrupt-map", &len);
+       if (!p || len != sizeof(tmp)) {
+               printf("WARNING: fdt_getprop can't get %s from node %s\n",
+                      "interrupt-map", name);
+               return 0;
+       }
+
+       memcpy((char *)tmp, p, len);
+
+       val = fdt32_to_cpu(tmp[0][6]);
+       if (rev == REV1_0) {
+               tmp[1][6] = cpu_to_fdt32(val + 1);
+               tmp[2][6] = cpu_to_fdt32(val + 2);
+               tmp[3][6] = cpu_to_fdt32(val + 3);
+       } else {
+               tmp[1][6] = cpu_to_fdt32(val);
+               tmp[2][6] = cpu_to_fdt32(val);
+               tmp[3][6] = cpu_to_fdt32(val);
+       }
+
+       err = fdt_setprop(blob, offset, "interrupt-map", tmp, sizeof(tmp));
+       if (err < 0) {
+               printf("WARNING: fdt_setprop can't set %s from node %s: %s.\n",
+                      "interrupt-map", name, fdt_strerror(err));
+               return 0;
+       }
+       return 1;
+}
+
+/* Fixup msi node for ls1043a rev1.1*/
+
+static void fdt_fixup_msi(void *blob)
+{
+       struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
+       unsigned int rev;
+
+       rev = gur_in32(&gur->svr);
+
+       if (!IS_SVR_DEV(rev, SVR_DEV(SVR_LS1043A)))
+               return;
+
+       rev = SVR_REV(rev);
+
+       _fdt_fixup_msi_node(blob, "/soc/msi-controller1@1571000",
+                           116, 111, rev);
+       _fdt_fixup_msi_node(blob, "/soc/msi-controller2@1572000",
+                           126, 121, rev);
+       _fdt_fixup_msi_node(blob, "/soc/msi-controller3@1573000",
+                           160, 155, rev);
+
+       _fdt_fixup_pci_msi(blob, "/soc/pcie@3400000", rev);
+       _fdt_fixup_pci_msi(blob, "/soc/pcie@3500000", rev);
+       _fdt_fixup_pci_msi(blob, "/soc/pcie@3600000", rev);
+}
+#endif
+
+#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+/* Remove JR node used by SEC firmware */
+void fdt_fixup_remove_jr(void *blob)
+{
+       int jr_node, addr_cells, len;
+       int crypto_node = fdt_path_offset(blob, "crypto");
+       u64 jr_offset, used_jr;
+       fdt32_t *reg;
+
+       used_jr = sec_firmware_used_jobring_offset();
+       fdt_support_default_count_cells(blob, crypto_node, &addr_cells, NULL);
+
+       jr_node = fdt_node_offset_by_compatible(blob, crypto_node,
+                                               "fsl,sec-v4.0-job-ring");
+
+       while (jr_node != -FDT_ERR_NOTFOUND) {
+               reg = (fdt32_t *)fdt_getprop(blob, jr_node, "reg", &len);
+               jr_offset = fdt_read_number(reg, addr_cells);
+               if (jr_offset == used_jr) {
+                       fdt_del_node(blob, jr_node);
+                       break;
+               }
+               jr_node = fdt_node_offset_by_compatible(blob, jr_node,
+                                                       "fsl,sec-v4.0-job-ring");
+       }
+}
+#endif
+
+#ifdef CONFIG_ARCH_LS1028A
+static void fdt_disable_multimedia(void *blob, unsigned int svr)
+{
+       int off;
+
+       if (IS_MULTIMEDIA_EN(svr))
+               return;
+
+       /* Disable eDP/LCD node */
+       off = fdt_node_offset_by_compatible(blob, -1, "arm,mali-dp500");
+       if (off != -FDT_ERR_NOTFOUND)
+               fdt_status_disabled(blob, off);
+
+       /* Disable GPU node */
+       off = fdt_node_offset_by_compatible(blob, -1, "fsl,ls1028a-gpu");
+       if (off != -FDT_ERR_NOTFOUND)
+               fdt_status_disabled(blob, off);
+}
+#endif
+
+#ifdef CONFIG_PCIE_ECAM_GENERIC
+__weak void fdt_fixup_ecam(void *blob)
+{
+}
+#endif
+
 void ft_cpu_setup(void *blob, bd_t *bd)
 {
-#ifdef CONFIG_FSL_LSCH2
        struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
-       unsigned int svr = in_be32(&gur->svr);
+       unsigned int svr = gur_in32(&gur->svr);
 
        /* delete crypto node if not on an E-processor */
        if (!IS_E_PROCESSOR(svr))
@@ -139,11 +450,15 @@ void ft_cpu_setup(void *blob, bd_t *bd)
        else {
                ccsr_sec_t __iomem *sec;
 
+#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+               fdt_fixup_remove_jr(blob);
+               fdt_fixup_kaslr(blob);
+#endif
+
                sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR;
                fdt_fixup_crypto_node(blob, sec_in32(&sec->secvid_ms));
        }
 #endif
-#endif
 
 #ifdef CONFIG_MP
        ft_fixup_cpu(blob);
@@ -154,10 +469,14 @@ void ft_cpu_setup(void *blob, bd_t *bd)
                               "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
 #endif
 
-       do_fixup_by_compat_u32(blob, "fixed-clock",
-                              "clock-frequency", CONFIG_SYS_CLK_FREQ, 1);
+       do_fixup_by_path_u32(blob, "/sysclk", "clock-frequency",
+                            CONFIG_SYS_CLK_FREQ, 1);
+
+#ifdef CONFIG_GIC_V3_ITS
+       ls_gic_rd_tables_init(blob);
+#endif
 
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCIE_LAYERSCAPE) || defined(CONFIG_PCIE_LAYERSCAPE_GEN4)
        ft_pci_setup(blob, bd);
 #endif
 
@@ -165,9 +484,29 @@ void ft_cpu_setup(void *blob, bd_t *bd)
        fdt_fixup_esdhc(blob, bd);
 #endif
 
+#ifdef CONFIG_SYS_DPAA_QBMAN
+       fdt_fixup_bportals(blob);
+       fdt_fixup_qportals(blob);
+       do_fixup_by_compat_u32(blob, "fsl,qman",
+                              "clock-frequency", get_qman_freq(), 1);
+#endif
+
 #ifdef CONFIG_SYS_DPAA_FMAN
        fdt_fixup_fman_firmware(blob);
 #endif
+#ifndef CONFIG_ARCH_LS1012A
        fsl_fdt_disable_usb(blob);
-
+#endif
+#ifdef CONFIG_HAS_FEATURE_GIC64K_ALIGN
+       fdt_fixup_gic(blob);
+#endif
+#ifdef CONFIG_HAS_FEATURE_ENHANCED_MSI
+       fdt_fixup_msi(blob);
+#endif
+#ifdef CONFIG_ARCH_LS1028A
+       fdt_disable_multimedia(blob, svr);
+#endif
+#ifdef CONFIG_PCIE_ECAM_GENERIC
+       fdt_fixup_ecam(blob);
+#endif
 }