usb: dwc3: add dis_del_phy_power_chg_quirk

[oweals/u-boot.git] / drivers / fpga / zynqmppl.c

diff --git a/drivers/fpga/zynqmppl.c b/drivers/fpga/zynqmppl.c
index 03ffa8c11f2c7d11887199b904c4174772960aef..4a826e4a71ab452467d3e4b8d2ae92cda74ab638 100644 (file)
--- a/drivers/fpga/zynqmppl.c
+++ b/drivers/fpga/zynqmppl.c
@@ -7,7 +7,9 @@
 
 #include <console.h>
 #include <common.h>
+#include <cpu_func.h>
 #include <zynqmppl.h>
+#include <zynqmp_firmware.h>
 #include <linux/sizes.h>
 #include <asm/arch/sys_proto.h>
 #include <memalign.h>
@@ -150,9 +152,10 @@ static ulong zynqmp_align_dma_buffer(u32 *buf, u32 len, u32 swap)
                        new_buf[i] = load_word(&buf[i], swap);
 
                buf = new_buf;
-       } else if (swap != SWAP_DONE) {
+       } else if ((swap != SWAP_DONE) &&
+                  (zynqmp_firmware_version() <= PMUFW_V1_0)) {
                /* For bitstream which are aligned */
-               u32 *new_buf = (u32 *)buf;
+               new_buf = buf;
 
                printf("%s: Bitstream is not swapped(%d) - swap it\n", __func__,
                       swap);
@@ -196,29 +199,44 @@ static int zynqmp_load(xilinx_desc *desc, const void *buf, size_t bsize,
                     bitstream_type bstype)
 {
        ALLOC_CACHE_ALIGN_BUFFER(u32, bsizeptr, 1);
-       u32 swap;
+       u32 swap = 0;
        ulong bin_buf;
        int ret;
        u32 buf_lo, buf_hi;
        u32 ret_payload[PAYLOAD_ARG_CNT];
-
-       if (zynqmp_validate_bitstream(desc, buf, bsize, bsize, &swap))
-               return FPGA_FAIL;
+       bool xilfpga_old = false;
+
+       if (zynqmp_firmware_version() <= PMUFW_V1_0) {
+               puts("WARN: PMUFW v1.0 or less is detected\n");
+               puts("WARN: Not all bitstream formats are supported\n");
+               puts("WARN: Please upgrade PMUFW\n");
+               xilfpga_old = true;
+               if (zynqmp_validate_bitstream(desc, buf, bsize, bsize, &swap))
+                       return FPGA_FAIL;
+               bsizeptr = (u32 *)&bsize;
+               flush_dcache_range((ulong)bsizeptr,
+                                  (ulong)bsizeptr + sizeof(size_t));
+               bstype |= BIT(ZYNQMP_FPGA_BIT_NS);
+       }
 
        bin_buf = zynqmp_align_dma_buffer((u32 *)buf, bsize, swap);
-       bsizeptr = (u32 *)&bsize;
 
        debug("%s called!\n", __func__);
        flush_dcache_range(bin_buf, bin_buf + bsize);
-       flush_dcache_range((ulong)bsizeptr, (ulong)bsizeptr + sizeof(size_t));
 
        buf_lo = (u32)bin_buf;
        buf_hi = upper_32_bits(bin_buf);
-       bstype |= BIT(ZYNQMP_FPGA_BIT_NS);
-       ret = invoke_smc(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo, buf_hi,
-                        (u32)(uintptr_t)bsizeptr, bstype, ret_payload);
+
+       if (xilfpga_old)
+               ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo,
+                                       buf_hi, (u32)(uintptr_t)bsizeptr,
+                                       bstype, ret_payload);
+       else
+               ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo,
+                                       buf_hi, (u32)bsize, 0, ret_payload);
+
        if (ret)
-               debug("PL FPGA LOAD fail\n");
+               puts("PL FPGA LOAD fail\n");
 
        return ret;
 }
@@ -256,7 +274,8 @@ static int zynqmp_loads(xilinx_desc *desc, const void *buf, size_t bsize,
        buf_lo = lower_32_bits((ulong)buf);
        buf_hi = upper_32_bits((ulong)buf);
 
-       ret = invoke_smc(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo, buf_hi,
+       ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_LOAD, buf_lo,
+                               buf_hi,
                         (u32)(uintptr_t)fpga_sec_info->userkey_addr,
                         flag, ret_payload);
        if (ret)
@@ -273,8 +292,8 @@ static int zynqmp_pcap_info(xilinx_desc *desc)
        int ret;
        u32 ret_payload[PAYLOAD_ARG_CNT];
 
-       ret = invoke_smc(ZYNQMP_SIP_SVC_PM_FPGA_STATUS, 0, 0, 0,
-                        0, ret_payload);
+       ret = xilinx_pm_request(ZYNQMP_SIP_SVC_PM_FPGA_STATUS, 0, 0, 0,
+                               0, ret_payload);
        if (!ret)
                printf("PCAP status\t0x%x\n", ret_payload[1]);