Merge branch 'master' of git://git.denx.de/u-boot
[oweals/u-boot.git] / drivers / net / fsl-mc / mc.c
index 74b0085301c5ac407089971399ba49ec8c713355..46b8a6bc69912f4da1868fe6ca3f87d4fe9f8b78 100644 (file)
@@ -3,16 +3,88 @@
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
-
+#include <common.h>
 #include <errno.h>
+#include <linux/bug.h>
 #include <asm/io.h>
+#include <libfdt.h>
+#include <fdt_support.h>
 #include <fsl-mc/fsl_mc.h>
 #include <fsl-mc/fsl_mc_sys.h>
+#include <fsl-mc/fsl_mc_private.h>
 #include <fsl-mc/fsl_dpmng.h>
+#include <fsl-mc/fsl_dprc.h>
+#include <fsl-mc/fsl_dpio.h>
+#include <fsl-mc/fsl_dpni.h>
+#include <fsl-mc/fsl_qbman_portal.h>
+#include <fsl-mc/ldpaa_wriop.h>
+
+#define MC_RAM_BASE_ADDR_ALIGNMENT  (512UL * 1024 * 1024)
+#define MC_RAM_BASE_ADDR_ALIGNMENT_MASK        (~(MC_RAM_BASE_ADDR_ALIGNMENT - 1))
+#define MC_RAM_SIZE_ALIGNMENT      (256UL * 1024 * 1024)
+
+#define MC_MEM_SIZE_ENV_VAR    "mcmemsize"
+#define MC_BOOT_TIMEOUT_ENV_VAR        "mcboottimeout"
 
 DECLARE_GLOBAL_DATA_PTR;
-static int mc_boot_status;
+static int mc_boot_status = -1;
+static int mc_dpl_applied = -1;
+#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+static int mc_aiop_applied = -1;
+#endif
+struct fsl_mc_io *root_mc_io = NULL;
+struct fsl_mc_io *dflt_mc_io = NULL; /* child container */
+uint16_t root_dprc_handle = 0;
+uint16_t dflt_dprc_handle = 0;
+int child_dprc_id;
+struct fsl_dpbp_obj *dflt_dpbp = NULL;
+struct fsl_dpio_obj *dflt_dpio = NULL;
+struct fsl_dpni_obj *dflt_dpni = NULL;
+static u64 mc_lazy_dpl_addr;
+
+#ifdef DEBUG
+void dump_ram_words(const char *title, void *addr)
+{
+       int i;
+       uint32_t *words = addr;
+
+       printf("Dumping beginning of %s (%p):\n", title, addr);
+       for (i = 0; i < 16; i++)
+               printf("%#x ", words[i]);
+
+       printf("\n");
+}
+
+void dump_mc_ccsr_regs(struct mc_ccsr_registers __iomem *mc_ccsr_regs)
+{
+       printf("MC CCSR registers:\n"
+               "reg_gcr1 %#x\n"
+               "reg_gsr %#x\n"
+               "reg_sicbalr %#x\n"
+               "reg_sicbahr %#x\n"
+               "reg_sicapr %#x\n"
+               "reg_mcfbalr %#x\n"
+               "reg_mcfbahr %#x\n"
+               "reg_mcfapr %#x\n"
+               "reg_psr %#x\n",
+               mc_ccsr_regs->reg_gcr1,
+               mc_ccsr_regs->reg_gsr,
+               mc_ccsr_regs->reg_sicbalr,
+               mc_ccsr_regs->reg_sicbahr,
+               mc_ccsr_regs->reg_sicapr,
+               mc_ccsr_regs->reg_mcfbalr,
+               mc_ccsr_regs->reg_mcfbahr,
+               mc_ccsr_regs->reg_mcfapr,
+               mc_ccsr_regs->reg_psr);
+}
+#else
+
+#define dump_ram_words(title, addr)
+#define dump_mc_ccsr_regs(mc_ccsr_regs)
 
+#endif /* DEBUG */
+
+#ifndef CONFIG_SYS_LS_MC_FW_IN_DDR
 /**
  * Copying MC firmware or DPL image to DDR
  */
