projects / oweals / u-boot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fsl-layerscape: fix compile error with sec fw disabled
[oweals/u-boot.git] / arch / arm / include / asm / arch-fsl-layerscape / fsl_icid.h
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
index a3f473fe28b5c99b87ac0aa41581e94311142eac..3c06a55cb853b913588744ea0b1d4e8079e180b1 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/fsl_icid.h
@@ -9,6 +9,7 @@
 #include <asm/types.h>
 #include <fsl_qbman.h>
 #include <fsl_sec.h>
+#include <asm/armv8/sec_firmware.h>
 
 struct icid_id_table {
        const char *compat;
@@ -16,6 +17,7 @@ struct icid_id_table {
        u32 reg;
        phys_addr_t compat_addr;
        phys_addr_t reg_addr;
+       bool le;
 };
 
 struct fman_icid_id_table {
@@ -29,18 +31,35 @@ int fdt_set_iommu_prop(void *blob, int off, int smmu_ph, u32 *ids, int num_ids);
 void set_icids(void);
 void fdt_fixup_icid(void *blob);
 
-#define SET_ICID_ENTRY(name, idA, regA, addr, compataddr) \
+#define SET_ICID_ENTRY(name, idA, regA, addr, compataddr, _le) \
        { .compat = name, \
          .id = idA, \
          .reg = regA, \
          .compat_addr = compataddr, \
          .reg_addr = addr, \
+         .le = _le \
        }
 
+#ifdef CONFIG_SYS_FSL_SEC_LE
+#define SEC_IS_LE true
+#elif defined(CONFIG_SYS_FSL_SEC_BE)
+#define SEC_IS_LE false
+#endif
+
+#ifdef CONFIG_FSL_LSCH2
+
+#ifdef CONFIG_SYS_FSL_CCSR_SCFG_LE
+#define SCFG_IS_LE true
+#elif defined(CONFIG_SYS_FSL_CCSR_SCFG_BE)
+#define SCFG_IS_LE false
+#endif
+
+#define QDMA_IS_LE false
+
 #define SET_SCFG_ICID(compat, streamid, name, compataddr) \
        SET_ICID_ENTRY(compat, streamid, (((streamid) << 24) | (1 << 23)), \
                offsetof(struct ccsr_scfg, name) + CONFIG_SYS_FSL_SCFG_ADDR, \
-               compataddr)
+               compataddr, SCFG_IS_LE)
 
 #define SET_USB_ICID(usb_num, compat, streamid) \
        SET_SCFG_ICID(compat, streamid, usb##usb_num##_icid,\
@@ -54,10 +73,6 @@ void fdt_fixup_icid(void *blob);
        SET_SCFG_ICID("fsl,esdhc", streamid, sdhc_icid,\
                CONFIG_SYS_FSL_ESDHC_ADDR)
 
-#define SET_QDMA_ICID(compat, streamid) \
-       SET_SCFG_ICID(compat, streamid, dma_icid,\
-               QDMA_BASE_ADDR)
-
 #define SET_EDMA_ICID(streamid) \
        SET_SCFG_ICID("fsl,vf610-edma", streamid, edma_icid,\
                EDMA_BASE_ADDR)
@@ -76,44 +91,103 @@ void fdt_fixup_icid(void *blob);
        SET_ICID_ENTRY("fsl,qman", streamid, streamid, \
                offsetof(struct ccsr_qman, liodnr) + \
                CONFIG_SYS_FSL_QMAN_ADDR, \
-               CONFIG_SYS_FSL_QMAN_ADDR)
+               CONFIG_SYS_FSL_QMAN_ADDR, false)
 
 #define SET_BMAN_ICID(streamid) \
        SET_ICID_ENTRY("fsl,bman", streamid, streamid, \
                offsetof(struct ccsr_bman, liodnr) + \
                CONFIG_SYS_FSL_BMAN_ADDR, \
-               CONFIG_SYS_FSL_BMAN_ADDR)
+               CONFIG_SYS_FSL_BMAN_ADDR, false)
 
 #define SET_FMAN_ICID_ENTRY(_port_id, streamid) \
        { .port_id = (_port_id), .icid = (streamid) }
 
