diff options
author | Mike Frysinger <michael.frysinger@analog.com> | 2007-07-24 22:11:42 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-07-24 22:11:42 -0400 |
commit | e208f83a7aa4ebf6c0a68e814903e8aa33f9439a (patch) | |
tree | a45d34fa199c8e5d75878d8a2f15e944eadce852 /arch/blackfin | |
parent | 36a1548f99e54520f049a703e1b91bae95e72481 (diff) |
Blackfin arch: use HI/LO macros rather than masking the bit ranges ourselves
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf533/head.S | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/head.S | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/head.S | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/head.S | 12 | ||||
-rw-r--r-- | arch/blackfin/mach-common/cache.S | 8 | ||||
-rw-r--r-- | arch/blackfin/mach-common/cacheinit.S | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-common/cplbmgr.S | 52 | ||||
-rw-r--r-- | arch/blackfin/mach-common/dpmc.S | 52 | ||||
-rw-r--r-- | arch/blackfin/mach-common/lock.S | 20 |
9 files changed, 92 insertions, 92 deletions
diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S index 5aeffd06fe7..69da0e8b773 100644 --- a/arch/blackfin/mach-bf533/head.S +++ b/arch/blackfin/mach-bf533/head.S | |||
@@ -144,8 +144,8 @@ ENTRY(__start) | |||
144 | ssync; | 144 | ssync; |
145 | 145 | ||
146 | /* Turn off the icache */ | 146 | /* Turn off the icache */ |
147 | p0.l = (IMEM_CONTROL & 0xFFFF); | 147 | p0.l = LO(IMEM_CONTROL); |
148 | p0.h = (IMEM_CONTROL >> 16); | 148 | p0.h = HI(IMEM_CONTROL); |
149 | R1 = [p0]; | 149 | R1 = [p0]; |
150 | R0 = ~ENICPLB; | 150 | R0 = ~ENICPLB; |
151 | R0 = R0 & R1; | 151 | R0 = R0 & R1; |
@@ -162,8 +162,8 @@ ENTRY(__start) | |||
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | /* Turn off the dcache */ | 164 | /* Turn off the dcache */ |
165 | p0.l = (DMEM_CONTROL & 0xFFFF); | 165 | p0.l = LO(DMEM_CONTROL); |
166 | p0.h = (DMEM_CONTROL >> 16); | 166 | p0.h = HI(DMEM_CONTROL); |
167 | R1 = [p0]; | 167 | R1 = [p0]; |
168 | R0 = ~ENDCPLB; | 168 | R0 = ~ENDCPLB; |
169 | R0 = R0 & R1; | 169 | R0 = R0 & R1; |
@@ -417,8 +417,8 @@ ENTRY(_start_dma_code) | |||
417 | w[p0] = r0.l; | 417 | w[p0] = r0.l; |
418 | ssync; | 418 | ssync; |
419 | 419 | ||
420 | p0.l = (EBIU_SDBCTL & 0xFFFF); | 420 | p0.l = LO(EBIU_SDBCTL); |
421 | p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ | 421 | p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ |
422 | r0 = mem_SDBCTL; | 422 | r0 = mem_SDBCTL; |
423 | w[p0] = r0.l; | 423 | w[p0] = r0.l; |
424 | ssync; | 424 | ssync; |
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S index d9b411adf6a..b1d4b91b7ae 100644 --- a/arch/blackfin/mach-bf537/head.S +++ b/arch/blackfin/mach-bf537/head.S | |||
@@ -100,8 +100,8 @@ ENTRY(__start) | |||
100 | R0 = R1; | 100 | R0 = R1; |
101 | 101 | ||
102 | /* Turn off the icache */ | 102 | /* Turn off the icache */ |
103 | p0.l = (IMEM_CONTROL & 0xFFFF); | 103 | p0.l = LO(IMEM_CONTROL); |
104 | p0.h = (IMEM_CONTROL >> 16); | 104 | p0.h = HI(IMEM_CONTROL); |
105 | R1 = [p0]; | 105 | R1 = [p0]; |
106 | R0 = ~ENICPLB; | 106 | R0 = ~ENICPLB; |
107 | R0 = R0 & R1; | 107 | R0 = R0 & R1; |
@@ -118,8 +118,8 @@ ENTRY(__start) | |||
118 | #endif | 118 | #endif |
119 | 119 | ||
120 | /* Turn off the dcache */ | 120 | /* Turn off the dcache */ |
121 | p0.l = (DMEM_CONTROL & 0xFFFF); | 121 | p0.l = LO(DMEM_CONTROL); |
122 | p0.h = (DMEM_CONTROL >> 16); | 122 | p0.h = HI(DMEM_CONTROL); |
123 | R1 = [p0]; | 123 | R1 = [p0]; |
124 | R0 = ~ENDCPLB; | 124 | R0 = ~ENDCPLB; |
125 | R0 = R0 & R1; | 125 | R0 = R0 & R1; |
@@ -436,8 +436,8 @@ ENTRY(_start_dma_code) | |||
436 | w[p0] = r0.l; | 436 | w[p0] = r0.l; |
437 | ssync; | 437 | ssync; |
438 | 438 | ||
439 | p0.l = (EBIU_SDBCTL & 0xFFFF); | 439 | p0.l = LO(EBIU_SDBCTL); |
440 | p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ | 440 | p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ |
441 | r0 = mem_SDBCTL; | 441 | r0 = mem_SDBCTL; |
442 | w[p0] = r0.l; | 442 | w[p0] = r0.l; |
443 | ssync; | 443 | ssync; |
diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S index e5e56df3bf4..47cd91777a3 100644 --- a/arch/blackfin/mach-bf548/head.S +++ b/arch/blackfin/mach-bf548/head.S | |||
@@ -97,8 +97,8 @@ ENTRY(__stext) | |||
97 | R0 = R1; | 97 | R0 = R1; |
98 | 98 | ||
99 | /* Turn off the icache */ | 99 | /* Turn off the icache */ |
100 | p0.l = (IMEM_CONTROL & 0xFFFF); | 100 | p0.l = LO(IMEM_CONTROL); |
101 | p0.h = (IMEM_CONTROL >> 16); | 101 | p0.h = HI(IMEM_CONTROL); |
102 | R1 = [p0]; | 102 | R1 = [p0]; |
103 | R0 = ~ENICPLB; | 103 | R0 = ~ENICPLB; |
104 | R0 = R0 & R1; | 104 | R0 = R0 & R1; |
@@ -106,8 +106,8 @@ ENTRY(__stext) | |||
106 | SSYNC; | 106 | SSYNC; |
107 | 107 | ||
108 | /* Turn off the dcache */ | 108 | /* Turn off the dcache */ |
109 | p0.l = (DMEM_CONTROL & 0xFFFF); | 109 | p0.l = LO(DMEM_CONTROL); |
110 | p0.h = (DMEM_CONTROL >> 16); | 110 | p0.h = HI(DMEM_CONTROL); |
111 | R1 = [p0]; | 111 | R1 = [p0]; |
112 | R0 = ~ENDCPLB; | 112 | R0 = ~ENDCPLB; |
113 | R0 = R0 & R1; | 113 | R0 = R0 & R1; |
@@ -335,8 +335,8 @@ ENTRY(_start_dma_code) | |||
335 | w[p0] = r0.l; | 335 | w[p0] = r0.l; |
336 | ssync; | 336 | ssync; |
337 | 337 | ||
338 | p0.l = (EBIU_SDBCTL & 0xFFFF); | 338 | p0.l = LO(EBIU_SDBCTL); |
339 | p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ | 339 | p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ |
340 | r0 = mem_SDBCTL; | 340 | r0 = mem_SDBCTL; |
341 | w[p0] = r0.l; | 341 | w[p0] = r0.l; |
342 | ssync; | 342 | ssync; |
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S index b1d0e54a97a..173893429b0 100644 --- a/arch/blackfin/mach-bf561/head.S +++ b/arch/blackfin/mach-bf561/head.S | |||
@@ -100,8 +100,8 @@ ENTRY(__start) | |||
100 | R0 = R1; | 100 | R0 = R1; |
101 | 101 | ||
102 | /* Turn off the icache */ | 102 | /* Turn off the icache */ |
103 | p0.l = (IMEM_CONTROL & 0xFFFF); | 103 | p0.l = LO(IMEM_CONTROL); |
104 | p0.h = (IMEM_CONTROL >> 16); | 104 | p0.h = HI(IMEM_CONTROL); |
105 | R1 = [p0]; | 105 | R1 = [p0]; |
106 | R0 = ~ENICPLB; | 106 | R0 = ~ENICPLB; |
107 | R0 = R0 & R1; | 107 | R0 = R0 & R1; |
@@ -117,8 +117,8 @@ ENTRY(__start) | |||
117 | #endif | 117 | #endif |
118 | 118 | ||
119 | /* Turn off the dcache */ | 119 | /* Turn off the dcache */ |
120 | p0.l = (DMEM_CONTROL & 0xFFFF); | 120 | p0.l = LO(DMEM_CONTROL); |
121 | p0.h = (DMEM_CONTROL >> 16); | 121 | p0.h = HI(DMEM_CONTROL); |
122 | R1 = [p0]; | 122 | R1 = [p0]; |
123 | R0 = ~ENDCPLB; | 123 | R0 = ~ENDCPLB; |
124 | R0 = R0 & R1; | 124 | R0 = R0 & R1; |
@@ -371,8 +371,8 @@ ENTRY(_start_dma_code) | |||
371 | w[p0] = r0.l; | 371 | w[p0] = r0.l; |
372 | ssync; | 372 | ssync; |
373 | 373 | ||
374 | p0.l = (EBIU_SDBCTL & 0xFFFF); | 374 | p0.l = LO(EBIU_SDBCTL); |
375 | p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ | 375 | p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ |
376 | r0 = mem_SDBCTL; | 376 | r0 = mem_SDBCTL; |
377 | w[p0] = r0.l; | 377 | w[p0] = r0.l; |
378 | ssync; | 378 | ssync; |
diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S index 7063795eb7c..0521b158820 100644 --- a/arch/blackfin/mach-common/cache.S +++ b/arch/blackfin/mach-common/cache.S | |||
@@ -79,8 +79,8 @@ ENTRY(_icache_invalidate) | |||
79 | ENTRY(_invalidate_entire_icache) | 79 | ENTRY(_invalidate_entire_icache) |
80 | [--SP] = ( R7:5); | 80 | [--SP] = ( R7:5); |
81 | 81 | ||
82 | P0.L = (IMEM_CONTROL & 0xFFFF); | 82 | P0.L = LO(IMEM_CONTROL); |
83 | P0.H = (IMEM_CONTROL >> 16); | 83 | P0.H = HI(IMEM_CONTROL); |
84 | R7 = [P0]; | 84 | R7 = [P0]; |
85 | 85 | ||
86 | /* Clear the IMC bit , All valid bits in the instruction | 86 | /* Clear the IMC bit , All valid bits in the instruction |
@@ -197,8 +197,8 @@ ENTRY(_invalidate_entire_dcache) | |||
197 | ENTRY(_dcache_invalidate) | 197 | ENTRY(_dcache_invalidate) |
198 | [--SP] = ( R7:6); | 198 | [--SP] = ( R7:6); |
199 | 199 | ||
200 | P0.L = (DMEM_CONTROL & 0xFFFF); | 200 | P0.L = LO(DMEM_CONTROL); |
201 | P0.H = (DMEM_CONTROL >> 16); | 201 | P0.H = HI(DMEM_CONTROL); |
202 | R7 = [P0]; | 202 | R7 = [P0]; |
203 | 203 | ||
204 | /* Clear the DMC[1:0] bits, All valid bits in the data | 204 | /* Clear the DMC[1:0] bits, All valid bits in the data |
diff --git a/arch/blackfin/mach-common/cacheinit.S b/arch/blackfin/mach-common/cacheinit.S index 05c0c77510b..afa0adfac6c 100644 --- a/arch/blackfin/mach-common/cacheinit.S +++ b/arch/blackfin/mach-common/cacheinit.S | |||
@@ -43,8 +43,8 @@ | |||
43 | ENTRY(_bfin_write_IMEM_CONTROL) | 43 | ENTRY(_bfin_write_IMEM_CONTROL) |
44 | 44 | ||
45 | /* Enable Instruction Cache */ | 45 | /* Enable Instruction Cache */ |
46 | P0.l = (IMEM_CONTROL & 0xFFFF); | 46 | P0.l = LO(IMEM_CONTROL); |
47 | P0.h = (IMEM_CONTROL >> 16); | 47 | P0.h = HI(IMEM_CONTROL); |
48 | 48 | ||
49 | /* Anomaly 05000125 */ | 49 | /* Anomaly 05000125 */ |
50 | CLI R1; | 50 | CLI R1; |
diff --git a/arch/blackfin/mach-common/cplbmgr.S b/arch/blackfin/mach-common/cplbmgr.S index 6c256baf087..cef94c13f95 100644 --- a/arch/blackfin/mach-common/cplbmgr.S +++ b/arch/blackfin/mach-common/cplbmgr.S | |||
@@ -75,15 +75,15 @@ ENTRY(_cplb_mgr) | |||
75 | * from the configuration table. | 75 | * from the configuration table. |
76 | */ | 76 | */ |
77 | 77 | ||
78 | P4.L = (ICPLB_FAULT_ADDR & 0xFFFF); | 78 | P4.L = LO(ICPLB_FAULT_ADDR); |
79 | P4.H = (ICPLB_FAULT_ADDR >> 16); | 79 | P4.H = HI(ICPLB_FAULT_ADDR); |
80 | 80 | ||
81 | P1 = 16; | 81 | P1 = 16; |
82 | P5.L = _page_size_table; | 82 | P5.L = _page_size_table; |
83 | P5.H = _page_size_table; | 83 | P5.H = _page_size_table; |
84 | 84 | ||
85 | P0.L = (ICPLB_DATA0 & 0xFFFF); | 85 | P0.L = LO(ICPLB_DATA0); |
86 | P0.H = (ICPLB_DATA0 >> 16); | 86 | P0.H = HI(ICPLB_DATA0); |
87 | R4 = [P4]; /* Get faulting address*/ | 87 | R4 = [P4]; /* Get faulting address*/ |
88 | R6 = 64; /* Advance past the fault address, which*/ | 88 | R6 = 64; /* Advance past the fault address, which*/ |
89 | R6 = R6 + R4; /* we'll use if we find a match*/ | 89 | R6 = R6 + R4; /* we'll use if we find a match*/ |
@@ -117,13 +117,13 @@ ENTRY(_cplb_mgr) | |||
117 | I0 = R4; /* Fault address we'll search for*/ | 117 | I0 = R4; /* Fault address we'll search for*/ |
118 | 118 | ||
119 | /* set up pointers */ | 119 | /* set up pointers */ |
120 | P0.L = (ICPLB_DATA0 & 0xFFFF); | 120 | P0.L = LO(ICPLB_DATA0); |
121 | P0.H = (ICPLB_DATA0 >> 16); | 121 | P0.H = HI(ICPLB_DATA0); |
122 | 122 | ||
123 | /* The replacement procedure for ICPLBs */ | 123 | /* The replacement procedure for ICPLBs */ |
124 | 124 | ||
125 | P4.L = (IMEM_CONTROL & 0xFFFF); | 125 | P4.L = LO(IMEM_CONTROL); |
126 | P4.H = (IMEM_CONTROL >> 16); | 126 | P4.H = HI(IMEM_CONTROL); |
127 | 127 | ||
128 | /* disable cplbs */ | 128 | /* disable cplbs */ |
129 | R5 = [P4]; /* Control Register*/ | 129 | R5 = [P4]; /* Control Register*/ |
@@ -243,8 +243,8 @@ ENTRY(_cplb_mgr) | |||
243 | * last entry of the table. | 243 | * last entry of the table. |
244 | */ | 244 | */ |
245 | 245 | ||
246 | P1.L = (ICPLB_DATA15 & 0xFFFF); /* ICPLB_DATA15 */ | 246 | P1.L = LO(ICPLB_DATA15); /* ICPLB_DATA15 */ |
247 | P1.H = (ICPLB_DATA15 >> 16); | 247 | P1.H = HI(ICPLB_DATA15); |
248 | [P1] = R2; | 248 | [P1] = R2; |
249 | [P1-0x100] = R4; | 249 | [P1-0x100] = R4; |
250 | #ifdef CONFIG_CPLB_INFO | 250 | #ifdef CONFIG_CPLB_INFO |
@@ -292,10 +292,10 @@ ENTRY(_cplb_mgr) | |||
292 | * pending writes associated with the CPLB. | 292 | * pending writes associated with the CPLB. |
293 | */ | 293 | */ |
294 | 294 | ||
295 | P4.L = (DCPLB_STATUS & 0xFFFF); | 295 | P4.L = LO(DCPLB_STATUS); |
296 | P4.H = (DCPLB_STATUS >> 16); | 296 | P4.H = HI(DCPLB_STATUS); |
297 | P3.L = (DCPLB_DATA0 & 0xFFFF); | 297 | P3.L = LO(DCPLB_DATA0); |
298 | P3.H = (DCPLB_DATA0 >> 16); | 298 | P3.H = HI(DCPLB_DATA0); |
299 | R5 = [P4]; | 299 | R5 = [P4]; |
300 | 300 | ||
301 | /* A protection violation can be caused by more than just writes | 301 | /* A protection violation can be caused by more than just writes |
@@ -355,11 +355,11 @@ ENTRY(_cplb_mgr) | |||
355 | * config table, that covers the faulting address. | 355 | * config table, that covers the faulting address. |
356 | */ | 356 | */ |
357 | 357 | ||
358 | P1.L = (DCPLB_DATA15 & 0xFFFF); | 358 | P1.L = LO(DCPLB_DATA15); |
359 | P1.H = (DCPLB_DATA15 >> 16); | 359 | P1.H = HI(DCPLB_DATA15); |
360 | 360 | ||
361 | P4.L = (DCPLB_FAULT_ADDR & 0xFFFF); | 361 | P4.L = LO(DCPLB_FAULT_ADDR); |
362 | P4.H = (DCPLB_FAULT_ADDR >> 16); | 362 | P4.H = HI(DCPLB_FAULT_ADDR); |
363 | R4 = [P4]; | 363 | R4 = [P4]; |
364 | I0 = R4; | 364 | I0 = R4; |
365 | 365 | ||
@@ -368,8 +368,8 @@ ENTRY(_cplb_mgr) | |||
368 | R6 = R1; /* Save for later*/ | 368 | R6 = R1; /* Save for later*/ |
369 | 369 | ||
370 | /* Turn off CPLBs while we work.*/ | 370 | /* Turn off CPLBs while we work.*/ |
371 | P4.L = (DMEM_CONTROL & 0xFFFF); | 371 | P4.L = LO(DMEM_CONTROL); |
372 | P4.H = (DMEM_CONTROL >> 16); | 372 | P4.H = HI(DMEM_CONTROL); |
373 | R5 = [P4]; | 373 | R5 = [P4]; |
374 | BITCLR(R5,ENDCPLB_P); | 374 | BITCLR(R5,ENDCPLB_P); |
375 | CLI R0; | 375 | CLI R0; |
@@ -384,8 +384,8 @@ ENTRY(_cplb_mgr) | |||
384 | * are no good. | 384 | * are no good. |
385 | */ | 385 | */ |
386 | 386 | ||
387 | I1.L = (DCPLB_DATA0 & 0xFFFF); | 387 | I1.L = LO(DCPLB_DATA0); |
388 | I1.H = (DCPLB_DATA0 >> 16); | 388 | I1.H = HI(DCPLB_DATA0); |
389 | P1 = 2; | 389 | P1 = 2; |
390 | P2 = 16; | 390 | P2 = 16; |
391 | I2.L = _dcplb_preference; | 391 | I2.L = _dcplb_preference; |
@@ -475,8 +475,8 @@ ENTRY(_cplb_mgr) | |||
475 | * one space closer to the start. | 475 | * one space closer to the start. |
476 | */ | 476 | */ |
477 | 477 | ||
478 | R1.L = (DCPLB_DATA16 & 0xFFFF); /* DCPLB_DATA15 + 4 */ | 478 | R1.L = LO(DCPLB_DATA16); /* DCPLB_DATA15 + 4 */ |
479 | R1.H = (DCPLB_DATA16 >> 16); | 479 | R1.H = HI(DCPLB_DATA16); |
480 | R0 = P0; | 480 | R0 = P0; |
481 | 481 | ||
482 | /* If the victim happens to be in DCPLB15, | 482 | /* If the victim happens to be in DCPLB15, |
@@ -549,8 +549,8 @@ ENTRY(_cplb_mgr) | |||
549 | * if necessary. | 549 | * if necessary. |
550 | */ | 550 | */ |
551 | 551 | ||
552 | P1.L = (DCPLB_DATA15 & 0xFFFF); | 552 | P1.L = LO(DCPLB_DATA15); |
553 | P1.H = (DCPLB_DATA15 >> 16); | 553 | P1.H = HI(DCPLB_DATA15); |
554 | 554 | ||
555 | /* If the DCPLB has cache bits set, but caching hasn't | 555 | /* If the DCPLB has cache bits set, but caching hasn't |
556 | * been enabled, then we want to mask off the cache-in-L1 | 556 | * been enabled, then we want to mask off the cache-in-L1 |
diff --git a/arch/blackfin/mach-common/dpmc.S b/arch/blackfin/mach-common/dpmc.S index 97cdcd6a00d..04194dca015 100644 --- a/arch/blackfin/mach-common/dpmc.S +++ b/arch/blackfin/mach-common/dpmc.S | |||
@@ -39,8 +39,8 @@ ENTRY(_unmask_wdog_wakeup_evt) | |||
39 | P0.H = hi(SICA_IWR1); | 39 | P0.H = hi(SICA_IWR1); |
40 | P0.L = lo(SICA_IWR1); | 40 | P0.L = lo(SICA_IWR1); |
41 | #else | 41 | #else |
42 | P0.h = (SIC_IWR >> 16); | 42 | P0.h = HI(SIC_IWR); |
43 | P0.l = (SIC_IWR & 0xFFFF); | 43 | P0.l = LO(SIC_IWR); |
44 | #endif | 44 | #endif |
45 | R7 = [P0]; | 45 | R7 = [P0]; |
46 | #if defined(CONFIG_BF561) | 46 | #if defined(CONFIG_BF561) |
@@ -60,11 +60,11 @@ ENTRY(_unmask_wdog_wakeup_evt) | |||
60 | */ | 60 | */ |
61 | R7 = 0x0000(z); | 61 | R7 = 0x0000(z); |
62 | #if defined(CONFIG_BF561) | 62 | #if defined(CONFIG_BF561) |
63 | P0.h = (WDOGA_STAT >> 16); | 63 | P0.h = HI(WDOGA_STAT); |
64 | P0.l = (WDOGA_STAT & 0xFFFF); | 64 | P0.l = LO(WDOGA_STAT); |
65 | #else | 65 | #else |
66 | P0.h = (WDOG_STAT >> 16); | 66 | P0.h = HI(WDOG_STAT); |
67 | P0.l = (WDOG_STAT & 0xFFFF); | 67 | P0.l = LO(WDOG_STAT); |
68 | #endif | 68 | #endif |
69 | [P0] = R7; | 69 | [P0] = R7; |
70 | SSYNC; | 70 | SSYNC; |
@@ -73,21 +73,21 @@ ENTRY(_unmask_wdog_wakeup_evt) | |||
73 | ENTRY(_program_wdog_timer) | 73 | ENTRY(_program_wdog_timer) |
74 | [--SP] = ( R7:0, P5:0 ); | 74 | [--SP] = ( R7:0, P5:0 ); |
75 | #if defined(CONFIG_BF561) | 75 | #if defined(CONFIG_BF561) |
76 | P0.h = (WDOGA_CNT >> 16); | 76 | P0.h = HI(WDOGA_CNT); |
77 | P0.l = (WDOGA_CNT & 0xFFFF); | 77 | P0.l = LO(WDOGA_CNT); |
78 | #else | 78 | #else |
79 | P0.h = (WDOG_CNT >> 16); | 79 | P0.h = HI(WDOG_CNT); |
80 | P0.l = (WDOG_CNT & 0xFFFF); | 80 | P0.l = LO(WDOG_CNT); |
81 | #endif | 81 | #endif |
82 | [P0] = R0; | 82 | [P0] = R0; |
83 | SSYNC; | 83 | SSYNC; |
84 | 84 | ||
85 | #if defined(CONFIG_BF561) | 85 | #if defined(CONFIG_BF561) |
86 | P0.h = (WDOGA_CTL >> 16); | 86 | P0.h = HI(WDOGA_CTL); |
87 | P0.l = (WDOGA_CTL & 0xFFFF); | 87 | P0.l = LO(WDOGA_CTL); |
88 | #else | 88 | #else |
89 | P0.h = (WDOG_CTL >> 16); | 89 | P0.h = HI(WDOG_CTL); |
90 | P0.l = (WDOG_CTL & 0xFFFF); | 90 | P0.l = LO(WDOG_CTL); |
91 | #endif | 91 | #endif |
92 | R7 = W[P0](Z); | 92 | R7 = W[P0](Z); |
93 | CC = BITTST(R7,1); | 93 | CC = BITTST(R7,1); |
@@ -97,11 +97,11 @@ ENTRY(_program_wdog_timer) | |||
97 | 97 | ||
98 | .LSKIP_WRITE_TO_STAT: | 98 | .LSKIP_WRITE_TO_STAT: |
99 | #if defined(CONFIG_BF561) | 99 | #if defined(CONFIG_BF561) |
100 | P0.h = (WDOGA_CTL >> 16); | 100 | P0.h = HI(WDOGA_CTL); |
101 | P0.l = (WDOGA_CTL & 0xFFFF); | 101 | P0.l = LO(WDOGA_CTL); |
102 | #else | 102 | #else |
103 | P0.h = (WDOG_CTL >> 16); | 103 | P0.h = HI(WDOG_CTL); |
104 | P0.l = (WDOG_CTL & 0xFFFF); | 104 | P0.l = LO(WDOG_CTL); |
105 | #endif | 105 | #endif |
106 | R7 = W[P0](Z); | 106 | R7 = W[P0](Z); |
107 | BITCLR(R7,1); /* Enable GP event */ | 107 | BITCLR(R7,1); /* Enable GP event */ |
@@ -122,11 +122,11 @@ ENTRY(_clear_wdog_wakeup_evt) | |||
122 | [--SP] = ( R7:0, P5:0 ); | 122 | [--SP] = ( R7:0, P5:0 ); |
123 | 123 | ||
124 | #if defined(CONFIG_BF561) | 124 | #if defined(CONFIG_BF561) |
125 | P0.h = (WDOGA_CTL >> 16); | 125 | P0.h = HI(WDOGA_CTL); |
126 | P0.l = (WDOGA_CTL & 0xFFFF); | 126 | P0.l = LO(WDOGA_CTL); |
127 | #else | 127 | #else |
128 | P0.h = (WDOG_CTL >> 16); | 128 | P0.h = HI(WDOG_CTL); |
129 | P0.l = (WDOG_CTL & 0xFFFF); | 129 | P0.l = LO(WDOG_CTL); |
130 | #endif | 130 | #endif |
131 | R7 = 0x0AD6(Z); | 131 | R7 = 0x0AD6(Z); |
132 | W[P0] = R7.L; | 132 | W[P0] = R7.L; |
@@ -149,11 +149,11 @@ ENTRY(_clear_wdog_wakeup_evt) | |||
149 | ENTRY(_disable_wdog_timer) | 149 | ENTRY(_disable_wdog_timer) |
150 | [--SP] = ( R7:0, P5:0 ); | 150 | [--SP] = ( R7:0, P5:0 ); |
151 | #if defined(CONFIG_BF561) | 151 | #if defined(CONFIG_BF561) |
152 | P0.h = (WDOGA_CTL >> 16); | 152 | P0.h = HI(WDOGA_CTL); |
153 | P0.l = (WDOGA_CTL & 0xFFFF); | 153 | P0.l = LO(WDOGA_CTL); |
154 | #else | 154 | #else |
155 | P0.h = (WDOG_CTL >> 16); | 155 | P0.h = HI(WDOG_CTL); |
156 | P0.l = (WDOG_CTL & 0xFFFF); | 156 | P0.l = LO(WDOG_CTL); |
157 | #endif | 157 | #endif |
158 | R7 = 0xAD6(Z); | 158 | R7 = 0xAD6(Z); |
159 | W[P0] = R7.L; | 159 | W[P0] = R7.L; |
diff --git a/arch/blackfin/mach-common/lock.S b/arch/blackfin/mach-common/lock.S index 386ac8dda07..190edb3cdc8 100644 --- a/arch/blackfin/mach-common/lock.S +++ b/arch/blackfin/mach-common/lock.S | |||
@@ -43,12 +43,12 @@ ENTRY(_cache_grab_lock) | |||
43 | 43 | ||
44 | [--SP]=( R7:0,P5:0 ); | 44 | [--SP]=( R7:0,P5:0 ); |
45 | 45 | ||
46 | P1.H = (IMEM_CONTROL >> 16); | 46 | P1.H = HI(IMEM_CONTROL); |
47 | P1.L = (IMEM_CONTROL & 0xFFFF); | 47 | P1.L = LO(IMEM_CONTROL); |
48 | P5.H = (ICPLB_ADDR0 >> 16); | 48 | P5.H = HI(ICPLB_ADDR0); |
49 | P5.L = (ICPLB_ADDR0 & 0xFFFF); | 49 | P5.L = LO(ICPLB_ADDR0); |
50 | P4.H = (ICPLB_DATA0 >> 16); | 50 | P4.H = HI(ICPLB_DATA0); |
51 | P4.L = (ICPLB_DATA0 & 0xFFFF); | 51 | P4.L = LO(ICPLB_DATA0); |
52 | R7 = R0; | 52 | R7 = R0; |
53 | 53 | ||
54 | /* If the code of interest already resides in the cache | 54 | /* If the code of interest already resides in the cache |
@@ -167,8 +167,8 @@ ENTRY(_cache_lock) | |||
167 | 167 | ||
168 | [--SP]=( R7:0,P5:0 ); | 168 | [--SP]=( R7:0,P5:0 ); |
169 | 169 | ||
170 | P1.H = (IMEM_CONTROL >> 16); | 170 | P1.H = HI(IMEM_CONTROL); |
171 | P1.L = (IMEM_CONTROL & 0xFFFF); | 171 | P1.L = LO(IMEM_CONTROL); |
172 | 172 | ||
173 | /* Disable the Interrupts*/ | 173 | /* Disable the Interrupts*/ |
174 | CLI R3; | 174 | CLI R3; |
@@ -195,8 +195,8 @@ ENDPROC(_cache_lock) | |||
195 | */ | 195 | */ |
196 | 196 | ||
197 | ENTRY(_read_iloc) | 197 | ENTRY(_read_iloc) |
198 | P1.H = (IMEM_CONTROL >> 16); | 198 | P1.H = HI(IMEM_CONTROL); |
199 | P1.L = (IMEM_CONTROL & 0xFFFF); | 199 | P1.L = LO(IMEM_CONTROL); |
200 | R1 = 0xF; | 200 | R1 = 0xF; |
201 | R0 = [P1]; | 201 | R0 = [P1]; |
202 | R0 = R0 >> 3; | 202 | R0 = R0 >> 3; |