@@ -21,6 +93,7 @@ static int mc_copy_image(const char *title,
 {
        debug("%s copied to address %p\n", title, (void *)mc_ram_addr);
        memcpy((void *)mc_ram_addr, (void *)image_addr, image_size);
+       flush_dcache_range(mc_ram_addr, mc_ram_addr + image_size);
        return 0;
 }
 
@@ -31,7 +104,8 @@ static int mc_copy_image(const char *title,
  * Returns 0 on success and a negative errno on error.
  * task fail.
  **/
-int parse_mc_firmware_fit_image(const void **raw_image_addr,
+int parse_mc_firmware_fit_image(u64 mc_fw_addr,
+                               const void **raw_image_addr,
                                size_t *raw_image_size)
 {
        int format;
@@ -41,36 +115,31 @@ int parse_mc_firmware_fit_image(const void **raw_image_addr,
        size_t size;
        const char *uname = "firmware";
 
-       /* Check if the image is in NOR flash */
-#ifdef CONFIG_SYS_LS_MC_FW_IN_NOR
-       fit_hdr = (void *)CONFIG_SYS_LS_MC_FW_ADDR;
-#else
-#error "No CONFIG_SYS_LS_MC_FW_IN_xxx defined"
-#endif
+       fit_hdr = (void *)mc_fw_addr;
 
        /* Check if Image is in FIT format */
        format = genimg_get_format(fit_hdr);
 
        if (format != IMAGE_FORMAT_FIT) {
-               printf("fsl-mc: ERROR: Bad firmware image (not a FIT image)\n");
+               printf("fsl-mc: ERR: Bad firmware image (not a FIT image)\n");
                return -EINVAL;
        }
 
        if (!fit_check_format(fit_hdr)) {
-               printf("fsl-mc: ERROR: Bad firmware image (bad FIT header)\n");
+               printf("fsl-mc: ERR: Bad firmware image (bad FIT header)\n");
                return -EINVAL;
        }
 
        node_offset = fit_image_get_node(fit_hdr, uname);
 
        if (node_offset < 0) {
-               printf("fsl-mc: ERROR: Bad firmware image (missing subimage)\n");
+               printf("fsl-mc: ERR: Bad firmware image (missing subimage)\n");
                return -ENOENT;
        }
 
        /* Verify MC firmware image */
        if (!(fit_image_verify(fit_hdr, node_offset))) {
-               printf("fsl-mc: ERROR: Bad firmware image (bad CRC)\n");
+               printf("fsl-mc: ERR: Bad firmware image (bad CRC)\n");
                return -EINVAL;
        }
 
@@ -82,163 +151,273 @@ int parse_mc_firmware_fit_image(const void **raw_image_addr,
 
        return 0;
 }
+#endif
 
-int mc_init(bd_t *bis)
+/*
+ * Calculates the values to be used to specify the address range
+ * for the MC private DRAM block, in the MCFBALR/MCFBAHR registers.
+ * It returns the highest 512MB-aligned address within the given
+ * address range, in '*aligned_base_addr', and the number of 256 MiB
+ * blocks in it, in 'num_256mb_blocks'.
+ */
+static int calculate_mc_private_ram_params(u64 mc_private_ram_start_addr,
+                                          size_t mc_ram_size,
+                                          u64 *aligned_base_addr,
+                                          u8 *num_256mb_blocks)
 {
-       int error = 0;
-       int timeout = 200000;
-       struct mc_ccsr_registers __iomem *mc_ccsr_regs = MC_CCSR_BASE_ADDR;
-       u64 mc_ram_addr;
-       u64 mc_dpl_offset;
-       u32 reg_gsr;
-       u32 mc_fw_boot_status;
-       void *dpl_fdt_hdr;
-       int dpl_size;
-       const void *raw_image_addr;
-       size_t raw_image_size = 0;
-       struct fsl_mc_io mc_io;
-       int portal_id;
-       struct mc_version mc_ver_info;
+       u64 addr;
+       u16 num_blocks;
 
-       /*
-        * The MC private DRAM block was already carved at the end of DRAM
-        * by board_init_f() using CONFIG_SYS_MEM_TOP_HIDE:
-        */
-       if (gd->bd->bi_dram[1].start) {
-               mc_ram_addr =
-                       gd->bd->bi_dram[1].start + gd->bd->bi_dram[1].size;
-       } else {
-               mc_ram_addr =
-                       gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;
+       if (mc_ram_size % MC_RAM_SIZE_ALIGNMENT != 0) {
+               printf("fsl-mc: ERROR: invalid MC private RAM size (%lu)\n",
+                      mc_ram_size);
+               return -EINVAL;
        }
 
-       /*
-        * Management Complex cores should be held at reset out of POR.
-        * U-boot should be the first software to touch MC. To be safe,
-        * we reset all cores again by setting GCR1 to 0. It doesn't do
-        * anything if they are held at reset. After we setup the firmware
-        * we kick off MC by deasserting the reset bit for core 0, and
-        * deasserting the reset bits for Command Portal Managers.
-        * The stop bits are not touched here. They are used to stop the
-        * cores when they are active. Setting stop bits doesn't stop the
-        * cores from fetching instructions when they are released from
-        * reset.
-        */
-       out_le32(&mc_ccsr_regs->reg_gcr1, 0);
-       dmb();
+       num_blocks = mc_ram_size / MC_RAM_SIZE_ALIGNMENT;
+       if (num_blocks < 1 || num_blocks > 0xff) {
+               printf("fsl-mc: ERROR: invalid MC private RAM size (%lu)\n",
+                      mc_ram_size);
+               return -EINVAL;
+       }
 
-       error = parse_mc_firmware_fit_image(&raw_image_addr, &raw_image_size);
-       if (error != 0)
-               goto out;
-       /*
-        * Load the MC FW at the beginning of the MC private DRAM block:
-        */
-       mc_copy_image("MC Firmware",
-                     (u64)raw_image_addr, raw_image_size, mc_ram_addr);
+       addr = (mc_private_ram_start_addr + mc_ram_size - 1) &
+               MC_RAM_BASE_ADDR_ALIGNMENT_MASK;
+
+       if (addr < mc_private_ram_start_addr) {
+               printf("fsl-mc: ERROR: bad start address %#llx\n",
+                      mc_private_ram_start_addr);
+               return -EFAULT;
+       }
+
+       *aligned_base_addr = addr;
+       *num_256mb_blocks = num_blocks;
+       return 0;
+}
+
+static int mc_fixup_dpc(u64 dpc_addr)
+{
+       void *blob = (void *)dpc_addr;
+       int nodeoffset;
+
+       /* delete any existing ICID pools */
+       nodeoffset = fdt_path_offset(blob, "/resources/icid_pools");
+       if (fdt_del_node(blob, nodeoffset) < 0)
+               printf("\nfsl-mc: WARNING: could not delete ICID pool\n");
+
+       /* add a new pool */
+       nodeoffset = fdt_path_offset(blob, "/resources");
+       if (nodeoffset < 0) {
+               printf("\nfsl-mc: ERROR: DPC is missing /resources\n");
+               return -EINVAL;
+       }
+       nodeoffset = fdt_add_subnode(blob, nodeoffset, "icid_pools");
+       nodeoffset = fdt_add_subnode(blob, nodeoffset, "icid_pool@0");
+       do_fixup_by_path_u32(blob, "/resources/icid_pools/icid_pool@0",
+                            "base_icid", FSL_DPAA2_STREAM_ID_START, 1);
+       do_fixup_by_path_u32(blob, "/resources/icid_pools/icid_pool@0",
+                            "num",
+                            FSL_DPAA2_STREAM_ID_END -
+                            FSL_DPAA2_STREAM_ID_START + 1, 1);
+
+       flush_dcache_range(dpc_addr, dpc_addr + fdt_totalsize(blob));
+
+       return 0;
+}
+
+static int load_mc_dpc(u64 mc_ram_addr, size_t mc_ram_size, u64 mc_dpc_addr)
+{
+       u64 mc_dpc_offset;
+#ifndef CONFIG_SYS_LS_MC_DPC_IN_DDR
+       int error;
+       void *dpc_fdt_hdr;
+       int dpc_size;
+#endif
+
+#ifdef CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET
+       BUILD_BUG_ON((CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET & 0x3) != 0 ||
+                    CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET > 0xffffffff);
+
+       mc_dpc_offset = CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET;
+#else
+#error "CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET not defined"
+#endif
 
        /*
-        * Get address and size of the DPL blob stored in flash:
+        * Load the MC DPC blob in the MC private DRAM block:
         */
-#ifdef CONFIG_SYS_LS_MC_DPL_IN_NOR
-       dpl_fdt_hdr = (void *)CONFIG_SYS_LS_MC_DPL_ADDR;
+#ifdef CONFIG_SYS_LS_MC_DPC_IN_DDR
+       printf("MC DPC is preloaded to %#llx\n", mc_ram_addr + mc_dpc_offset);
 #else
-#error "No CONFIG_SYS_LS_MC_DPL_IN_xxx defined"
-#endif
+       /*
+        * Get address and size of the DPC blob stored in flash:
+        */
+       dpc_fdt_hdr = (void *)mc_dpc_addr;
 
-       error = fdt_check_header(dpl_fdt_hdr);
+       error = fdt_check_header(dpc_fdt_hdr);
        if (error != 0) {
-               printf("fsl-mc: ERROR: Bad DPL image (bad header)\n");
-               goto out;
+               /*
+                * Don't return with error here, since the MC firmware can
+                * still boot without a DPC
+                */
+               printf("\nfsl-mc: WARNING: No DPC image found");
+               return 0;
        }
 
-       dpl_size = fdt_totalsize(dpl_fdt_hdr);
-       if (dpl_size > CONFIG_SYS_LS_MC_DPL_MAX_LENGTH) {
-               printf("fsl-mc: ERROR: Bad DPL image (too large: %d)\n",
-                      dpl_size);
-               error = -EINVAL;
-               goto out;
+       dpc_size = fdt_totalsize(dpc_fdt_hdr);
+       if (dpc_size > CONFIG_SYS_LS_MC_DPC_MAX_LENGTH) {
+               printf("\nfsl-mc: ERROR: Bad DPC image (too large: %d)\n",
+                      dpc_size);
+               return -EINVAL;
        }
 
-       /*
-        * Calculate offset in the MC private DRAM block at which the MC DPL
-        * blob is to be placed:
-        */
+       mc_copy_image("MC DPC blob",
+                     (u64)dpc_fdt_hdr, dpc_size, mc_ram_addr + mc_dpc_offset);
+#endif /* not defined CONFIG_SYS_LS_MC_DPC_IN_DDR */
+
+       if (mc_fixup_dpc(mc_ram_addr + mc_dpc_offset))
+               return -EINVAL;
+
+       dump_ram_words("DPC", (void *)(mc_ram_addr + mc_dpc_offset));
+       return 0;
+}
+
+static int load_mc_dpl(u64 mc_ram_addr, size_t mc_ram_size, u64 mc_dpl_addr)
+{
+       u64 mc_dpl_offset;
+#ifndef CONFIG_SYS_LS_MC_DPL_IN_DDR
+       int error;
+       void *dpl_fdt_hdr;
+       int dpl_size;
+#endif
+
 #ifdef CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET
        BUILD_BUG_ON((CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET & 0x3) != 0 ||
                     CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET > 0xffffffff);
 
        mc_dpl_offset = CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET;
 #else
-       mc_dpl_offset = mc_get_dram_block_size() -
-                       roundup(CONFIG_SYS_LS_MC_DPL_MAX_LENGTH, 4096);
-
-       if ((mc_dpl_offset & 0x3) != 0 || mc_dpl_offset > 0xffffffff) {
-               printf("%s: Invalid MC DPL offset: %llu\n",
-                      __func__, mc_dpl_offset);
-               error = -EINVAL;
-               goto out;
-       }
+#error "CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET not defined"
 #endif
 
        /*
-        * Load the MC DPL blob at the far end of the MC private DRAM block:
-        *
-        * TODO: Should we place the DPL at a different location to match
-        * assumptions of MC firmware about its memory layout?
+        * Load the MC DPL blob in the MC private DRAM block:
         */
+#ifdef CONFIG_SYS_LS_MC_DPL_IN_DDR
+       printf("MC DPL is preloaded to %#llx\n", mc_ram_addr + mc_dpl_offset);
+#else
+       /*
+        * Get address and size of the DPL blob stored in flash:
+        */
+       dpl_fdt_hdr = (void *)mc_dpl_addr;
+
+       error = fdt_check_header(dpl_fdt_hdr);
+       if (error != 0) {
+               printf("\nfsl-mc: ERROR: Bad DPL image (bad header)\n");
+               return error;
+       }
+
+       dpl_size = fdt_totalsize(dpl_fdt_hdr);
+       if (dpl_size > CONFIG_SYS_LS_MC_DPL_MAX_LENGTH) {
+               printf("\nfsl-mc: ERROR: Bad DPL image (too large: %d)\n",
+                      dpl_size);
+               return -EINVAL;
+       }
+
        mc_copy_image("MC DPL blob",
                      (u64)dpl_fdt_hdr, dpl_size, mc_ram_addr + mc_dpl_offset);
+#endif /* not defined CONFIG_SYS_LS_MC_DPL_IN_DDR */
 
-       debug("mc_ccsr_regs %p\n", mc_ccsr_regs);
+       dump_ram_words("DPL", (void *)(mc_ram_addr + mc_dpl_offset));
+       return 0;
+}
 
-       /*
-        * Tell MC where the MC Firmware image was loaded in DDR:
       */
-       out_le32(&mc_ccsr_regs->reg_mcfbalr, (u32)mc_ram_addr);
-       out_le32(&mc_ccsr_regs->reg_mcfbahr, (u32)((u64)mc_ram_addr >> 32));
-       out_le32(&mc_ccsr_regs->reg_mcfapr, MCFAPR_BYPASS_ICID_MASK);
+/**
+ * Return the MC boot timeout value in milliseconds
+ */
+static unsigned long get_mc_boot_timeout_ms(void)
+{
+       unsigned long timeout_ms = CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS;
 
-       /*
-        * Tell MC where the DPL blob was loaded in DDR, by indicating
-        * its offset relative to the beginning of the DDR block
-        * allocated to the MC firmware. The MC firmware is responsible
-        * for checking that there is no overlap between the DPL blob
-        * and the runtime heap and stack of the MC firmware itself.
-        *
-        * NOTE: bits [31:2] of this offset need to be stored in bits [29:0] of
-        * the GSR MC CCSR register. So, this offset is assumed to be 4-byte
-        * aligned.
-        * Care must be taken not to write 1s into bits 31 and 30 of the GSR in
-        * this case as the SoC COP or PIC will be signaled.
-        */
-       out_le32(&mc_ccsr_regs->reg_gsr, (u32)(mc_dpl_offset >> 2));
+       char *timeout_ms_env_var = getenv(MC_BOOT_TIMEOUT_ENV_VAR);
+
+       if (timeout_ms_env_var) {
+               timeout_ms = simple_strtoul(timeout_ms_env_var, NULL, 10);
+               if (timeout_ms == 0) {
+                       printf("fsl-mc: WARNING: Invalid value for \'"
+                              MC_BOOT_TIMEOUT_ENV_VAR
+                              "\' environment variable: %lu\n",
+                              timeout_ms);
+
+                       timeout_ms = CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS;
+               }
+       }
+
+       return timeout_ms;
+}
 
-       printf("\nfsl-mc: Booting Management Complex ...\n");
+#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
 
+__weak bool soc_has_aiop(void)
+{
+       return false;
+}
+
+static int load_mc_aiop_img(u64 aiop_fw_addr)
+{
+       u64 mc_ram_addr = mc_get_dram_addr();
+#ifndef CONFIG_SYS_LS_MC_DPC_IN_DDR
+       void *aiop_img;
+#endif
+
+       /* Check if AIOP is available */
+       if (!soc_has_aiop())
+               return -ENODEV;
        /*
-        * Deassert reset and release MC core 0 to run
+        * Load the MC AIOP image in the MC private DRAM block:
         */
-       out_le32(&mc_ccsr_regs->reg_gcr1, GCR1_P1_DE_RST | GCR1_M_ALL_DE_RST);
-       dmb();
-       debug("Polling mc_ccsr_regs->reg_gsr ...\n");
 
+#ifdef CONFIG_SYS_LS_MC_DPC_IN_DDR
+       printf("MC AIOP is preloaded to %#llx\n", mc_ram_addr +
+              CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET);
+#else
+       aiop_img = (void *)aiop_fw_addr;
+       mc_copy_image("MC AIOP image",
+                     (u64)aiop_img, CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH,
+                     mc_ram_addr + CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET);
+#endif
+       mc_aiop_applied = 0;
+
+       return 0;
+}
+#endif
+
+static int wait_for_mc(bool booting_mc, u32 *final_reg_gsr)
+{
+       u32 reg_gsr;
+       u32 mc_fw_boot_status;
+       unsigned long timeout_ms = get_mc_boot_timeout_ms();
+       struct mc_ccsr_registers __iomem *mc_ccsr_regs = MC_CCSR_BASE_ADDR;
+
+       dmb();
+       assert(timeout_ms > 0);
        for (;;) {
+               udelay(1000);   /* throttle polling */
                reg_gsr = in_le32(&mc_ccsr_regs->reg_gsr);
                mc_fw_boot_status = (reg_gsr & GSR_FS_MASK);
                if (mc_fw_boot_status & 0x1)
                        break;
 
-               udelay(1000);   /* throttle polling */
-               if (timeout-- <= 0)
+               timeout_ms--;
+               if (timeout_ms == 0)
                        break;
        }
 
-       if (timeout <= 0) {
-               printf("fsl-mc: timeout booting management complex firmware\n");
+       if (timeout_ms == 0) {
+               printf("ERROR: timeout\n");
 
                /* TODO: Get an error status from an MC CCSR register */
-               error = -ETIMEDOUT;
-               goto out;
+               return -ETIMEDOUT;
        }
 
        if (mc_fw_boot_status != 0x1) {
@@ -248,10 +427,104 @@ int mc_init(bd_t *bis)
                 * appropriate errno, so that the status property is set to
                 * failure in the fsl,dprc device tree node.
                 */
-               printf("fsl-mc: WARNING: Firmware booted with error (GSR: %#x)\n",
+               printf("WARNING: Firmware returned an error (GSR: %#x)\n",
                       reg_gsr);
+       } else {
+               printf("SUCCESS\n");
        }
 
+
+       *final_reg_gsr = reg_gsr;
+       return 0;
+}
+
+int mc_init(u64 mc_fw_addr, u64 mc_dpc_addr)
+{
+       int error = 0;
+       int portal_id = 0;
+       struct mc_ccsr_registers __iomem *mc_ccsr_regs = MC_CCSR_BASE_ADDR;
+       u64 mc_ram_addr = mc_get_dram_addr();
+       u32 reg_gsr;
+       u32 reg_mcfbalr;
+#ifndef CONFIG_SYS_LS_MC_FW_IN_DDR
+       const void *raw_image_addr;
+       size_t raw_image_size = 0;
+#endif
+       struct mc_version mc_ver_info;
+       u64 mc_ram_aligned_base_addr;
+       u8 mc_ram_num_256mb_blocks;
+       size_t mc_ram_size = mc_get_dram_block_size();
+
+
+       error = calculate_mc_private_ram_params(mc_ram_addr,
+                                               mc_ram_size,
+                                               &mc_ram_aligned_base_addr,
+                                               &mc_ram_num_256mb_blocks);
+       if (error != 0)
+               goto out;
+
+       /*
+        * Management Complex cores should be held at reset out of POR.
+        * U-Boot should be the first software to touch MC. To be safe,
+        * we reset all cores again by setting GCR1 to 0. It doesn't do
+        * anything if they are held at reset. After we setup the firmware
+        * we kick off MC by deasserting the reset bit for core 0, and
+        * deasserting the reset bits for Command Portal Managers.
+        * The stop bits are not touched here. They are used to stop the
+        * cores when they are active. Setting stop bits doesn't stop the
+        * cores from fetching instructions when they are released from
+        * reset.
+        */
+       out_le32(&mc_ccsr_regs->reg_gcr1, 0);
+       dmb();
+
+#ifdef CONFIG_SYS_LS_MC_FW_IN_DDR
+       printf("MC firmware is preloaded to %#llx\n", mc_ram_addr);
+#else
+       error = parse_mc_firmware_fit_image(mc_fw_addr, &raw_image_addr,
+                                           &raw_image_size);
+       if (error != 0)
+               goto out;
+       /*
+        * Load the MC FW at the beginning of the MC private DRAM block:
+        */
+       mc_copy_image("MC Firmware",
+                     (u64)raw_image_addr, raw_image_size, mc_ram_addr);
+#endif
+       dump_ram_words("firmware", (void *)mc_ram_addr);
+
+       error = load_mc_dpc(mc_ram_addr, mc_ram_size, mc_dpc_addr);
+       if (error != 0)
+               goto out;
+
+       debug("mc_ccsr_regs %p\n", mc_ccsr_regs);
+       dump_mc_ccsr_regs(mc_ccsr_regs);
+
+       /*
+        * Tell MC what is the address range of the DRAM block assigned to it:
+        */
+       reg_mcfbalr = (u32)mc_ram_aligned_base_addr |
+                     (mc_ram_num_256mb_blocks - 1);
+       out_le32(&mc_ccsr_regs->reg_mcfbalr, reg_mcfbalr);
+       out_le32(&mc_ccsr_regs->reg_mcfbahr,
+                (u32)(mc_ram_aligned_base_addr >> 32));
+       out_le32(&mc_ccsr_regs->reg_mcfapr, FSL_BYPASS_AMQ);
+
+       /*
+        * Tell the MC that we want delayed DPL deployment.
+        */
+       out_le32(&mc_ccsr_regs->reg_gsr, 0xDD00);
+
+       printf("\nfsl-mc: Booting Management Complex ... ");
+
+       /*
+        * Deassert reset and release MC core 0 to run
+        */
+       out_le32(&mc_ccsr_regs->reg_gcr1, GCR1_P1_DE_RST | GCR1_M_ALL_DE_RST);
+       error = wait_for_mc(true, &reg_gsr);
+       if (error != 0)
+               goto out;
+
        /*
         * TODO: need to obtain the portal_id for the root container from the
         * DPL
@@ -259,52 +532,791 @@ int mc_init(bd_t *bis)
        portal_id = 0;
 
        /*
-        * Check that the MC firmware is responding portal commands:
+        * Initialize the global default MC portal
+        * And check that the MC firmware is responding portal commands:
         */
-       mc_io.mmio_regs = SOC_MC_PORTAL_ADDR(portal_id);
+       root_mc_io = (struct fsl_mc_io *)malloc(sizeof(struct fsl_mc_io));
+       if (!root_mc_io) {
+               printf(" No memory: malloc() failed\n");
+               return -ENOMEM;
+       }
+
+       root_mc_io->mmio_regs = SOC_MC_PORTAL_ADDR(portal_id);
        debug("Checking access to MC portal of root DPRC container (portal_id %d, portal physical addr %p)\n",
-             portal_id, mc_io.mmio_regs);
+             portal_id, root_mc_io->mmio_regs);
 
-       error = mc_get_version(&mc_io, &mc_ver_info);
+       error = mc_get_version(root_mc_io, MC_CMD_NO_FLAGS, &mc_ver_info);
        if (error != 0) {
                printf("fsl-mc: ERROR: Firmware version check failed (error: %d)\n",
                       error);
                goto out;
        }
 
-       if (MC_VER_MAJOR != mc_ver_info.major)
-               printf("fsl-mc: ERROR: Firmware major version mismatch (found: %d, expected: %d)\n",
-                      mc_ver_info.major, MC_VER_MAJOR);
-
-       if (MC_VER_MINOR != mc_ver_info.minor)
-               printf("fsl-mc: WARNING: Firmware minor version mismatch (found: %d, expected: %d)\n",
-                      mc_ver_info.minor, MC_VER_MINOR);
-
        printf("fsl-mc: Management Complex booted (version: %d.%d.%d, boot status: %#x)\n",
               mc_ver_info.major, mc_ver_info.minor, mc_ver_info.revision,
-              mc_fw_boot_status);
+              reg_gsr & GSR_FS_MASK);
+
 out:
        if (error != 0)
-               mc_boot_status = -error;
+               mc_boot_status = error;
        else
                mc_boot_status = 0;
 
        return error;
 }
 
+int mc_apply_dpl(u64 mc_dpl_addr)
+{
+       struct mc_ccsr_registers __iomem *mc_ccsr_regs = MC_CCSR_BASE_ADDR;
+       int error = 0;
+       u32 reg_gsr;
+       u64 mc_ram_addr = mc_get_dram_addr();
+       size_t mc_ram_size = mc_get_dram_block_size();
+
+       if (!mc_dpl_addr)
+               return -1;
+
+       error = load_mc_dpl(mc_ram_addr, mc_ram_size, mc_dpl_addr);
+       if (error != 0)
+               return error;
+
+       /*
+        * Tell the MC to deploy the DPL:
+        */
+       out_le32(&mc_ccsr_regs->reg_gsr, 0x0);
+       printf("fsl-mc: Deploying data path layout ... ");
+       error = wait_for_mc(false, &reg_gsr);
+
+       if (!error)
+               mc_dpl_applied = 0;
+
+       return error;
+}
+
 int get_mc_boot_status(void)
 {
        return mc_boot_status;
 }
 
+#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+int get_aiop_apply_status(void)
+{
+       return mc_aiop_applied;
+}
+#endif
+
+int get_dpl_apply_status(void)
+{
+       return mc_dpl_applied;
+}
+
+/**
+ * Return the MC address of private DRAM block.
+ */
+u64 mc_get_dram_addr(void)
+{
+       u64 mc_ram_addr;
+
+       /*
+        * The MC private DRAM block was already carved at the end of DRAM
+        * by board_init_f() using CONFIG_SYS_MEM_TOP_HIDE:
+        */
+       if (gd->bd->bi_dram[1].start) {
+               mc_ram_addr =
+                       gd->bd->bi_dram[1].start + gd->bd->bi_dram[1].size;
+       } else {
+               mc_ram_addr =
+                       gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;
+       }
+
+       return mc_ram_addr;
+}
+
 /**
  * Return the actual size of the MC private DRAM block.
- *
- * NOTE: For now this function always returns the minimum required size,
- * However, in the future, the actual size may be obtained from an environment
- * variable.
  */
 unsigned long mc_get_dram_block_size(void)
 {
-       return CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE;
+       unsigned long dram_block_size = CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE;
+
+       char *dram_block_size_env_var = getenv(MC_MEM_SIZE_ENV_VAR);
+
+       if (dram_block_size_env_var) {
+               dram_block_size = simple_strtoul(dram_block_size_env_var, NULL,
+                                                10);
+
+               if (dram_block_size < CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE) {
+                       printf("fsl-mc: WARNING: Invalid value for \'"
+                              MC_MEM_SIZE_ENV_VAR
+                              "\' environment variable: %lu\n",
+                              dram_block_size);
+
+                       dram_block_size = CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE;
+               }
+       }
+
+       return dram_block_size;
+}
+
+int fsl_mc_ldpaa_init(bd_t *bis)
+{
+       int i;
+
+       for (i = WRIOP1_DPMAC1; i < NUM_WRIOP_PORTS; i++)
+               if ((wriop_is_enabled_dpmac(i) == 1) &&
+                   (wriop_get_phy_address(i) != -1))
+                       ldpaa_eth_init(i, wriop_get_enet_if(i));
+       return 0;
+}
+
+static int dprc_version_check(struct fsl_mc_io *mc_io, uint16_t handle)
+{
+       struct dprc_attributes attr;
+       int error;
+
+       memset(&attr, 0, sizeof(struct dprc_attributes));
+       error = dprc_get_attributes(mc_io, MC_CMD_NO_FLAGS, handle, &attr);
+       if (error == 0) {
+               if ((attr.version.major != DPRC_VER_MAJOR) ||
+                   (attr.version.minor != DPRC_VER_MINOR)) {
+                       printf("DPRC version mismatch found %u.%u,",
+                              attr.version.major,
+                              attr.version.minor);
+                       printf("supported version is %u.%u\n",
+                              DPRC_VER_MAJOR, DPRC_VER_MINOR);
+               }
+       }
+       return error;
+}
+
+static int dpio_init(void)
+{
+       struct qbman_swp_desc p_des;
+       struct dpio_attr attr;
+       struct dpio_cfg dpio_cfg;
+       int err = 0;
+
+       dflt_dpio = (struct fsl_dpio_obj *)malloc(sizeof(struct fsl_dpio_obj));
+       if (!dflt_dpio) {
+               printf("No memory: malloc() failed\n");
+               err = -ENOMEM;
+               goto err_malloc;
+       }
+
+       dpio_cfg.channel_mode = DPIO_LOCAL_CHANNEL;
+       dpio_cfg.num_priorities = 8;
+
+       err = dpio_create(dflt_mc_io, MC_CMD_NO_FLAGS, &dpio_cfg,
+                         &dflt_dpio->dpio_handle);
+       if (err < 0) {
+               printf("dpio_create() failed: %d\n", err);
+               err = -ENODEV;
+               goto err_create;
+       }
+
+       memset(&attr, 0, sizeof(struct dpio_attr));
+       err = dpio_get_attributes(dflt_mc_io, MC_CMD_NO_FLAGS,
+                                 dflt_dpio->dpio_handle, &attr);
+       if (err < 0) {
+               printf("dpio_get_attributes() failed: %d\n", err);
+               goto err_get_attr;
+       }
+
+       if ((attr.version.major != DPIO_VER_MAJOR) ||
+           (attr.version.minor != DPIO_VER_MINOR)) {
+               printf("DPIO version mismatch found %u.%u,",
+                      attr.version.major, attr.version.minor);
+               printf("supported version is %u.%u\n",
+                      DPIO_VER_MAJOR, DPIO_VER_MINOR);
+       }
+
+       dflt_dpio->dpio_id = attr.id;
+#ifdef DEBUG
+       printf("Init: DPIO id=0x%d\n", dflt_dpio->dpio_id);
+#endif
+       err = dpio_enable(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpio->dpio_handle);
+       if (err < 0) {
+               printf("dpio_enable() failed %d\n", err);
+               goto err_get_enable;
+       }
+       debug("ce_offset=0x%llx, ci_offset=0x%llx, portalid=%d, prios=%d\n",
+             attr.qbman_portal_ce_offset,
+             attr.qbman_portal_ci_offset,
+             attr.qbman_portal_id,
+             attr.num_priorities);
+
+       p_des.cena_bar = (void *)(SOC_QBMAN_PORTALS_BASE_ADDR
+                                       + attr.qbman_portal_ce_offset);
+       p_des.cinh_bar = (void *)(SOC_QBMAN_PORTALS_BASE_ADDR
+                                       + attr.qbman_portal_ci_offset);
+
+       dflt_dpio->sw_portal = qbman_swp_init(&p_des);
+       if (dflt_dpio->sw_portal == NULL) {
+               printf("qbman_swp_init() failed\n");
+               goto err_get_swp_init;
+       }
+       return 0;
+
+err_get_swp_init:
+       dpio_disable(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpio->dpio_handle);
+err_get_enable:
+err_get_attr:
+       dpio_close(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpio->dpio_handle);
+       dpio_destroy(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpio->dpio_handle);
+err_create:
+       free(dflt_dpio);
+err_malloc:
+       return err;
+}
+
+static int dpio_exit(void)
+{
+       int err;
+
+       err = dpio_disable(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpio->dpio_handle);
+       if (err < 0) {
+               printf("dpio_disable() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpio_destroy(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpio->dpio_handle);
+       if (err < 0) {
+               printf("dpio_destroy() failed: %d\n", err);
+               goto err;
+       }
+
+#ifdef DEBUG
+       printf("Exit: DPIO id=0x%d\n", dflt_dpio->dpio_id);
+#endif
+
+       if (dflt_dpio)
+               free(dflt_dpio);
+
+       return 0;
+err:
+       return err;
 }
+
+static int dprc_init(void)
+{
+       int err, child_portal_id, container_id;
+       struct dprc_cfg cfg;
+       uint64_t mc_portal_offset;
+
+       /* Open root container */
+       err = dprc_get_container_id(root_mc_io, MC_CMD_NO_FLAGS, &container_id);
+       if (err < 0) {
+               printf("dprc_get_container_id(): Root failed: %d\n", err);
+               goto err_root_container_id;
+       }
+
+#ifdef DEBUG
+       printf("Root container id = %d\n", container_id);
+#endif
+       err = dprc_open(root_mc_io, MC_CMD_NO_FLAGS, container_id,
+                       &root_dprc_handle);
+       if (err < 0) {
+               printf("dprc_open(): Root Container failed: %d\n", err);
+               goto err_root_open;
+       }
+
+       if (!root_dprc_handle) {
+               printf("dprc_open(): Root Container Handle is not valid\n");
+               goto err_root_open;
+       }
+
+       err = dprc_version_check(root_mc_io, root_dprc_handle);
+       if (err < 0) {
+               printf("dprc_version_check() failed: %d\n", err);
+               goto err_root_open;
+       }
+
+       memset(&cfg, 0, sizeof(struct dprc_cfg));
+       cfg.options = DPRC_CFG_OPT_TOPOLOGY_CHANGES_ALLOWED |
+                     DPRC_CFG_OPT_OBJ_CREATE_ALLOWED |
+                     DPRC_CFG_OPT_ALLOC_ALLOWED;
+       cfg.icid = DPRC_GET_ICID_FROM_POOL;
+       cfg.portal_id = DPRC_GET_PORTAL_ID_FROM_POOL;
+       err = dprc_create_container(root_mc_io, MC_CMD_NO_FLAGS,
+                       root_dprc_handle,
+                       &cfg,
+                       &child_dprc_id,
+                       &mc_portal_offset);
+       if (err < 0) {
+               printf("dprc_create_container() failed: %d\n", err);
+               goto err_create;
+       }
+
+       dflt_mc_io = (struct fsl_mc_io *)malloc(sizeof(struct fsl_mc_io));
+       if (!dflt_mc_io) {
+               err  = -ENOMEM;
+               printf(" No memory: malloc() failed\n");
+               goto err_malloc;
+       }
+
+       child_portal_id = MC_PORTAL_OFFSET_TO_PORTAL_ID(mc_portal_offset);
+       dflt_mc_io->mmio_regs = SOC_MC_PORTAL_ADDR(child_portal_id);
+#ifdef DEBUG
+       printf("MC portal of child DPRC container: %d, physical addr %p)\n",
+              child_dprc_id, dflt_mc_io->mmio_regs);
+#endif
+
+       err = dprc_open(dflt_mc_io, MC_CMD_NO_FLAGS, child_dprc_id,
+                       &dflt_dprc_handle);
+       if (err < 0) {
+               printf("dprc_open(): Child container failed: %d\n", err);
+               goto err_child_open;
+       }
+
+       if (!dflt_dprc_handle) {
+               printf("dprc_open(): Child container Handle is not valid\n");
+               goto err_child_open;
+       }
+
+       return 0;
+err_child_open:
+       free(dflt_mc_io);
+err_malloc:
+       dprc_destroy_container(root_mc_io, MC_CMD_NO_FLAGS,
+                              root_dprc_handle, child_dprc_id);
+err_create:
+       dprc_close(root_mc_io, MC_CMD_NO_FLAGS, root_dprc_handle);
+err_root_open:
+err_root_container_id:
+       return err;
+}
+
+static int dprc_exit(void)
+{
+       int err;
+
+       err = dprc_close(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dprc_handle);
+       if (err < 0) {
+               printf("dprc_close(): Child failed: %d\n", err);
+               goto err;
+       }
+
+       err = dprc_destroy_container(root_mc_io, MC_CMD_NO_FLAGS,
+                                    root_dprc_handle, child_dprc_id);
+       if (err < 0) {
+               printf("dprc_destroy_container() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dprc_close(root_mc_io, MC_CMD_NO_FLAGS, root_dprc_handle);
+       if (err < 0) {
+               printf("dprc_close(): Root failed: %d\n", err);
+               goto err;
+       }
+
+       if (dflt_mc_io)
+               free(dflt_mc_io);
+
+       if (root_mc_io)
+               free(root_mc_io);
+
+       return 0;
+
+err:
+       return err;
+}
+
+static int dpbp_init(void)
+{
+       int err;
+       struct dpbp_attr dpbp_attr;
+       struct dpbp_cfg dpbp_cfg;
+
+       dflt_dpbp = (struct fsl_dpbp_obj *)malloc(sizeof(struct fsl_dpbp_obj));
+       if (!dflt_dpbp) {
+               printf("No memory: malloc() failed\n");
+               err = -ENOMEM;
+               goto err_malloc;
+       }
+
+       dpbp_cfg.options = 512;
+
+       err = dpbp_create(dflt_mc_io, MC_CMD_NO_FLAGS, &dpbp_cfg,
+                         &dflt_dpbp->dpbp_handle);
+
+       if (err < 0) {
+               err = -ENODEV;
+               printf("dpbp_create() failed: %d\n", err);
+               goto err_create;
+       }
+
+       memset(&dpbp_attr, 0, sizeof(struct dpbp_attr));
+       err = dpbp_get_attributes(dflt_mc_io, MC_CMD_NO_FLAGS,
+                                 dflt_dpbp->dpbp_handle,
+                                 &dpbp_attr);
+       if (err < 0) {
+               printf("dpbp_get_attributes() failed: %d\n", err);
+               goto err_get_attr;
+       }
+
+       if ((dpbp_attr.version.major != DPBP_VER_MAJOR) ||
+           (dpbp_attr.version.minor != DPBP_VER_MINOR)) {
+               printf("DPBP version mismatch found %u.%u,",
+                      dpbp_attr.version.major, dpbp_attr.version.minor);
+               printf("supported version is %u.%u\n",
+                      DPBP_VER_MAJOR, DPBP_VER_MINOR);
+       }
+
+       dflt_dpbp->dpbp_attr.id = dpbp_attr.id;
+#ifdef DEBUG
+       printf("Init: DPBP id=0x%d\n", dflt_dpbp->dpbp_attr.id);
+#endif
+
+       err = dpbp_close(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpbp->dpbp_handle);
+       if (err < 0) {
+               printf("dpbp_close() failed: %d\n", err);
+               goto err_close;
+       }
+
+       return 0;
+
+err_close:
+       free(dflt_dpbp);
+err_get_attr:
+       dpbp_close(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpbp->dpbp_handle);
+       dpbp_destroy(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpbp->dpbp_handle);
+err_create:
+err_malloc:
+       return err;
+}
+
+static int dpbp_exit(void)
+{
+       int err;
+
+       err = dpbp_open(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpbp->dpbp_attr.id,
+                       &dflt_dpbp->dpbp_handle);
+       if (err < 0) {
+               printf("dpbp_open() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpbp_destroy(dflt_mc_io, MC_CMD_NO_FLAGS,
+                          dflt_dpbp->dpbp_handle);
+       if (err < 0) {
+               printf("dpbp_destroy() failed: %d\n", err);
+               goto err;
+       }
+
+#ifdef DEBUG
+       printf("Exit: DPBP id=0x%d\n", dflt_dpbp->dpbp_attr.id);
+#endif
+
+       if (dflt_dpbp)
+               free(dflt_dpbp);
+       return 0;
+
+err:
+       return err;
+}
+
+static int dpni_init(void)
+{
+       int err;
+       struct dpni_attr dpni_attr;
+       uint8_t ext_cfg_buf[256] = {0};
+       struct dpni_extended_cfg dpni_extended_cfg;
+       struct dpni_cfg dpni_cfg;
+
+       dflt_dpni = (struct fsl_dpni_obj *)malloc(sizeof(struct fsl_dpni_obj));
+       if (!dflt_dpni) {
+               printf("No memory: malloc() failed\n");
+               err = -ENOMEM;
+               goto err_malloc;
+       }
+
+       memset(&dpni_extended_cfg, 0, sizeof(dpni_extended_cfg));
+       err = dpni_prepare_extended_cfg(&dpni_extended_cfg, &ext_cfg_buf[0]);
+       if (err < 0) {
+               err = -ENODEV;
+               printf("dpni_prepare_extended_cfg() failed: %d\n", err);
+               goto err_prepare_extended_cfg;
+       }
+
+       memset(&dpni_cfg, 0, sizeof(dpni_cfg));
+       dpni_cfg.adv.options = DPNI_OPT_UNICAST_FILTER |
+                              DPNI_OPT_MULTICAST_FILTER;
+
+       dpni_cfg.adv.ext_cfg_iova = (uint64_t)&ext_cfg_buf[0];
+       err = dpni_create(dflt_mc_io, MC_CMD_NO_FLAGS, &dpni_cfg,
+                         &dflt_dpni->dpni_handle);
+
+       if (err < 0) {
+               err = -ENODEV;
+               printf("dpni_create() failed: %d\n", err);
+               goto err_create;
+       }
+
+       memset(&dpni_attr, 0, sizeof(struct dpni_attr));
+       err = dpni_get_attributes(dflt_mc_io, MC_CMD_NO_FLAGS,
+                                 dflt_dpni->dpni_handle,
+                                 &dpni_attr);
+       if (err < 0) {
+               printf("dpni_get_attributes() failed: %d\n", err);
+               goto err_get_attr;
+       }
+
+       if ((dpni_attr.version.major != DPNI_VER_MAJOR) ||
+           (dpni_attr.version.minor != DPNI_VER_MINOR)) {
+               printf("DPNI version mismatch found %u.%u,",
+                      dpni_attr.version.major, dpni_attr.version.minor);
+               printf("supported version is %u.%u\n",
+                      DPNI_VER_MAJOR, DPNI_VER_MINOR);
+       }
+
+       dflt_dpni->dpni_id = dpni_attr.id;
+#ifdef DEBUG
+       printf("Init: DPNI id=0x%d\n", dflt_dpni->dpni_id);
+#endif
+
+       err = dpni_close(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpni->dpni_handle);
+       if (err < 0) {
+               printf("dpni_close() failed: %d\n", err);
+               goto err_close;
+       }
+
+       return 0;
+
+err_close:
+err_get_attr:
+       dpni_close(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpni->dpni_handle);
+       dpni_destroy(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpni->dpni_handle);
+err_create:
+err_prepare_extended_cfg:
+       free(dflt_dpni);
+err_malloc:
+       return err;
+}
+
+static int dpni_exit(void)
+{
+       int err;
+
+       err = dpni_open(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpni->dpni_id,
+                       &dflt_dpni->dpni_handle);
+       if (err < 0) {
+               printf("dpni_open() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpni_destroy(dflt_mc_io, MC_CMD_NO_FLAGS,
+                          dflt_dpni->dpni_handle);
+       if (err < 0) {
+               printf("dpni_destroy() failed: %d\n", err);
+               goto err;
+       }
+
+#ifdef DEBUG
+       printf("Exit: DPNI id=0x%d\n", dflt_dpni->dpni_id);
+#endif
+
+       if (dflt_dpni)
+               free(dflt_dpni);
+       return 0;
+
+err:
+       return err;
+}
+
+static int mc_init_object(void)
+{
+       int err = 0;
+
+       err = dprc_init();
+       if (err < 0) {
+               printf("dprc_init() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpbp_init();
+       if (err < 0) {
+               printf("dpbp_init() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpio_init();
+       if (err < 0) {
+               printf("dpio_init() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpni_init();
+       if (err < 0) {
+               printf("dpni_init() failed: %d\n", err);
+               goto err;
+       }
+
+       return 0;
+err:
+       return err;
+}
+
+int fsl_mc_ldpaa_exit(bd_t *bd)
+{
+       int err = 0;
+
+       if (bd && mc_lazy_dpl_addr && !fsl_mc_ldpaa_exit(NULL)) {
+               mc_apply_dpl(mc_lazy_dpl_addr);
+               mc_lazy_dpl_addr = 0;
+       }
+
+       /* MC is not loaded intentionally, So return success. */
+       if (bd && get_mc_boot_status() != 0)
+               return 0;
+
+       if (bd && !get_mc_boot_status() && get_dpl_apply_status() == -1) {
+               printf("ERROR: fsl-mc: DPL is not applied\n");
+               err = -ENODEV;
+               return err;
+       }
+
+       if (bd && !get_mc_boot_status() && !get_dpl_apply_status())
+               return err;
+
+       err = dpbp_exit();
+       if (err < 0) {
+               printf("dpbp_exit() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpio_exit();
+       if (err < 0) {
+               printf("dpio_exit() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dpni_exit();
+       if (err < 0) {
+               printf("dpni_exit() failed: %d\n", err);
+               goto err;
+       }
+
+       err = dprc_exit();
+       if (err < 0) {
+               printf("dprc_exit() failed: %d\n", err);
+               goto err;
+       }
+
+       return 0;
+err:
+       return err;
+}
+
+static int do_fsl_mc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       int err = 0;
+       if (argc < 3)
+               goto usage;
+
+       switch (argv[1][0]) {
+       case 's': {
+                       char sub_cmd;
+                       u64 mc_fw_addr, mc_dpc_addr;
+#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+                       u64 aiop_fw_addr;
+#endif
+
+                       sub_cmd = argv[2][0];
+                       switch (sub_cmd) {
+                       case 'm':
+                               if (argc < 5)
+                                       goto usage;
+
+                               if (get_mc_boot_status() == 0) {
+                                       printf("fsl-mc: MC is already booted");
+                                       printf("\n");
+                                       return err;
+                               }
+                               mc_fw_addr = simple_strtoull(argv[3], NULL, 16);
+                               mc_dpc_addr = simple_strtoull(argv[4], NULL,
+                                                             16);
+
+                               if (!mc_init(mc_fw_addr, mc_dpc_addr))
+                                       err = mc_init_object();
+                               break;
+
+#ifdef CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET
+                       case 'a':
+                               if (argc < 4)
+                                       goto usage;
+                               if (get_aiop_apply_status() == 0) {
+                                       printf("fsl-mc: AIOP FW is already");
+                                       printf(" applied\n");
+                                       return err;
+                               }
+
+                               aiop_fw_addr = simple_strtoull(argv[3], NULL,
+                                                              16);
+
+                               /* if SoC doesn't have AIOP, err = -ENODEV */
+                               err = load_mc_aiop_img(aiop_fw_addr);
+                               if (!err)
+                                       printf("fsl-mc: AIOP FW applied\n");
+                               break;
+#endif
+                       default:
+                               printf("Invalid option: %s\n", argv[2]);
+                               goto usage;
+
+                               break;
+                       }
+               }
+               break;
+
+       case 'l':
+       case 'a': {
+                       u64 mc_dpl_addr;
+
+                       if (argc < 4)
+                               goto usage;
+
+                       if (get_dpl_apply_status() == 0) {
+                               printf("fsl-mc: DPL already applied\n");
+                               return err;
+                       }
+
+                       mc_dpl_addr = simple_strtoull(argv[3], NULL,
+                                                             16);
+
+                       if (get_mc_boot_status() != 0) {
+                               printf("fsl-mc: Deploying data path layout ..");
+                               printf("ERROR (MC is not booted)\n");
+                               return -ENODEV;
+                       }
+
+                       if (argv[1][0] == 'l') {
+                               /*
+                                * We will do the actual dpaa exit and dpl apply
+                                * later from announce_and_cleanup().
+                                */
+                               mc_lazy_dpl_addr = mc_dpl_addr;
+                       } else {
+                               /* The user wants it applied now */
+                               if (!fsl_mc_ldpaa_exit(NULL))
+                                       err = mc_apply_dpl(mc_dpl_addr);
+                       }
+                       break;
+               }
+       default:
+               printf("Invalid option: %s\n", argv[1]);
+               goto usage;
+               break;
+       }
+       return err;
+ usage:
+       return CMD_RET_USAGE;
+}
+
+U_BOOT_CMD(
+       fsl_mc,  CONFIG_SYS_MAXARGS,  1,   do_fsl_mc,
+       "DPAA2 command to manage Management Complex (MC)",
+       "start mc [FW_addr] [DPC_addr] - Start Management Complex\n"
+       "fsl_mc apply DPL [DPL_addr] - Apply DPL file\n"
+       "fsl_mc lazyapply DPL [DPL_addr] - Apply DPL file on exit\n"
+       "fsl_mc start aiop [FW_addr] - Start AIOP\n"
+);