Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5436c6a347918bf278d4cc9e5678f9bd94bdbcbc

Authored by Ran Wang
Committed by York Sun
1 parent 033c538e56
Exists in smarc_8mq_lf_v2020.04 and in 20 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

armv8: fsl: Use correct conditional compile for ls1012a 

According current code base, CONFIG_LS1012A should be
CONFIG_ARCH_LS1012A, or function fsl_fdt_disable(blob) will be
wrongly called to disable all dwc3 USB nodes on LS1012A, which
cause Linux USB function stop working at all.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

arch/arm/cpu/armv8/fsl-layerscape/fdt.c
Diff comments   View file @ 5436c6a
1 /* 1 /*
2 * Copyright 2014-2015 Freescale Semiconductor, Inc. 2 * Copyright 2014-2015 Freescale Semiconductor, Inc.
3 * 3 *
4 * SPDX-License-Identifier: GPL-2.0+ 4 * SPDX-License-Identifier: GPL-2.0+
5 */ 5 */
6 6
7 #include <common.h> 7 #include <common.h>
8 #include <efi_loader.h> 8 #include <efi_loader.h>
9 #include <libfdt.h> 9 #include <libfdt.h>
10 #include <fdt_support.h> 10 #include <fdt_support.h>
11 #include <phy.h> 11 #include <phy.h>
12 #ifdef CONFIG_FSL_LSCH3 12 #ifdef CONFIG_FSL_LSCH3
13 #include <asm/arch/fdt.h> 13 #include <asm/arch/fdt.h>
14 #endif 14 #endif
15 #ifdef CONFIG_FSL_ESDHC 15 #ifdef CONFIG_FSL_ESDHC
16 #include <fsl_esdhc.h> 16 #include <fsl_esdhc.h>
17 #endif 17 #endif
18 #ifdef CONFIG_SYS_DPAA_FMAN 18 #ifdef CONFIG_SYS_DPAA_FMAN
19 #include <fsl_fman.h> 19 #include <fsl_fman.h>
20 #endif 20 #endif
21 #ifdef CONFIG_MP 21 #ifdef CONFIG_MP
22 #include <asm/arch/mp.h> 22 #include <asm/arch/mp.h>
23 #endif 23 #endif
24 #include <fsl_sec.h> 24 #include <fsl_sec.h>
25 #include <asm/arch-fsl-layerscape/soc.h> 25 #include <asm/arch-fsl-layerscape/soc.h>
26 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT 26 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
27 #include <asm/armv8/sec_firmware.h> 27 #include <asm/armv8/sec_firmware.h>
28 #endif 28 #endif
29 29
30 int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc) 30 int fdt_fixup_phy_connection(void *blob, int offset, phy_interface_t phyc)
31 { 31 {
32 return fdt_setprop_string(blob, offset, "phy-connection-type", 32 return fdt_setprop_string(blob, offset, "phy-connection-type",
33 phy_string_for_interface(phyc)); 33 phy_string_for_interface(phyc));
34 } 34 }
35 35
36 #ifdef CONFIG_MP 36 #ifdef CONFIG_MP
37 void ft_fixup_cpu(void *blob) 37 void ft_fixup_cpu(void *blob)
38 { 38 {
39 int off; 39 int off;
40 __maybe_unused u64 spin_tbl_addr = (u64)get_spin_tbl_addr(); 40 __maybe_unused u64 spin_tbl_addr = (u64)get_spin_tbl_addr();
41 fdt32_t *reg; 41 fdt32_t *reg;
42 int addr_cells; 42 int addr_cells;
43 u64 val, core_id; 43 u64 val, core_id;
44 size_t *boot_code_size = &(__secondary_boot_code_size); 44 size_t *boot_code_size = &(__secondary_boot_code_size);
45 #if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && \ 45 #if defined(CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT) && \
46 defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) 46 defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
47 int node; 47 int node;
48 u32 psci_ver; 48 u32 psci_ver;
49 49
50 /* Check the psci version to determine if the psci is supported */ 50 /* Check the psci version to determine if the psci is supported */
51 psci_ver = sec_firmware_support_psci_version(); 51 psci_ver = sec_firmware_support_psci_version();
52 if (psci_ver == 0xffffffff) { 52 if (psci_ver == 0xffffffff) {
53 /* remove psci DT node */ 53 /* remove psci DT node */
54 node = fdt_path_offset(blob, "/psci"); 54 node = fdt_path_offset(blob, "/psci");
55 if (node >= 0) 55 if (node >= 0)
56 goto remove_psci_node; 56 goto remove_psci_node;
57 57
58 node = fdt_node_offset_by_compatible(blob, -1, "arm,psci"); 58 node = fdt_node_offset_by_compatible(blob, -1, "arm,psci");
59 if (node >= 0) 59 if (node >= 0)
60 goto remove_psci_node; 60 goto remove_psci_node;
61 61
62 node = fdt_node_offset_by_compatible(blob, -1, "arm,psci-0.2"); 62 node = fdt_node_offset_by_compatible(blob, -1, "arm,psci-0.2");
63 if (node >= 0) 63 if (node >= 0)
64 goto remove_psci_node; 64 goto remove_psci_node;
65 65
66 node = fdt_node_offset_by_compatible(blob, -1, "arm,psci-1.0"); 66 node = fdt_node_offset_by_compatible(blob, -1, "arm,psci-1.0");
67 if (node >= 0) 67 if (node >= 0)
68 goto remove_psci_node; 68 goto remove_psci_node;
69 69
70 remove_psci_node: 70 remove_psci_node:
71 if (node >= 0) 71 if (node >= 0)
72 fdt_del_node(blob, node); 72 fdt_del_node(blob, node);
73 } else { 73 } else {
74 return; 74 return;
75 } 75 }
76 #endif 76 #endif
77 off = fdt_path_offset(blob, "/cpus"); 77 off = fdt_path_offset(blob, "/cpus");
78 if (off < 0) { 78 if (off < 0) {
79 puts("couldn't find /cpus node\n"); 79 puts("couldn't find /cpus node\n");
80 return; 80 return;
81 } 81 }
82 fdt_support_default_count_cells(blob, off, &addr_cells, NULL); 82 fdt_support_default_count_cells(blob, off, &addr_cells, NULL);
83 83
84 off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4); 84 off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4);
85 while (off != -FDT_ERR_NOTFOUND) { 85 while (off != -FDT_ERR_NOTFOUND) {
86 reg = (fdt32_t *)fdt_getprop(blob, off, "reg", 0); 86 reg = (fdt32_t *)fdt_getprop(blob, off, "reg", 0);
87 if (reg) { 87 if (reg) {
88 core_id = fdt_read_number(reg, addr_cells); 88 core_id = fdt_read_number(reg, addr_cells);
89 if (core_id == 0 || (is_core_online(core_id))) { 89 if (core_id == 0 || (is_core_online(core_id))) {
90 val = spin_tbl_addr; 90 val = spin_tbl_addr;
91 val += id_to_core(core_id) * 91 val += id_to_core(core_id) *
92 SPIN_TABLE_ELEM_SIZE; 92 SPIN_TABLE_ELEM_SIZE;
93 val = cpu_to_fdt64(val); 93 val = cpu_to_fdt64(val);
94 fdt_setprop_string(blob, off, "enable-method", 94 fdt_setprop_string(blob, off, "enable-method",
95 "spin-table"); 95 "spin-table");
96 fdt_setprop(blob, off, "cpu-release-addr", 96 fdt_setprop(blob, off, "cpu-release-addr",
97 &val, sizeof(val)); 97 &val, sizeof(val));
98 } else { 98 } else {
99 debug("skipping offline core\n"); 99 debug("skipping offline core\n");
100 } 100 }
101 } else { 101 } else {
102 puts("Warning: found cpu node without reg property\n"); 102 puts("Warning: found cpu node without reg property\n");
103 } 103 }
104 off = fdt_node_offset_by_prop_value(blob, off, "device_type", 104 off = fdt_node_offset_by_prop_value(blob, off, "device_type",
105 "cpu", 4); 105 "cpu", 4);
106 } 106 }
107 107
108 fdt_add_mem_rsv(blob, (uintptr_t)&secondary_boot_code, 108 fdt_add_mem_rsv(blob, (uintptr_t)&secondary_boot_code,
109 *boot_code_size); 109 *boot_code_size);
110 #if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD) 110 #if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_SPL_BUILD)
111 efi_add_memory_map((uintptr_t)&secondary_boot_code, 111 efi_add_memory_map((uintptr_t)&secondary_boot_code,
112 ALIGN(*boot_code_size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT, 112 ALIGN(*boot_code_size, EFI_PAGE_SIZE) >> EFI_PAGE_SHIFT,
113 EFI_RESERVED_MEMORY_TYPE, false); 113 EFI_RESERVED_MEMORY_TYPE, false);
114 #endif 114 #endif
115 } 115 }
116 #endif 116 #endif
117 117
118 void fsl_fdt_disable_usb(void *blob) 118 void fsl_fdt_disable_usb(void *blob)
119 { 119 {
120 int off; 120 int off;
121 /* 121 /*
122 * SYSCLK is used as a reference clock for USB. When the USB 122 * SYSCLK is used as a reference clock for USB. When the USB
123 * controller is used, SYSCLK must meet the additional requirement 123 * controller is used, SYSCLK must meet the additional requirement
124 * of 100 MHz. 124 * of 100 MHz.
125 */ 125 */
126 if (CONFIG_SYS_CLK_FREQ != 100000000) { 126 if (CONFIG_SYS_CLK_FREQ != 100000000) {
127 off = fdt_node_offset_by_compatible(blob, -1, "snps,dwc3"); 127 off = fdt_node_offset_by_compatible(blob, -1, "snps,dwc3");
128 while (off != -FDT_ERR_NOTFOUND) { 128 while (off != -FDT_ERR_NOTFOUND) {
129 fdt_status_disabled(blob, off); 129 fdt_status_disabled(blob, off);
130 off = fdt_node_offset_by_compatible(blob, off, 130 off = fdt_node_offset_by_compatible(blob, off,
131 "snps,dwc3"); 131 "snps,dwc3");
132 } 132 }
133 } 133 }
134 } 134 }
135 135
136 #ifdef CONFIG_HAS_FEATURE_GIC64K_ALIGN 136 #ifdef CONFIG_HAS_FEATURE_GIC64K_ALIGN
137 static void fdt_fixup_gic(void *blob) 137 static void fdt_fixup_gic(void *blob)
138 { 138 {
139 int offset, err; 139 int offset, err;
140 u64 reg[8]; 140 u64 reg[8];
141 struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); 141 struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
142 unsigned int val; 142 unsigned int val;
143 struct ccsr_scfg __iomem *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR; 143 struct ccsr_scfg __iomem *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR;
144 int align_64k = 0; 144 int align_64k = 0;
145 145
146 val = gur_in32(&gur->svr); 146 val = gur_in32(&gur->svr);
147 147
148 if (SVR_SOC_VER(val) != SVR_LS1043A) { 148 if (SVR_SOC_VER(val) != SVR_LS1043A) {
149 align_64k = 1; 149 align_64k = 1;
150 } else if (SVR_REV(val) != REV1_0) { 150 } else if (SVR_REV(val) != REV1_0) {
151 val = scfg_in32(&scfg->gic_align) & (0x01 << GIC_ADDR_BIT); 151 val = scfg_in32(&scfg->gic_align) & (0x01 << GIC_ADDR_BIT);
152 if (!val) 152 if (!val)
153 align_64k = 1; 153 align_64k = 1;
154 } 154 }
155 155
156 offset = fdt_subnode_offset(blob, 0, "interrupt-controller@1400000"); 156 offset = fdt_subnode_offset(blob, 0, "interrupt-controller@1400000");
157 if (offset < 0) { 157 if (offset < 0) {
158 printf("WARNING: fdt_subnode_offset can't find node %s: %s\n", 158 printf("WARNING: fdt_subnode_offset can't find node %s: %s\n",
159 "interrupt-controller@1400000", fdt_strerror(offset)); 159 "interrupt-controller@1400000", fdt_strerror(offset));
160 return; 160 return;
161 } 161 }
162 162
163 /* Fixup gic node align with 64K */ 163 /* Fixup gic node align with 64K */
164 if (align_64k) { 164 if (align_64k) {
165 reg[0] = cpu_to_fdt64(GICD_BASE_64K); 165 reg[0] = cpu_to_fdt64(GICD_BASE_64K);
166 reg[1] = cpu_to_fdt64(GICD_SIZE_64K); 166 reg[1] = cpu_to_fdt64(GICD_SIZE_64K);
167 reg[2] = cpu_to_fdt64(GICC_BASE_64K); 167 reg[2] = cpu_to_fdt64(GICC_BASE_64K);
168 reg[3] = cpu_to_fdt64(GICC_SIZE_64K); 168 reg[3] = cpu_to_fdt64(GICC_SIZE_64K);
169 reg[4] = cpu_to_fdt64(GICH_BASE_64K); 169 reg[4] = cpu_to_fdt64(GICH_BASE_64K);
170 reg[5] = cpu_to_fdt64(GICH_SIZE_64K); 170 reg[5] = cpu_to_fdt64(GICH_SIZE_64K);
171 reg[6] = cpu_to_fdt64(GICV_BASE_64K); 171 reg[6] = cpu_to_fdt64(GICV_BASE_64K);
172 reg[7] = cpu_to_fdt64(GICV_SIZE_64K); 172 reg[7] = cpu_to_fdt64(GICV_SIZE_64K);
173 } else { 173 } else {
174 /* Fixup gic node align with default */ 174 /* Fixup gic node align with default */
175 reg[0] = cpu_to_fdt64(GICD_BASE); 175 reg[0] = cpu_to_fdt64(GICD_BASE);
176 reg[1] = cpu_to_fdt64(GICD_SIZE); 176 reg[1] = cpu_to_fdt64(GICD_SIZE);
177 reg[2] = cpu_to_fdt64(GICC_BASE); 177 reg[2] = cpu_to_fdt64(GICC_BASE);
178 reg[3] = cpu_to_fdt64(GICC_SIZE); 178 reg[3] = cpu_to_fdt64(GICC_SIZE);
179 reg[4] = cpu_to_fdt64(GICH_BASE); 179 reg[4] = cpu_to_fdt64(GICH_BASE);
180 reg[5] = cpu_to_fdt64(GICH_SIZE); 180 reg[5] = cpu_to_fdt64(GICH_SIZE);
181 reg[6] = cpu_to_fdt64(GICV_BASE); 181 reg[6] = cpu_to_fdt64(GICV_BASE);
182 reg[7] = cpu_to_fdt64(GICV_SIZE); 182 reg[7] = cpu_to_fdt64(GICV_SIZE);
183 } 183 }
184 184
185 err = fdt_setprop(blob, offset, "reg", reg, sizeof(reg)); 185 err = fdt_setprop(blob, offset, "reg", reg, sizeof(reg));
186 if (err < 0) { 186 if (err < 0) {
187 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n", 187 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
188 "reg", "interrupt-controller@1400000", 188 "reg", "interrupt-controller@1400000",
189 fdt_strerror(err)); 189 fdt_strerror(err));
190 return; 190 return;
191 } 191 }
192 192
193 return; 193 return;
194 } 194 }
195 #endif 195 #endif
196 196
197 #ifdef CONFIG_HAS_FEATURE_ENHANCED_MSI 197 #ifdef CONFIG_HAS_FEATURE_ENHANCED_MSI
198 static int _fdt_fixup_msi_node(void *blob, const char *name, 198 static int _fdt_fixup_msi_node(void *blob, const char *name,
199 int irq_0, int irq_1, int rev) 199 int irq_0, int irq_1, int rev)
200 { 200 {
201 int err, offset, len; 201 int err, offset, len;
202 u32 tmp[4][3]; 202 u32 tmp[4][3];
203 void *p; 203 void *p;
204 204
205 offset = fdt_path_offset(blob, name); 205 offset = fdt_path_offset(blob, name);
206 if (offset < 0) { 206 if (offset < 0) {
207 printf("WARNING: fdt_path_offset can't find path %s: %s\n", 207 printf("WARNING: fdt_path_offset can't find path %s: %s\n",
208 name, fdt_strerror(offset)); 208 name, fdt_strerror(offset));
209 return 0; 209 return 0;
210 } 210 }
211 211
212 /*fixup the property of interrupts*/ 212 /*fixup the property of interrupts*/
213 213
214 tmp[0][0] = cpu_to_fdt32(0x0); 214 tmp[0][0] = cpu_to_fdt32(0x0);
215 tmp[0][1] = cpu_to_fdt32(irq_0); 215 tmp[0][1] = cpu_to_fdt32(irq_0);
216 tmp[0][2] = cpu_to_fdt32(0x4); 216 tmp[0][2] = cpu_to_fdt32(0x4);
217 217
218 if (rev > REV1_0) { 218 if (rev > REV1_0) {
219 tmp[1][0] = cpu_to_fdt32(0x0); 219 tmp[1][0] = cpu_to_fdt32(0x0);
220 tmp[1][1] = cpu_to_fdt32(irq_1); 220 tmp[1][1] = cpu_to_fdt32(irq_1);
221 tmp[1][2] = cpu_to_fdt32(0x4); 221 tmp[1][2] = cpu_to_fdt32(0x4);
222 tmp[2][0] = cpu_to_fdt32(0x0); 222 tmp[2][0] = cpu_to_fdt32(0x0);
223 tmp[2][1] = cpu_to_fdt32(irq_1 + 1); 223 tmp[2][1] = cpu_to_fdt32(irq_1 + 1);
224 tmp[2][2] = cpu_to_fdt32(0x4); 224 tmp[2][2] = cpu_to_fdt32(0x4);
225 tmp[3][0] = cpu_to_fdt32(0x0); 225 tmp[3][0] = cpu_to_fdt32(0x0);
226 tmp[3][1] = cpu_to_fdt32(irq_1 + 2); 226 tmp[3][1] = cpu_to_fdt32(irq_1 + 2);
227 tmp[3][2] = cpu_to_fdt32(0x4); 227 tmp[3][2] = cpu_to_fdt32(0x4);
228 len = sizeof(tmp); 228 len = sizeof(tmp);
229 } else { 229 } else {
230 len = sizeof(tmp[0]); 230 len = sizeof(tmp[0]);
231 } 231 }
232 232
233 err = fdt_setprop(blob, offset, "interrupts", tmp, len); 233 err = fdt_setprop(blob, offset, "interrupts", tmp, len);
234 if (err < 0) { 234 if (err < 0) {
235 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n", 235 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
236 "interrupts", name, fdt_strerror(err)); 236 "interrupts", name, fdt_strerror(err));
237 return 0; 237 return 0;
238 } 238 }
239 239
240 /*fixup the property of reg*/ 240 /*fixup the property of reg*/
241 p = (char *)fdt_getprop(blob, offset, "reg", &len); 241 p = (char *)fdt_getprop(blob, offset, "reg", &len);
242 if (!p) { 242 if (!p) {
243 printf("WARNING: fdt_getprop can't get %s from node %s\n", 243 printf("WARNING: fdt_getprop can't get %s from node %s\n",
244 "reg", name); 244 "reg", name);
245 return 0; 245 return 0;
246 } 246 }
247 247
248 memcpy((char *)tmp, p, len); 248 memcpy((char *)tmp, p, len);
249 249
250 if (rev > REV1_0) 250 if (rev > REV1_0)
251 *((u32 *)tmp + 3) = cpu_to_fdt32(0x1000); 251 *((u32 *)tmp + 3) = cpu_to_fdt32(0x1000);
252 else 252 else
253 *((u32 *)tmp + 3) = cpu_to_fdt32(0x8); 253 *((u32 *)tmp + 3) = cpu_to_fdt32(0x8);
254 254
255 err = fdt_setprop(blob, offset, "reg", tmp, len); 255 err = fdt_setprop(blob, offset, "reg", tmp, len);
256 if (err < 0) { 256 if (err < 0) {
257 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n", 257 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
258 "reg", name, fdt_strerror(err)); 258 "reg", name, fdt_strerror(err));
259 return 0; 259 return 0;
260 } 260 }
261 261
262 /*fixup the property of compatible*/ 262 /*fixup the property of compatible*/
263 if (rev > REV1_0) 263 if (rev > REV1_0)
264 err = fdt_setprop_string(blob, offset, "compatible", 264 err = fdt_setprop_string(blob, offset, "compatible",
265 "fsl,ls1043a-v1.1-msi"); 265 "fsl,ls1043a-v1.1-msi");
266 else 266 else
267 err = fdt_setprop_string(blob, offset, "compatible", 267 err = fdt_setprop_string(blob, offset, "compatible",
268 "fsl,ls1043a-msi"); 268 "fsl,ls1043a-msi");
269 if (err < 0) { 269 if (err < 0) {
270 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n", 270 printf("WARNING: fdt_setprop can't set %s from node %s: %s\n",
271 "compatible", name, fdt_strerror(err)); 271 "compatible", name, fdt_strerror(err));
272 return 0; 272 return 0;
273 } 273 }
274 274
275 return 1; 275 return 1;
276 } 276 }
277 277
278 static int _fdt_fixup_pci_msi(void *blob, const char *name, int rev) 278 static int _fdt_fixup_pci_msi(void *blob, const char *name, int rev)
279 { 279 {
280 int offset, len, err; 280 int offset, len, err;
281 void *p; 281 void *p;
282 int val; 282 int val;
283 u32 tmp[4][8]; 283 u32 tmp[4][8];
284 284
285 offset = fdt_path_offset(blob, name); 285 offset = fdt_path_offset(blob, name);
286 if (offset < 0) { 286 if (offset < 0) {
287 printf("WARNING: fdt_path_offset can't find path %s: %s\n", 287 printf("WARNING: fdt_path_offset can't find path %s: %s\n",
288 name, fdt_strerror(offset)); 288 name, fdt_strerror(offset));
289 return 0; 289 return 0;
290 } 290 }
291 291
292 p = (char *)fdt_getprop(blob, offset, "interrupt-map", &len); 292 p = (char *)fdt_getprop(blob, offset, "interrupt-map", &len);
293 if (!p || len != sizeof(tmp)) { 293 if (!p || len != sizeof(tmp)) {
294 printf("WARNING: fdt_getprop can't get %s from node %s\n", 294 printf("WARNING: fdt_getprop can't get %s from node %s\n",
295 "interrupt-map", name); 295 "interrupt-map", name);
296 return 0; 296 return 0;
297 } 297 }
298 298
299 memcpy((char *)tmp, p, len); 299 memcpy((char *)tmp, p, len);
300 300
301 val = fdt32_to_cpu(tmp[0][6]); 301 val = fdt32_to_cpu(tmp[0][6]);
302 if (rev > REV1_0) { 302 if (rev > REV1_0) {
303 tmp[1][6] = cpu_to_fdt32(val + 1); 303 tmp[1][6] = cpu_to_fdt32(val + 1);
304 tmp[2][6] = cpu_to_fdt32(val + 2); 304 tmp[2][6] = cpu_to_fdt32(val + 2);
305 tmp[3][6] = cpu_to_fdt32(val + 3); 305 tmp[3][6] = cpu_to_fdt32(val + 3);
306 } else { 306 } else {
307 tmp[1][6] = cpu_to_fdt32(val); 307 tmp[1][6] = cpu_to_fdt32(val);
308 tmp[2][6] = cpu_to_fdt32(val); 308 tmp[2][6] = cpu_to_fdt32(val);
309 tmp[3][6] = cpu_to_fdt32(val); 309 tmp[3][6] = cpu_to_fdt32(val);
310 } 310 }
311 311
312 err = fdt_setprop(blob, offset, "interrupt-map", tmp, sizeof(tmp)); 312 err = fdt_setprop(blob, offset, "interrupt-map", tmp, sizeof(tmp));
313 if (err < 0) { 313 if (err < 0) {
314 printf("WARNING: fdt_setprop can't set %s from node %s: %s.\n", 314 printf("WARNING: fdt_setprop can't set %s from node %s: %s.\n",
315 "interrupt-map", name, fdt_strerror(err)); 315 "interrupt-map", name, fdt_strerror(err));
316 return 0; 316 return 0;
317 } 317 }
318 return 1; 318 return 1;
319 } 319 }
320 320
321 /* Fixup msi node for ls1043a rev1.1*/ 321 /* Fixup msi node for ls1043a rev1.1*/
322 322
323 static void fdt_fixup_msi(void *blob) 323 static void fdt_fixup_msi(void *blob)
324 { 324 {
325 struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); 325 struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
326 unsigned int rev; 326 unsigned int rev;
327 327
328 rev = gur_in32(&gur->svr); 328 rev = gur_in32(&gur->svr);
329 329
330 if (SVR_SOC_VER(rev) != SVR_LS1043A) 330 if (SVR_SOC_VER(rev) != SVR_LS1043A)
331 return; 331 return;
332 332
333 rev = SVR_REV(rev); 333 rev = SVR_REV(rev);
334 334
335 _fdt_fixup_msi_node(blob, "/soc/msi-controller1@1571000", 335 _fdt_fixup_msi_node(blob, "/soc/msi-controller1@1571000",
336 116, 111, rev); 336 116, 111, rev);
337 _fdt_fixup_msi_node(blob, "/soc/msi-controller2@1572000", 337 _fdt_fixup_msi_node(blob, "/soc/msi-controller2@1572000",
338 126, 121, rev); 338 126, 121, rev);
339 _fdt_fixup_msi_node(blob, "/soc/msi-controller3@1573000", 339 _fdt_fixup_msi_node(blob, "/soc/msi-controller3@1573000",
340 160, 155, rev); 340 160, 155, rev);
341 341
342 _fdt_fixup_pci_msi(blob, "/soc/pcie@3400000", rev); 342 _fdt_fixup_pci_msi(blob, "/soc/pcie@3400000", rev);
343 _fdt_fixup_pci_msi(blob, "/soc/pcie@3500000", rev); 343 _fdt_fixup_pci_msi(blob, "/soc/pcie@3500000", rev);
344 _fdt_fixup_pci_msi(blob, "/soc/pcie@3600000", rev); 344 _fdt_fixup_pci_msi(blob, "/soc/pcie@3600000", rev);
345 } 345 }
346 #endif 346 #endif
347 347
348 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT 348 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
349 /* Remove JR node used by SEC firmware */ 349 /* Remove JR node used by SEC firmware */
350 void fdt_fixup_remove_jr(void *blob) 350 void fdt_fixup_remove_jr(void *blob)
351 { 351 {
352 int jr_node, addr_cells, len; 352 int jr_node, addr_cells, len;
353 int crypto_node = fdt_path_offset(blob, "crypto"); 353 int crypto_node = fdt_path_offset(blob, "crypto");
354 u64 jr_offset, used_jr; 354 u64 jr_offset, used_jr;
355 fdt32_t *reg; 355 fdt32_t *reg;
356 356
357 used_jr = sec_firmware_used_jobring_offset(); 357 used_jr = sec_firmware_used_jobring_offset();
358 fdt_support_default_count_cells(blob, crypto_node, &addr_cells, NULL); 358 fdt_support_default_count_cells(blob, crypto_node, &addr_cells, NULL);
359 359
360 jr_node = fdt_node_offset_by_compatible(blob, crypto_node, 360 jr_node = fdt_node_offset_by_compatible(blob, crypto_node,
361 "fsl,sec-v4.0-job-ring"); 361 "fsl,sec-v4.0-job-ring");
362 362
363 while (jr_node != -FDT_ERR_NOTFOUND) { 363 while (jr_node != -FDT_ERR_NOTFOUND) {
364 reg = (fdt32_t *)fdt_getprop(blob, jr_node, "reg", &len); 364 reg = (fdt32_t *)fdt_getprop(blob, jr_node, "reg", &len);
365 jr_offset = fdt_read_number(reg, addr_cells); 365 jr_offset = fdt_read_number(reg, addr_cells);
366 if (jr_offset == used_jr) { 366 if (jr_offset == used_jr) {
367 fdt_del_node(blob, jr_node); 367 fdt_del_node(blob, jr_node);
368 break; 368 break;
369 } 369 }
370 jr_node = fdt_node_offset_by_compatible(blob, jr_node, 370 jr_node = fdt_node_offset_by_compatible(blob, jr_node,
371 "fsl,sec-v4.0-job-ring"); 371 "fsl,sec-v4.0-job-ring");
372 } 372 }
373 } 373 }
374 #endif 374 #endif
375 375
376 void ft_cpu_setup(void *blob, bd_t *bd) 376 void ft_cpu_setup(void *blob, bd_t *bd)
377 { 377 {
378 struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); 378 struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
379 unsigned int svr = gur_in32(&gur->svr); 379 unsigned int svr = gur_in32(&gur->svr);
380 380
381 /* delete crypto node if not on an E-processor */ 381 /* delete crypto node if not on an E-processor */
382 if (!IS_E_PROCESSOR(svr)) 382 if (!IS_E_PROCESSOR(svr))
383 fdt_fixup_crypto_node(blob, 0); 383 fdt_fixup_crypto_node(blob, 0);
384 #if CONFIG_SYS_FSL_SEC_COMPAT >= 4 384 #if CONFIG_SYS_FSL_SEC_COMPAT >= 4
385 else { 385 else {
386 ccsr_sec_t __iomem *sec; 386 ccsr_sec_t __iomem *sec;
387 387
388 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT 388 #ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
389 if (fdt_fixup_kaslr(blob)) 389 if (fdt_fixup_kaslr(blob))
390 fdt_fixup_remove_jr(blob); 390 fdt_fixup_remove_jr(blob);
391 #endif 391 #endif
392 392
393 sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR; 393 sec = (void __iomem *)CONFIG_SYS_FSL_SEC_ADDR;
394 fdt_fixup_crypto_node(blob, sec_in32(&sec->secvid_ms)); 394 fdt_fixup_crypto_node(blob, sec_in32(&sec->secvid_ms));
395 } 395 }
396 #endif 396 #endif
397 397
398 #ifdef CONFIG_MP 398 #ifdef CONFIG_MP
399 ft_fixup_cpu(blob); 399 ft_fixup_cpu(blob);
400 #endif 400 #endif
401 401
402 #ifdef CONFIG_SYS_NS16550 402 #ifdef CONFIG_SYS_NS16550
403 do_fixup_by_compat_u32(blob, "fsl,ns16550", 403 do_fixup_by_compat_u32(blob, "fsl,ns16550",
404 "clock-frequency", CONFIG_SYS_NS16550_CLK, 1); 404 "clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
405 #endif 405 #endif
406 406
407 do_fixup_by_path_u32(blob, "/sysclk", "clock-frequency", 407 do_fixup_by_path_u32(blob, "/sysclk", "clock-frequency",
408 CONFIG_SYS_CLK_FREQ, 1); 408 CONFIG_SYS_CLK_FREQ, 1);
409 409
410 #ifdef CONFIG_PCI 410 #ifdef CONFIG_PCI
411 ft_pci_setup(blob, bd); 411 ft_pci_setup(blob, bd);
412 #endif 412 #endif
413 413
414 #ifdef CONFIG_FSL_ESDHC 414 #ifdef CONFIG_FSL_ESDHC
415 fdt_fixup_esdhc(blob, bd); 415 fdt_fixup_esdhc(blob, bd);
416 #endif 416 #endif
417 417
418 #ifdef CONFIG_SYS_DPAA_FMAN 418 #ifdef CONFIG_SYS_DPAA_FMAN
419 fdt_fixup_fman_firmware(blob); 419 fdt_fixup_fman_firmware(blob);
420 #endif 420 #endif
421 #ifndef CONFIG_LS1012A 421 #ifndef CONFIG_ARCH_LS1012A
422 fsl_fdt_disable_usb(blob); 422 fsl_fdt_disable_usb(blob);
423 #endif 423 #endif
424 #ifdef CONFIG_HAS_FEATURE_GIC64K_ALIGN 424 #ifdef CONFIG_HAS_FEATURE_GIC64K_ALIGN
425 fdt_fixup_gic(blob); 425 fdt_fixup_gic(blob);
426 #endif 426 #endif
427 #ifdef CONFIG_HAS_FEATURE_ENHANCED_MSI 427 #ifdef CONFIG_HAS_FEATURE_ENHANCED_MSI
428 fdt_fixup_msi(blob); 428 fdt_fixup_msi(blob);
429 #endif 429 #endif
430 } 430 }
431 431