+#define SEC_ICID_REG_VAL(streamid) (((streamid) << 16) | (streamid))
+
 #define SET_SEC_QI_ICID(streamid) \
        SET_ICID_ENTRY("fsl,sec-v4.0", streamid, \
-               (((streamid) << 16) | (streamid)), \
-               offsetof(ccsr_sec_t, qilcr_ls) + \
+               0, offsetof(ccsr_sec_t, qilcr_ls) + \
                CONFIG_SYS_FSL_SEC_ADDR, \
-               CONFIG_SYS_FSL_SEC_ADDR)
+               CONFIG_SYS_FSL_SEC_ADDR, SEC_IS_LE)
+
+extern struct fman_icid_id_table fman_icid_tbl[];
+extern int fman_icid_tbl_sz;
+
+#else /* CONFIG_FSL_LSCH2 */
+
+#ifdef CONFIG_SYS_FSL_CCSR_GUR_LE
+#define GUR_IS_LE true
+#elif defined(CONFIG_SYS_FSL_CCSR_GUR_BE)
+#define GUR_IS_LE false
+#endif
+
+#define QDMA_IS_LE true
+
+#define SET_GUR_ICID(compat, streamid, name, compataddr) \
+       SET_ICID_ENTRY(compat, streamid, streamid, \
+               offsetof(struct ccsr_gur, name) + CONFIG_SYS_FSL_GUTS_ADDR, \
+               compataddr, GUR_IS_LE)
+
+#define SET_USB_ICID(usb_num, compat, streamid) \
+       SET_GUR_ICID(compat, streamid, usb##usb_num##_amqr,\
+               CONFIG_SYS_XHCI_USB##usb_num##_ADDR)
+
+#define SET_SATA_ICID(sata_num, compat, streamid) \
+       SET_GUR_ICID(compat, streamid, sata##sata_num##_amqr, \
+               AHCI_BASE_ADDR##sata_num)
+
+#define SET_SDHC_ICID(sdhc_num, streamid) \
+       SET_GUR_ICID("fsl,esdhc", streamid, sdmm##sdhc_num##_amqr,\
+               FSL_ESDHC##sdhc_num##_BASE_ADDR)
+
+#define SET_EDMA_ICID(streamid) \
+       SET_GUR_ICID("fsl,vf610-edma", streamid, spare3_amqr,\
+               EDMA_BASE_ADDR)
+
+#define SET_GPU_ICID(compat, streamid) \
+       SET_GUR_ICID(compat, streamid, misc1_amqr,\
+               GPU_BASE_ADDR)
+
+#define SET_DISPLAY_ICID(streamid) \
+       SET_GUR_ICID("arm,mali-dp500", streamid, spare2_amqr,\
+               DISPLAY_BASE_ADDR)
+
+#define SEC_ICID_REG_VAL(streamid) (streamid)
+
+#endif /* CONFIG_FSL_LSCH2 */
+
+#define SET_QDMA_ICID(compat, streamid) \
+       SET_ICID_ENTRY(compat, streamid, (1 << 31) | (streamid), \
+               QDMA_BASE_ADDR + QMAN_CQSIDR_REG, \
+               QDMA_BASE_ADDR, QDMA_IS_LE), \
+       SET_ICID_ENTRY(NULL, streamid, (1 << 31) | (streamid), \
+               QDMA_BASE_ADDR + QMAN_CQSIDR_REG + 4, \
+               QDMA_BASE_ADDR, QDMA_IS_LE)
 
 #define SET_SEC_JR_ICID_ENTRY(jr_num, streamid) \
-       SET_ICID_ENTRY("fsl,sec-v4.0-job-ring", streamid, \
-               (((streamid) << 16) | (streamid)), \
+       SET_ICID_ENTRY( \
+               (CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) && \
+               (FSL_SEC_JR##jr_num##_OFFSET ==  \
+                       SEC_JR3_OFFSET + CONFIG_SYS_FSL_SEC_OFFSET) \
+                       ? NULL \
+                       : "fsl,sec-v4.0-job-ring"), \
+               streamid, \
+               SEC_ICID_REG_VAL(streamid), \
                offsetof(ccsr_sec_t, jrliodnr[jr_num].ls) + \
                CONFIG_SYS_FSL_SEC_ADDR, \
-               FSL_SEC_JR##jr_num##_BASE_ADDR)
+               FSL_SEC_JR##jr_num##_BASE_ADDR, SEC_IS_LE)
 
 #define SET_SEC_DECO_ICID_ENTRY(deco_num, streamid) \
-       SET_ICID_ENTRY(NULL, streamid, (((streamid) << 16) | (streamid)), \
+       SET_ICID_ENTRY(NULL, streamid, SEC_ICID_REG_VAL(streamid), \
                offsetof(ccsr_sec_t, decoliodnr[deco_num].ls) + \
-               CONFIG_SYS_FSL_SEC_ADDR, 0)
+               CONFIG_SYS_FSL_SEC_ADDR, 0, SEC_IS_LE)
 
 #define SET_SEC_RTIC_ICID_ENTRY(rtic_num, streamid) \
-       SET_ICID_ENTRY(NULL, streamid, (((streamid) << 16) | (streamid)), \
+       SET_ICID_ENTRY(NULL, streamid, SEC_ICID_REG_VAL(streamid), \
                offsetof(ccsr_sec_t, rticliodnr[rtic_num].ls) + \
-               CONFIG_SYS_FSL_SEC_ADDR, 0)
+               CONFIG_SYS_FSL_SEC_ADDR, 0, SEC_IS_LE)
 
 extern struct icid_id_table icid_tbl[];
-extern struct fman_icid_id_table fman_icid_tbl[];
 extern int icid_tbl_sz;
-extern int fman_icid_tbl_sz;
 
 #endif
Unnamed repository; edit this file 'description' to name the repository.