History

Merge tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc

Pull sparc updates from Andreas Larsson: - Fix missing prototype warnings in various places, including switching to using generic cmpdi2/ucmpdi2 and parport.h and stop selecting unneeded GENERIC_ISA_DMA. - Reduce duplicate code by using shared font data, with dependency fixup in separate commit touching lib/fonts. - Convert sbus drives to use remove callbacks returning void - Fix return values of __setup handlers - Section mismatch fix for grpci pci drivers - Make the vio bus type constant - Kconfig cleanups and fixes - Typo fixes * tag 'sparc-for-6.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc: lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console sbus: uctrl: Convert to platform remove callback returning void sbus: flash: Convert to platform remove callback returning void sbus: envctrl: Convert to platform remove callback returning void sbus: display7seg: Convert to platform remove callback returning void sbus: bbc_i2c: Convert to platform remove callback returning void sbus: Add prototype for bbc_envctrl_init and bbc_envctrl_cleanup to header sparc32: Fix section mismatch in leon_pci_grpci sparc32: Fix parport build with sparc32 sparc32: Do not select GENERIC_ISA_DMA mtd: maps: sun_uflash: Declare uflash_devinit static sparc32: Fix build with trapbase sparc32: Use generic cmpdi2/ucmpdi2 variants sparc: select FRAME_POINTER instead of redefining it sparc: vDSO: fix return value of __setup handler sparc64: NMI watchdog: fix return value of __setup handler sparc: vio: make vio_bus_type const sparc: Fix typos sparc: Use shared font data sparc: remove obsolete config ARCH_ATU

Linus Torvalds committed 2 years ago

Commit 8a2fbff2 parents 54f42d2 84b76d045 files · +344 −744Browse files

Unified · Split

45 files
  1. arch/sparc/Kconfig +4 −8
  2. arch/sparc/Kconfig.debug +2 −5
  3. arch/sparc/include/asm/hypervisor.h +3 −3
  4. arch/sparc/include/asm/ldc.h +1 −1
  5. arch/sparc/include/asm/mmu_context_64.h +2 −2
  6. arch/sparc/include/asm/parport.h +7 −252
  7. arch/sparc/include/asm/parport_64.h +256 −0
  8. arch/sparc/include/asm/switch_to_64.h +1 −1
  9. arch/sparc/kernel/btext.c +9 −356
  10. arch/sparc/kernel/irq_32.c +3 −3
  11. arch/sparc/kernel/irq_64.c +1 −1
  12. arch/sparc/kernel/kernel.h +4 −4
  13. arch/sparc/kernel/kgdb_32.c +2 −2
  14. arch/sparc/kernel/kprobes.c +1 −1
  15. arch/sparc/kernel/ldc.c +1 −1
  16. arch/sparc/kernel/leon_pci_grpci1.c +1 −1
  17. arch/sparc/kernel/leon_pci_grpci2.c +2 −2
  18. arch/sparc/kernel/leon_smp.c +3 −3
  19. arch/sparc/kernel/nmi.c +1 −1
  20. arch/sparc/kernel/of_device_64.c +1 −1
  21. arch/sparc/kernel/pci.c +1 −1
  22. arch/sparc/kernel/pci_impl.h +2 −2
  23. arch/sparc/kernel/pci_schizo.c +2 −2
  24. arch/sparc/kernel/perf_event.c +1 −1
  25. arch/sparc/kernel/prom_irqtrans.c +1 −1
  26. arch/sparc/kernel/psycho_common.c +1 −1
  27. arch/sparc/kernel/setup_32.c +2 −2
  28. arch/sparc/kernel/signal_32.c +1 −1
  29. arch/sparc/kernel/signal_64.c +1 −1
  30. arch/sparc/kernel/vio.c +1 −1
  31. arch/sparc/lib/Makefile +2 −2
  32. arch/sparc/lib/cmpdi2.c +0 −28
  33. arch/sparc/lib/ucmpdi2.c +0 −20
  34. arch/sparc/mm/srmmu.c +1 −1
  35. arch/sparc/mm/tsb.c +1 −1
  36. arch/sparc/net/bpf_jit_comp_32.c +3 −3
  37. arch/sparc/vdso/vma.c +3 −4
  38. drivers/mtd/maps/sun_uflash.c +1 −1
  39. drivers/sbus/char/bbc_i2c.c +2 −7
  40. drivers/sbus/char/bbc_i2c.h +3 −0
  41. drivers/sbus/char/display7seg.c +2 −4
  42. drivers/sbus/char/envctrl.c +2 −4
  43. drivers/sbus/char/flash.c +2 −4
  44. drivers/sbus/char/uctrl.c +2 −3
  45. lib/fonts/Kconfig +2 −1
arch/sparc/Kconfig+4−8
@@ -58,6 +58,8 @@ config SPARC32 · 57 unmodified lines
58 select CLZ_TAB58 select CLZ_TAB
59 select DMA_DIRECT_REMAP59 select DMA_DIRECT_REMAP
60 select GENERIC_ATOMIC6460 select GENERIC_ATOMIC64
61 select GENERIC_LIB_CMPDI2
62 select GENERIC_LIB_UCMPDI2
61 select HAVE_UID1663 select HAVE_UID16
62 select HAVE_PAGE_SIZE_4KB64 select HAVE_PAGE_SIZE_4KB
63 select LOCK_MM_AND_FIND_VMA65 select LOCK_MM_AND_FIND_VMA
@@ -115,10 +117,6 @@ config ARCH_PROC_KCORE_TEXT · 51 unmodified lines
115config CPU_BIG_ENDIAN117config CPU_BIG_ENDIAN
116 def_bool y118 def_bool y
117 119
118config ARCH_ATU
119 bool
120 default y if SPARC64
121
122config STACKTRACE_SUPPORT120config STACKTRACE_SUPPORT
123 bool121 bool
124 default y if SPARC64122 default y if SPARC64
@@ -143,10 +141,6 @@ config HIGHMEM · 18 unmodified lines
143 default y if SPARC32141 default y if SPARC32
144 select KMAP_LOCAL142 select KMAP_LOCAL
145 143
146config GENERIC_ISA_DMA
147 bool
148 default y if SPARC32
149
150config PGTABLE_LEVELS144config PGTABLE_LEVELS
151 default 4 if 64BIT145 default 4 if 64BIT
152 default 3146 default 3
@@ -222,6 +216,8 @@ config EARLYFB · 69 unmodified lines
222 bool "Support for early boot text console"216 bool "Support for early boot text console"
223 default y217 default y
224 depends on SPARC64218 depends on SPARC64
219 select FONT_SUN8x16
220 select FONT_SUPPORT
225 help221 help
226 Say Y here to enable a faster early framebuffer boot console.222 Say Y here to enable a faster early framebuffer boot console.
227 223
arch/sparc/Kconfig.debug+2−5
@@ -8,11 +8,8 @@ config MCOUNT · 7 unmodified lines
8 bool8 bool
9 depends on SPARC649 depends on SPARC64
10 depends on FUNCTION_TRACER10 depends on FUNCTION_TRACER
11 default y11 select ARCH_WANT_FRAME_POINTERS
12 12 select FRAME_POINTER
13config FRAME_POINTER
14 bool
15 depends on MCOUNT
16 default y13 default y
17 14
18config HAVE_HARDLOCKUP_DETECTOR_SPARC6415config HAVE_HARDLOCKUP_DETECTOR_SPARC64
arch/sparc/include/asm/hypervisor.h+3−3
@@ -430,7 +430,7 @@ unsigned long sun4v_cpu_mondo_send(unsigned long cpu_count, · 429 unmodified lines
430 * ERRORS: No errors defined.430 * ERRORS: No errors defined.
431 *431 *
432 * Return the hypervisor ID handle for the current CPU. Use by a432 * Return the hypervisor ID handle for the current CPU. Use by a
433 * virtual CPU to discover it's own identity.433 * virtual CPU to discover its own identity.
434 */434 */
435#define HV_FAST_CPU_MYID 0x16435#define HV_FAST_CPU_MYID 0x16
436 436
@@ -1221,7 +1221,7 @@ unsigned long sun4v_con_write(unsigned long buffer, · 784 unmodified lines
1221 * EBADALIGNED software state description is not correctly1221 * EBADALIGNED software state description is not correctly
1222 * aligned1222 * aligned
1223 *1223 *
1224 * This allows the guest to report it's soft state to the hypervisor. There1224 * This allows the guest to report its soft state to the hypervisor. There
1225 * are two primary components to this state. The first part states whether1225 * are two primary components to this state. The first part states whether
1226 * the guest software is running or not. The second containts optional1226 * the guest software is running or not. The second containts optional
1227 * details specific to the software.1227 * details specific to the software.
@@ -1502,7 +1502,7 @@ struct hv_trap_trace_entry { · 274 unmodified lines
1502 * configuration error of some sort.1502 * configuration error of some sort.
1503 *1503 *
1504 * The dump services provide an opaque buffer into which the1504 * The dump services provide an opaque buffer into which the
1505 * hypervisor can place it's internal state in order to assist in1505 * hypervisor can place its internal state in order to assist in
1506 * debugging such situations. The contents are opaque and extremely1506 * debugging such situations. The contents are opaque and extremely
1507 * platform and hypervisor implementation specific. The guest, during1507 * platform and hypervisor implementation specific. The guest, during
1508 * a core dump, requests that the hypervisor update any information in1508 * a core dump, requests that the hypervisor update any information in
arch/sparc/include/asm/ldc.h+1−1
@@ -13,7 +13,7 @@ void ldom_power_off(void); · 12 unmodified lines
13 * or data becomes available on the receive side.13 * or data becomes available on the receive side.
14 *14 *
15 * For non-RAW links, if the LDC_EVENT_RESET event arrives the15 * For non-RAW links, if the LDC_EVENT_RESET event arrives the
16 * driver should reset all of it's internal state and reinvoke16 * driver should reset all of its internal state and reinvoke
17 * ldc_connect() to try and bring the link up again.17 * ldc_connect() to try and bring the link up again.
18 *18 *
19 * For RAW links, ldc_connect() is not used. Instead the driver19 * For RAW links, ldc_connect() is not used. Instead the driver
arch/sparc/include/asm/mmu_context_64.h+2−2
@@ -93,7 +93,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str · 92 unmodified lines
93 93
94 /* We have to be extremely careful here or else we will miss94 /* We have to be extremely careful here or else we will miss
95 * a TSB grow if we switch back and forth between a kernel95 * a TSB grow if we switch back and forth between a kernel
96 * thread and an address space which has it's TSB size increased96 * thread and an address space which has its TSB size increased
97 * on another processor.97 * on another processor.
98 *98 *
99 * It is possible to play some games in order to optimize the99 * It is possible to play some games in order to optimize the
@@ -118,7 +118,7 @@ static inline void switch_mm(struct mm_struct *old_mm, struct mm_struct *mm, str · 18 unmodified lines
118 *118 *
119 * At that point cpu0 continues to use a stale TSB, the one from119 * At that point cpu0 continues to use a stale TSB, the one from
120 * before the TSB grow performed on cpu1. cpu1 did not cross-call120 * before the TSB grow performed on cpu1. cpu1 did not cross-call
121 * cpu0 to update it's TSB because at that point the cpu_vm_mask121 * cpu0 to update its TSB because at that point the cpu_vm_mask
122 * only had cpu1 set in it.122 * only had cpu1 set in it.
123 */123 */
124 tsb_context_switch_ctx(mm, CTX_HWBITS(mm->context));124 tsb_context_switch_ctx(mm, CTX_HWBITS(mm->context));
arch/sparc/include/asm/parport.h+7−252
@@ -1,256 +1,11 @@
1/* SPDX-License-Identifier: GPL-2.0 */1/* SPDX-License-Identifier: GPL-2.0 */
2/* parport.h: sparc64 specific parport initialization and dma.2#ifndef ___ASM_SPARC_PARPORT_H
3 *3#define ___ASM_SPARC_PARPORT_H
4 * Copyright (C) 1999 Eddie C. Dost (ecd@skynet.be)
5 */
6 4
7#ifndef _ASM_SPARC64_PARPORT_H5#if defined(__sparc__) && defined(__arch64__)
8#define _ASM_SPARC64_PARPORT_H 16#include <asm/parport_64.h>
9 7#else
10#include <linux/of.h>8#include <asm-generic/parport.h>
11#include <linux/platform_device.h>9#endif
12
13#include <asm/ebus_dma.h>
14#include <asm/ns87303.h>
15#include <asm/prom.h>
16
17#define PARPORT_PC_MAX_PORTS PARPORT_MAX
18
19/*
20 * While sparc64 doesn't have an ISA DMA API, we provide something that looks
21 * close enough to make parport_pc happy
22 */
23#define HAS_DMA
24
25#ifdef CONFIG_PARPORT_PC_FIFO
26static DEFINE_SPINLOCK(dma_spin_lock);
27
28#define claim_dma_lock() \
29({ unsigned long flags; \
30 spin_lock_irqsave(&dma_spin_lock, flags); \
31 flags; \
32})
33
34#define release_dma_lock(__flags) \
35 spin_unlock_irqrestore(&dma_spin_lock, __flags);
36#endif10#endif
37 11
38static struct sparc_ebus_info {
39 struct ebus_dma_info info;
40 unsigned int addr;
41 unsigned int count;
42 int lock;
43
44 struct parport *port;
45} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
46
47static DECLARE_BITMAP(dma_slot_map, PARPORT_PC_MAX_PORTS);
48
49static inline int request_dma(unsigned int dmanr, const char *device_id)
50{
51 if (dmanr >= PARPORT_PC_MAX_PORTS)
52 return -EINVAL;
53 if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
54 return -EBUSY;
55 return 0;
56}
57
58static inline void free_dma(unsigned int dmanr)
59{
60 if (dmanr >= PARPORT_PC_MAX_PORTS) {
61 printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
62 return;
63 }
64 if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
65 printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
66 return;
67 }
68}
69
70static inline void enable_dma(unsigned int dmanr)
71{
72 ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
73
74 if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
75 sparc_ebus_dmas[dmanr].addr,
76 sparc_ebus_dmas[dmanr].count))
77 BUG();
78}
79
80static inline void disable_dma(unsigned int dmanr)
81{
82 ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 0);
83}
84
85static inline void clear_dma_ff(unsigned int dmanr)
86{
87 /* nothing */
88}
89
90static inline void set_dma_mode(unsigned int dmanr, char mode)
91{
92 ebus_dma_prepare(&sparc_ebus_dmas[dmanr].info, (mode != DMA_MODE_WRITE));
93}
94
95static inline void set_dma_addr(unsigned int dmanr, unsigned int addr)
96{
97 sparc_ebus_dmas[dmanr].addr = addr;
98}
99
100static inline void set_dma_count(unsigned int dmanr, unsigned int count)
101{
102 sparc_ebus_dmas[dmanr].count = count;
103}
104
105static inline unsigned int get_dma_residue(unsigned int dmanr)
106{
107 return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
108}
109
110static int ecpp_probe(struct platform_device *op)
111{
112 unsigned long base = op->resource[0].start;
113 unsigned long config = op->resource[1].start;
114 unsigned long d_base = op->resource[2].start;
115 unsigned long d_len;
116 struct device_node *parent;
117 struct parport *p;
118 int slot, err;
119
120 parent = op->dev.of_node->parent;
121 if (of_node_name_eq(parent, "dma")) {
122 p = parport_pc_probe_port(base, base + 0x400,
123 op->archdata.irqs[0], PARPORT_DMA_NOFIFO,
124 op->dev.parent->parent, 0);
125 if (!p)
126 return -ENOMEM;
127 dev_set_drvdata(&op->dev, p);
128 return 0;
129 }
130
131 for (slot = 0; slot < PARPORT_PC_MAX_PORTS; slot++) {
132 if (!test_and_set_bit(slot, dma_slot_map))
133 break;
134 }
135 err = -ENODEV;
136 if (slot >= PARPORT_PC_MAX_PORTS)
137 goto out_err;
138
139 spin_lock_init(&sparc_ebus_dmas[slot].info.lock);
140
141 d_len = (op->resource[2].end - d_base) + 1UL;
142 sparc_ebus_dmas[slot].info.regs =
143 of_ioremap(&op->resource[2], 0, d_len, "ECPP DMA");
144
145 if (!sparc_ebus_dmas[slot].info.regs)
146 goto out_clear_map;
147
148 sparc_ebus_dmas[slot].info.flags = 0;
149 sparc_ebus_dmas[slot].info.callback = NULL;
150 sparc_ebus_dmas[slot].info.client_cookie = NULL;
151 sparc_ebus_dmas[slot].info.irq = 0xdeadbeef;
152 strcpy(sparc_ebus_dmas[slot].info.name, "parport");
153 if (ebus_dma_register(&sparc_ebus_dmas[slot].info))
154 goto out_unmap_regs;
155
156 ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 1);
157
158 /* Configure IRQ to Push Pull, Level Low */
159 /* Enable ECP, set bit 2 of the CTR first */
160 outb(0x04, base + 0x02);
161 ns87303_modify(config, PCR,
162 PCR_EPP_ENABLE |
163 PCR_IRQ_ODRAIN,
164 PCR_ECP_ENABLE |
165 PCR_ECP_CLK_ENA |
166 PCR_IRQ_POLAR);
167
168 /* CTR bit 5 controls direction of port */
169 ns87303_modify(config, PTR,
170 0, PTR_LPT_REG_DIR);
171
172 p = parport_pc_probe_port(base, base + 0x400,
173 op->archdata.irqs[0],
174 slot,
175 op->dev.parent,
176 0);
177 err = -ENOMEM;
178 if (!p)
179 goto out_disable_irq;
180
181 dev_set_drvdata(&op->dev, p);
182
183 return 0;
184
185out_disable_irq:
186 ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
187 ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
188
189out_unmap_regs:
190 of_iounmap(&op->resource[2], sparc_ebus_dmas[slot].info.regs, d_len);
191
192out_clear_map:
193 clear_bit(slot, dma_slot_map);
194
195out_err:
196 return err;
197}
198
199static int ecpp_remove(struct platform_device *op)
200{
201 struct parport *p = dev_get_drvdata(&op->dev);
202 int slot = p->dma;
203
204 parport_pc_unregister_port(p);
205
206 if (slot != PARPORT_DMA_NOFIFO) {
207 unsigned long d_base = op->resource[2].start;
208 unsigned long d_len;
209
210 d_len = (op->resource[2].end - d_base) + 1UL;
211
212 ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
213 ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
214 of_iounmap(&op->resource[2],
215 sparc_ebus_dmas[slot].info.regs,
216 d_len);
217 clear_bit(slot, dma_slot_map);
218 }
219
220 return 0;
221}
222
223static const struct of_device_id ecpp_match[] = {
224 {
225 .name = "ecpp",
226 },
227 {
228 .name = "parallel",
229 .compatible = "ecpp",
230 },
231 {
232 .name = "parallel",
233 .compatible = "ns87317-ecpp",
234 },
235 {
236 .name = "parallel",
237 .compatible = "pnpALI,1533,3",
238 },
239 {},
240};
241
242static struct platform_driver ecpp_driver = {
243 .driver = {
244 .name = "ecpp",
245 .of_match_table = ecpp_match,
246 },
247 .probe = ecpp_probe,
248 .remove = ecpp_remove,
249};
250
251static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
252{
253 return platform_driver_register(&ecpp_driver);
254}
255
256#endif /* !(_ASM_SPARC64_PARPORT_H */
arch/sparc/include/asm/parport_64.h+256−0
@@ -0,0 +1,256 @@
1/* SPDX-License-Identifier: GPL-2.0 */
2/* parport.h: sparc64 specific parport initialization and dma.
3 *
4 * Copyright (C) 1999 Eddie C. Dost (ecd@skynet.be)
5 */
6
7#ifndef _ASM_SPARC64_PARPORT_H
8#define _ASM_SPARC64_PARPORT_H 1
9
10#include <linux/of.h>
11#include <linux/platform_device.h>
12
13#include <asm/ebus_dma.h>
14#include <asm/ns87303.h>
15#include <asm/prom.h>
16
17#define PARPORT_PC_MAX_PORTS PARPORT_MAX
18
19/*
20 * While sparc64 doesn't have an ISA DMA API, we provide something that looks
21 * close enough to make parport_pc happy
22 */
23#define HAS_DMA
24
25#ifdef CONFIG_PARPORT_PC_FIFO
26static DEFINE_SPINLOCK(dma_spin_lock);
27
28#define claim_dma_lock() \
29({ unsigned long flags; \
30 spin_lock_irqsave(&dma_spin_lock, flags); \
31 flags; \
32})
33
34#define release_dma_lock(__flags) \
35 spin_unlock_irqrestore(&dma_spin_lock, __flags);
36#endif
37
38static struct sparc_ebus_info {
39 struct ebus_dma_info info;
40 unsigned int addr;
41 unsigned int count;
42 int lock;
43
44 struct parport *port;
45} sparc_ebus_dmas[PARPORT_PC_MAX_PORTS];
46
47static DECLARE_BITMAP(dma_slot_map, PARPORT_PC_MAX_PORTS);
48
49static inline int request_dma(unsigned int dmanr, const char *device_id)
50{
51 if (dmanr >= PARPORT_PC_MAX_PORTS)
52 return -EINVAL;
53 if (xchg(&sparc_ebus_dmas[dmanr].lock, 1) != 0)
54 return -EBUSY;
55 return 0;
56}
57
58static inline void free_dma(unsigned int dmanr)
59{
60 if (dmanr >= PARPORT_PC_MAX_PORTS) {
61 printk(KERN_WARNING "Trying to free DMA%d\n", dmanr);
62 return;
63 }
64 if (xchg(&sparc_ebus_dmas[dmanr].lock, 0) == 0) {
65 printk(KERN_WARNING "Trying to free free DMA%d\n", dmanr);
66 return;
67 }
68}
69
70static inline void enable_dma(unsigned int dmanr)
71{
72 ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
73
74 if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
75 sparc_ebus_dmas[dmanr].addr,
76 sparc_ebus_dmas[dmanr].count))
77 BUG();
78}
79
80static inline void disable_dma(unsigned int dmanr)
81{
82 ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 0);
83}
84
85static inline void clear_dma_ff(unsigned int dmanr)
86{
87 /* nothing */
88}
89
90static inline void set_dma_mode(unsigned int dmanr, char mode)
91{
92 ebus_dma_prepare(&sparc_ebus_dmas[dmanr].info, (mode != DMA_MODE_WRITE));
93}
94
95static inline void set_dma_addr(unsigned int dmanr, unsigned int addr)
96{
97 sparc_ebus_dmas[dmanr].addr = addr;
98}
99
100static inline void set_dma_count(unsigned int dmanr, unsigned int count)
101{
102 sparc_ebus_dmas[dmanr].count = count;
103}
104
105static inline unsigned int get_dma_residue(unsigned int dmanr)
106{
107 return ebus_dma_residue(&sparc_ebus_dmas[dmanr].info);
108}
109
110static int ecpp_probe(struct platform_device *op)
111{
112 unsigned long base = op->resource[0].start;
113 unsigned long config = op->resource[1].start;
114 unsigned long d_base = op->resource[2].start;
115 unsigned long d_len;
116 struct device_node *parent;
117 struct parport *p;
118 int slot, err;
119
120 parent = op->dev.of_node->parent;
121 if (of_node_name_eq(parent, "dma")) {
122 p = parport_pc_probe_port(base, base + 0x400,
123 op->archdata.irqs[0], PARPORT_DMA_NOFIFO,
124 op->dev.parent->parent, 0);
125 if (!p)
126 return -ENOMEM;
127 dev_set_drvdata(&op->dev, p);
128 return 0;
129 }
130
131 for (slot = 0; slot < PARPORT_PC_MAX_PORTS; slot++) {
132 if (!test_and_set_bit(slot, dma_slot_map))
133 break;
134 }
135 err = -ENODEV;
136 if (slot >= PARPORT_PC_MAX_PORTS)
137 goto out_err;
138
139 spin_lock_init(&sparc_ebus_dmas[slot].info.lock);
140
141 d_len = (op->resource[2].end - d_base) + 1UL;
142 sparc_ebus_dmas[slot].info.regs =
143 of_ioremap(&op->resource[2], 0, d_len, "ECPP DMA");
144
145 if (!sparc_ebus_dmas[slot].info.regs)
146 goto out_clear_map;
147
148 sparc_ebus_dmas[slot].info.flags = 0;
149 sparc_ebus_dmas[slot].info.callback = NULL;
150 sparc_ebus_dmas[slot].info.client_cookie = NULL;
151 sparc_ebus_dmas[slot].info.irq = 0xdeadbeef;
152 strcpy(sparc_ebus_dmas[slot].info.name, "parport");
153 if (ebus_dma_register(&sparc_ebus_dmas[slot].info))
154 goto out_unmap_regs;
155
156 ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 1);
157
158 /* Configure IRQ to Push Pull, Level Low */
159 /* Enable ECP, set bit 2 of the CTR first */
160 outb(0x04, base + 0x02);
161 ns87303_modify(config, PCR,
162 PCR_EPP_ENABLE |
163 PCR_IRQ_ODRAIN,
164 PCR_ECP_ENABLE |
165 PCR_ECP_CLK_ENA |
166 PCR_IRQ_POLAR);
167
168 /* CTR bit 5 controls direction of port */
169 ns87303_modify(config, PTR,
170 0, PTR_LPT_REG_DIR);
171
172 p = parport_pc_probe_port(base, base + 0x400,
173 op->archdata.irqs[0],
174 slot,
175 op->dev.parent,
176 0);
177 err = -ENOMEM;
178 if (!p)
179 goto out_disable_irq;
180
181 dev_set_drvdata(&op->dev, p);
182
183 return 0;
184
185out_disable_irq:
186 ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
187 ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
188
189out_unmap_regs:
190 of_iounmap(&op->resource[2], sparc_ebus_dmas[slot].info.regs, d_len);
191
192out_clear_map:
193 clear_bit(slot, dma_slot_map);
194
195out_err:
196 return err;
197}
198
199static int ecpp_remove(struct platform_device *op)
200{
201 struct parport *p = dev_get_drvdata(&op->dev);
202 int slot = p->dma;
203
204 parport_pc_unregister_port(p);
205
206 if (slot != PARPORT_DMA_NOFIFO) {
207 unsigned long d_base = op->resource[2].start;
208 unsigned long d_len;
209
210 d_len = (op->resource[2].end - d_base) + 1UL;
211
212 ebus_dma_irq_enable(&sparc_ebus_dmas[slot].info, 0);
213 ebus_dma_unregister(&sparc_ebus_dmas[slot].info);
214 of_iounmap(&op->resource[2],
215 sparc_ebus_dmas[slot].info.regs,
216 d_len);
217 clear_bit(slot, dma_slot_map);
218 }
219
220 return 0;
221}
222
223static const struct of_device_id ecpp_match[] = {
224 {
225 .name = "ecpp",
226 },
227 {
228 .name = "parallel",
229 .compatible = "ecpp",
230 },
231 {
232 .name = "parallel",
233 .compatible = "ns87317-ecpp",
234 },
235 {
236 .name = "parallel",
237 .compatible = "pnpALI,1533,3",
238 },
239 {},
240};
241
242static struct platform_driver ecpp_driver = {
243 .driver = {
244 .name = "ecpp",
245 .of_match_table = ecpp_match,
246 },
247 .probe = ecpp_probe,
248 .remove = ecpp_remove,
249};
250
251static int parport_pc_find_nonpci_ports(int autoirq, int autodma)
252{
253 return platform_driver_register(&ecpp_driver);
254}
255
256#endif /* !(_ASM_SPARC64_PARPORT_H */
arch/sparc/include/asm/switch_to_64.h+1−1
@@ -15,7 +15,7 @@ do { \ · 14 unmodified lines
15 * for l0/l1. It will use one for 'next' and the other to hold15 * for l0/l1. It will use one for 'next' and the other to hold
16 * the output value of 'last'. 'next' is not referenced again16 * the output value of 'last'. 'next' is not referenced again
17 * past the invocation of switch_to in the scheduler, so we need17 * past the invocation of switch_to in the scheduler, so we need
18 * not preserve it's value. Hairy, but it lets us remove 2 loads18 * not preserve its value. Hairy, but it lets us remove 2 loads
19 * and 2 stores in this critical code path. -DaveM19 * and 2 stores in this critical code path. -DaveM
20 */20 */
21#define switch_to(prev, next, last) \21#define switch_to(prev, next, last) \
arch/sparc/kernel/btext.c+9−356
@@ -8,6 +8,7 @@ · 7 unmodified lines
8#include <linux/string.h>8#include <linux/string.h>
9#include <linux/init.h>9#include <linux/init.h>
10#include <linux/console.h>10#include <linux/console.h>
11#include <linux/font.h>
11 12
12#include <asm/btext.h>13#include <asm/btext.h>
13#include <asm/oplib.h>14#include <asm/oplib.h>
@@ -20,9 +21,9 @@ static void scrollscreen(void); · 6 unmodified lines
20#endif21#endif
21 22
22static void draw_byte(unsigned char c, long locX, long locY);23static void draw_byte(unsigned char c, long locX, long locY);
23static void draw_byte_32(unsigned char *bits, unsigned int *base, int rb);24static void draw_byte_32(const unsigned char *bits, unsigned int *base, int rb);
24static void draw_byte_16(unsigned char *bits, unsigned int *base, int rb);25static void draw_byte_16(const unsigned char *bits, unsigned int *base, int rb);
25static void draw_byte_8(unsigned char *bits, unsigned int *base, int rb);26static void draw_byte_8(const unsigned char *bits, unsigned int *base, int rb);
26 27
27#define __force_data __section(".data")28#define __force_data __section(".data")
28 29
@@ -36,10 +37,6 @@ static int dispDeviceDepth __force_data; · 7 unmodified lines
36static int dispDeviceRect[4] __force_data;37static int dispDeviceRect[4] __force_data;
37static unsigned char *dispDeviceBase __force_data;38static unsigned char *dispDeviceBase __force_data;
38 39
39#define cmapsz (16*256)
40
41static unsigned char vga_font[cmapsz];
42
43static int __init btext_initialize(phandle node)40static int __init btext_initialize(phandle node)
44{41{
45 unsigned int width, height, depth, pitch;42 unsigned int width, height, depth, pitch;
@@ -194,7 +191,8 @@ static void btext_drawtext(const char *c, unsigned int len) · 148 unmodified lines
194static void draw_byte(unsigned char c, long locX, long locY)191static void draw_byte(unsigned char c, long locX, long locY)
195{192{
196 unsigned char *base = calc_base(locX << 3, locY << 4);193 unsigned char *base = calc_base(locX << 3, locY << 4);
197 unsigned char *font = &vga_font[((unsigned int)c) * 16];194 unsigned int font_index = c * 16;
195 const unsigned char *font = font_sun_8x16.data + font_index;
198 int rb = dispDeviceRowBytes;196 int rb = dispDeviceRowBytes;
199 197
200 switch(dispDeviceDepth) {198 switch(dispDeviceDepth) {
@@ -239,7 +237,7 @@ static unsigned int expand_bits_16[4] = { · 38 unmodified lines
239};237};
240 238
241 239
242static void draw_byte_32(unsigned char *font, unsigned int *base, int rb)240static void draw_byte_32(const unsigned char *font, unsigned int *base, int rb)
243{241{
244 int l, bits;242 int l, bits;
245 int fg = 0xFFFFFFFFUL;243 int fg = 0xFFFFFFFFUL;
@@ -260,7 +258,7 @@ static void draw_byte_32(unsigned char *font, unsigned int *base, int rb) · 14 unmodified lines
260 }258 }
261}259}
262 260
263static void draw_byte_16(unsigned char *font, unsigned int *base, int rb)261static void draw_byte_16(const unsigned char *font, unsigned int *base, int rb)
264{262{
265 int l, bits;263 int l, bits;
266 int fg = 0xFFFFFFFFUL;264 int fg = 0xFFFFFFFFUL;
@@ -278,7 +276,7 @@ static void draw_byte_16(unsigned char *font, unsigned int *base, int rb) · 11 unmodified lines
278 }276 }
279}277}
280 278
281static void draw_byte_8(unsigned char *font, unsigned int *base, int rb)279static void draw_byte_8(const unsigned char *font, unsigned int *base, int rb)
282{280{
283 int l, bits;281 int l, bits;
284 int fg = 0x0F0F0F0FUL;282 int fg = 0x0F0F0F0FUL;
@@ -326,348 +324,3 @@ int __init btext_find_display(void) · 41 unmodified lines
326 }324 }
327 return ret;325 return ret;
328}326}
329
330static unsigned char vga_font[cmapsz] = {
3310x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3320x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd,
3330x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xff,
3340xdb, 0xff, 0xff, 0xc3, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
3350x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10,
3360x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe,
3370x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
3380x3c, 0x3c, 0xe7, 0xe7, 0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
3390x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x18, 0x18, 0x3c,
3400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
3410x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
3420xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
3430x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00,
3440x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
3450xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x1e, 0x0e,
3460x1a, 0x32, 0x78, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
3470x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18,
3480x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x33, 0x3f, 0x30, 0x30, 0x30,
3490x30, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x63,
3500x7f, 0x63, 0x63, 0x63, 0x63, 0x67, 0xe7, 0xe6, 0xc0, 0x00, 0x00, 0x00,
3510x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7, 0x3c, 0xdb, 0x18, 0x18,
3520x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xf8,
3530xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e,
3540x1e, 0x3e, 0xfe, 0x3e, 0x1e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
3550x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00,
3560x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
3570x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xdb,
3580xdb, 0xdb, 0x7b, 0x1b, 0x1b, 0x1b, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00,
3590x00, 0x7c, 0xc6, 0x60, 0x38, 0x6c, 0xc6, 0xc6, 0x6c, 0x38, 0x0c, 0xc6,
3600x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3610xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
3620x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
3630x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
3640x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
3650x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3660x00, 0x18, 0x0c, 0xfe, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3670x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xfe, 0x60, 0x30, 0x00, 0x00,
3680x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
3690xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3700x00, 0x24, 0x66, 0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3710x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 0x7c, 0xfe, 0xfe, 0x00,
3720x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c,
3730x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3740x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3750x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
3760x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00,
3770x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c,
3780x6c, 0xfe, 0x6c, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
3790x18, 0x18, 0x7c, 0xc6, 0xc2, 0xc0, 0x7c, 0x06, 0x06, 0x86, 0xc6, 0x7c,
3800x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x0c, 0x18,
3810x30, 0x60, 0xc6, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
3820x6c, 0x38, 0x76, 0xdc, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
3830x00, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3840x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30,
3850x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18,
3860x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
3870x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff, 0x3c, 0x66, 0x00, 0x00,
3880x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
3890x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3900x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00,
3910x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
3920x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3930x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
3940x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00,
3950x00, 0x00, 0x7c, 0xc6, 0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6, 0x7c,
3960x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18,
3970x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
3980x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00,
3990x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3c, 0x06, 0x06, 0x06, 0xc6, 0x7c,
4000x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x3c, 0x6c, 0xcc, 0xfe,
4010x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
4020xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
4030x00, 0x00, 0x38, 0x60, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
4040x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0x06, 0x06, 0x0c, 0x18,
4050x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
4060xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
4070x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x0c, 0x78,
4080x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00,
4090x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4100x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
4110x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x06,
4120x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
4130x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60,
4140x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
4150x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18,
4160x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xde, 0xde,
4170xde, 0xdc, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38,
4180x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
4190x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 0x66, 0x66, 0x66, 0xfc,
4200x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0,
4210xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x6c,
4220x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00,
4230x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x62, 0x66, 0xfe,
4240x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68,
4250x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
4260xc2, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00,
4270x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
4280x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
4290x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x0c,
4300x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
4310x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x66, 0xe6,
4320x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60,
4330x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xe7,
4340xff, 0xff, 0xdb, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
4350x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0xc6,
4360x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
4370xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66,
4380x66, 0x66, 0x7c, 0x60, 0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00,
4390x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xde, 0x7c,
4400x0c, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c,
4410x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
4420xc6, 0x60, 0x38, 0x0c, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
4430x00, 0x00, 0xff, 0xdb, 0x99, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
4440x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
4450xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3,
4460xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
4470x00, 0x00, 0xc3, 0xc3, 0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xff, 0x66, 0x66,
4480x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x18,
4490x3c, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3,
4500xc3, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
4510x00, 0x00, 0xff, 0xc3, 0x86, 0x0c, 0x18, 0x30, 0x60, 0xc1, 0xc3, 0xff,
4520x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30,
4530x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
4540xc0, 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00,
4550x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x3c,
4560x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00,
4570x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4580x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00,
4590x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4600x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c,
4610xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x60,
4620x60, 0x78, 0x6c, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00,
4630x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c,
4640x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc,
4650xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4660x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
4670x00, 0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xf0,
4680x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc,
4690xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00, 0x00, 0x00, 0xe0, 0x60,
4700x60, 0x6c, 0x76, 0x66, 0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00,
4710x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
4720x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06,
4730x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0xe0, 0x60,
4740x60, 0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00,
4750x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
4760x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0xff, 0xdb,
4770xdb, 0xdb, 0xdb, 0xdb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4780x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
4790x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
4800x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66,
4810x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
4820x00, 0x76, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00,
4830x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 0x60, 0x60, 0x60, 0xf0,
4840x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60,
4850x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30,
4860x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00,
4870x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
4880x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0xc3,
4890xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
4900x00, 0xc3, 0xc3, 0xc3, 0xdb, 0xdb, 0xff, 0x66, 0x00, 0x00, 0x00, 0x00,
4910x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3,
4920x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
4930xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
4940x00, 0xfe, 0xcc, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00,
4950x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18, 0x18, 0x18, 0x18, 0x0e,
4960x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18,
4970x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x18,
4980x18, 0x18, 0x0e, 0x18, 0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00,
4990x00, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5000x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6,
5010xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66,
5020xc2, 0xc0, 0xc0, 0xc0, 0xc2, 0x66, 0x3c, 0x0c, 0x06, 0x7c, 0x00, 0x00,
5030x00, 0x00, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
5040x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xfe,
5050xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c,
5060x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
5070x00, 0x00, 0xcc, 0x00, 0x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76,
5080x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0x78, 0x0c, 0x7c,
5090xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38,
5100x00, 0x78, 0x0c, 0x7c, 0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00,
5110x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x60, 0x60, 0x66, 0x3c, 0x0c, 0x06,
5120x3c, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe,
5130xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00,
5140x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
5150x00, 0x60, 0x30, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 0xc0, 0xc0, 0xc6, 0x7c,
5160x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x00, 0x00, 0x38, 0x18, 0x18,
5170x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66,
5180x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
5190x00, 0x60, 0x30, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
5200x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6,
5210xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38, 0x00,
5220x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
5230x18, 0x30, 0x60, 0x00, 0xfe, 0x66, 0x60, 0x7c, 0x60, 0x60, 0x66, 0xfe,
5240x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6e, 0x3b, 0x1b,
5250x7e, 0xd8, 0xdc, 0x77, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x6c,
5260xcc, 0xcc, 0xfe, 0xcc, 0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00,
5270x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
5280x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x00, 0x7c, 0xc6, 0xc6,
5290xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18,
5300x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
5310x00, 0x30, 0x78, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0x76,
5320x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x00, 0xcc, 0xcc, 0xcc,
5330xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00,
5340x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0x78, 0x00,
5350x00, 0xc6, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
5360x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
5370xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
5380xc3, 0xc0, 0xc0, 0xc0, 0xc3, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
5390x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 0x60, 0x60, 0xe6, 0xfc,
5400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0x66, 0x3c, 0x18, 0xff, 0x18,
5410xff, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x66, 0x66,
5420x7c, 0x62, 0x66, 0x6f, 0x66, 0x66, 0x66, 0xf3, 0x00, 0x00, 0x00, 0x00,
5430x00, 0x0e, 0x1b, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18,
5440xd8, 0x70, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x00, 0x78, 0x0c, 0x7c,
5450xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30,
5460x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
5470x00, 0x18, 0x30, 0x60, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
5480x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x60, 0x00, 0xcc, 0xcc, 0xcc,
5490xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc,
5500x00, 0xdc, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00,
5510x76, 0xdc, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 0xc6, 0xc6, 0xc6,
5520x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x3e, 0x00, 0x7e, 0x00,
5530x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c,
5540x38, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5550x00, 0x00, 0x30, 0x30, 0x00, 0x30, 0x30, 0x60, 0xc0, 0xc6, 0xc6, 0x7c,
5560x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
5570xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5580x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
5590x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30, 0x60, 0xce, 0x9b, 0x06,
5600x0c, 0x1f, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc2, 0xc6, 0xcc, 0x18, 0x30,
5610x66, 0xce, 0x96, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
5620x00, 0x18, 0x18, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
5630x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x00, 0x00,
5640x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36,
5650x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x44, 0x11, 0x44,
5660x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44,
5670x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa,
5680x55, 0xaa, 0x55, 0xaa, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77,
5690xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0x18, 0x18, 0x18, 0x18,
5700x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
5710x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18,
5720x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
5730x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
5740x36, 0x36, 0x36, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
5750x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x36, 0x36, 0x36, 0x36,
5760x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8,
5770x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36,
5780x36, 0xf6, 0x06, 0xf6, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
5790x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
5800x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0xf6,
5810x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
5820x36, 0xf6, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5830x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xfe, 0x00, 0x00, 0x00, 0x00,
5840x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8,
5850x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5860x00, 0x00, 0x00, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
5870x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00,
5880x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
5890x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5900x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
5910x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
5920x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
5930x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
5940x18, 0x18, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
5950x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
5960x18, 0x18, 0x18, 0x18, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37,
5970x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
5980x36, 0x37, 0x30, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5990x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
6000x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xff,
6010x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6020x00, 0xff, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
6030x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x37, 0x36, 0x36, 0x36, 0x36,
6040x36, 0x36, 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff,
6050x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36,
6060x36, 0xf7, 0x00, 0xf7, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
6070x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00,
6080x00, 0x00, 0x00, 0x00, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff,
6090x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6100x00, 0xff, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
6110x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x36, 0x36, 0x36, 0x36,
6120x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3f,
6130x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
6140x18, 0x1f, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6150x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
6160x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
6170x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
6180x36, 0x36, 0x36, 0xff, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36,
6190x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff, 0x18, 0x18, 0x18, 0x18,
6200x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
6210x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6220x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
6230xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
6240xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
6250xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0,
6260xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
6270x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
6280x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
6290x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6300x00, 0x76, 0xdc, 0xd8, 0xd8, 0xd8, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00,
6310x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xd8, 0xcc, 0xc6, 0xc6, 0xc6, 0xcc,
6320x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0,
6330xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6340xfe, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
6350x00, 0x00, 0x00, 0xfe, 0xc6, 0x60, 0x30, 0x18, 0x30, 0x60, 0xc6, 0xfe,
6360x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xd8, 0xd8,
6370xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6380x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xc0, 0x00, 0x00, 0x00,
6390x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
6400x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66,
6410x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38,
6420x6c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00,
6430x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x6c, 0xee,
6440x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x18, 0x0c, 0x3e, 0x66,
6450x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6460x00, 0x7e, 0xdb, 0xdb, 0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6470x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 0xf3, 0x7e, 0x60, 0xc0,
6480x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60,
6490x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
6500xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
6510x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00,
6520x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18,
6530x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30,
6540x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
6550x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e,
6560x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1b, 0x1b, 0x1b, 0x18, 0x18,
6570x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
6580x18, 0x18, 0x18, 0x18, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00,
6590x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00,
6600x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00,
6610x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c,
6620x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6630x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00,
6640x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6650x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0c, 0x0c,
6660x0c, 0x0c, 0x0c, 0xec, 0x6c, 0x6c, 0x3c, 0x1c, 0x00, 0x00, 0x00, 0x00,
6670x00, 0xd8, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00,
6680x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd8, 0x30, 0x60, 0xc8, 0xf8, 0x00,
6690x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6700x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
6710x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
6720x00, 0x00, 0x00, 0x00,
673};
arch/sparc/kernel/irq_32.c+3−3
@@ -268,11 +268,11 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler) · 267 unmodified lines
268 if (sparc_cpu_model != sparc_leon) {268 if (sparc_cpu_model != sparc_leon) {
269 struct tt_entry *trap_table;269 struct tt_entry *trap_table;
270 270
271 trap_table = &trapbase_cpu1;271 trap_table = &trapbase_cpu1[0];
272 INSTANTIATE(trap_table)272 INSTANTIATE(trap_table)
273 trap_table = &trapbase_cpu2;273 trap_table = &trapbase_cpu2[0];
274 INSTANTIATE(trap_table)274 INSTANTIATE(trap_table)
275 trap_table = &trapbase_cpu3;275 trap_table = &trapbase_cpu3[0];
276 INSTANTIATE(trap_table)276 INSTANTIATE(trap_table)
277 }277 }
278#endif278#endif
arch/sparc/kernel/irq_64.c+1−1
@@ -980,7 +980,7 @@ void notrace init_irqwork_curcpu(void) · 979 unmodified lines
980 *980 *
981 * On SMP this gets invoked from the CPU trampoline before981 * On SMP this gets invoked from the CPU trampoline before
982 * the cpu has fully taken over the trap table from OBP,982 * the cpu has fully taken over the trap table from OBP,
983 * and it's kernel stack + %g6 thread register state is983 * and its kernel stack + %g6 thread register state is
984 * not fully cooked yet.984 * not fully cooked yet.
985 *985 *
986 * Therefore you cannot make any OBP calls, not even prom_printf,986 * Therefore you cannot make any OBP calls, not even prom_printf,
arch/sparc/kernel/kernel.h+4−4
@@ -138,10 +138,10 @@ extern unsigned int t_nmi[]; · 137 unmodified lines
138extern unsigned int linux_trap_ipi15_sun4d[];138extern unsigned int linux_trap_ipi15_sun4d[];
139extern unsigned int linux_trap_ipi15_sun4m[];139extern unsigned int linux_trap_ipi15_sun4m[];
140 140
141extern struct tt_entry trapbase;141extern struct tt_entry trapbase[];
142extern struct tt_entry trapbase_cpu1;142extern struct tt_entry trapbase_cpu1[];
143extern struct tt_entry trapbase_cpu2;143extern struct tt_entry trapbase_cpu2[];
144extern struct tt_entry trapbase_cpu3;144extern struct tt_entry trapbase_cpu3[];
145 145
146extern char cputypval[];146extern char cputypval[];
147 147
arch/sparc/kernel/kgdb_32.c+2−2
@@ -37,7 +37,7 @@ void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs) · 36 unmodified lines
37 gdb_regs[GDB_Y] = regs->y;37 gdb_regs[GDB_Y] = regs->y;
38 gdb_regs[GDB_PSR] = regs->psr;38 gdb_regs[GDB_PSR] = regs->psr;
39 gdb_regs[GDB_WIM] = 0;39 gdb_regs[GDB_WIM] = 0;
40 gdb_regs[GDB_TBR] = (unsigned long) &trapbase;40 gdb_regs[GDB_TBR] = (unsigned long) &trapbase[0];
41 gdb_regs[GDB_PC] = regs->pc;41 gdb_regs[GDB_PC] = regs->pc;
42 gdb_regs[GDB_NPC] = regs->npc;42 gdb_regs[GDB_NPC] = regs->npc;
43 gdb_regs[GDB_FSR] = 0;43 gdb_regs[GDB_FSR] = 0;
@@ -72,7 +72,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p) · 28 unmodified lines
72 72
73 gdb_regs[GDB_PSR] = t->kpsr;73 gdb_regs[GDB_PSR] = t->kpsr;
74 gdb_regs[GDB_WIM] = t->kwim;74 gdb_regs[GDB_WIM] = t->kwim;
75 gdb_regs[GDB_TBR] = (unsigned long) &trapbase;75 gdb_regs[GDB_TBR] = (unsigned long) &trapbase[0];
76 gdb_regs[GDB_PC] = t->kpc;76 gdb_regs[GDB_PC] = t->kpc;
77 gdb_regs[GDB_NPC] = t->kpc + 4;77 gdb_regs[GDB_NPC] = t->kpc + 4;
78 gdb_regs[GDB_FSR] = 0;78 gdb_regs[GDB_FSR] = 0;
arch/sparc/kernel/kprobes.c+1−1
@@ -230,7 +230,7 @@ static unsigned long __kprobes relbranch_fixup(u32 insn, struct kprobe *p, · 229 unmodified lines
230 return regs->tnpc;230 return regs->tnpc;
231}231}
232 232
233/* If INSN is an instruction which writes it's PC location233/* If INSN is an instruction which writes its PC location
234 * into a destination register, fix that up.234 * into a destination register, fix that up.
235 */235 */
236static void __kprobes retpc_fixup(struct pt_regs *regs, u32 insn,236static void __kprobes retpc_fixup(struct pt_regs *regs, u32 insn,
arch/sparc/kernel/ldc.c+1−1
@@ -1854,7 +1854,7 @@ static int read_nonraw(struct ldc_channel *lp, void *buf, unsigned int size) · 1853 unmodified lines
1854 * This seems the best behavior because this allows1854 * This seems the best behavior because this allows
1855 * a user of the LDC layer to start with a small1855 * a user of the LDC layer to start with a small
1856 * RX buffer for ldc_read() calls and use -EMSGSIZE1856 * RX buffer for ldc_read() calls and use -EMSGSIZE
1857 * as a cue to enlarge it's read buffer.1857 * as a cue to enlarge its read buffer.
1858 */1858 */
1859 err = -EMSGSIZE;1859 err = -EMSGSIZE;
1860 break;1860 break;
arch/sparc/kernel/leon_pci_grpci1.c+1−1
@@ -697,7 +697,7 @@ err1: · 696 unmodified lines
697 return err;697 return err;
698}698}
699 699
700static const struct of_device_id grpci1_of_match[] __initconst = {700static const struct of_device_id grpci1_of_match[] = {
701 {701 {
702 .name = "GAISLER_PCIFBRG",702 .name = "GAISLER_PCIFBRG",
703 },703 },
arch/sparc/kernel/leon_pci_grpci2.c+2−2
@@ -586,7 +586,7 @@ static void grpci2_hw_init(struct grpci2_priv *priv) · 585 unmodified lines
586 REGSTORE(regs->io_map, REGLOAD(regs->io_map) & 0x0000ffff);586 REGSTORE(regs->io_map, REGLOAD(regs->io_map) & 0x0000ffff);
587 587
588 /* set 1:1 mapping between AHB -> PCI memory space, for all Masters588 /* set 1:1 mapping between AHB -> PCI memory space, for all Masters
589 * Each AHB master has it's own mapping registers. Max 16 AHB masters.589 * Each AHB master has its own mapping registers. Max 16 AHB masters.
590 */590 */
591 for (i = 0; i < 16; i++)591 for (i = 0; i < 16; i++)
592 REGSTORE(regs->ahbmst_map[i], priv->pci_area);592 REGSTORE(regs->ahbmst_map[i], priv->pci_area);
@@ -889,7 +889,7 @@ err1: · 296 unmodified lines
889 return err;889 return err;
890}890}
891 891
892static const struct of_device_id grpci2_of_match[] __initconst = {892static const struct of_device_id grpci2_of_match[] = {
893 {893 {
894 .name = "GAISLER_GRPCI2",894 .name = "GAISLER_GRPCI2",
895 },895 },
arch/sparc/kernel/leon_smp.c+3−3
@@ -245,13 +245,13 @@ void __init leon_smp_done(void) · 244 unmodified lines
245 245
246 /* Free unneeded trap tables */246 /* Free unneeded trap tables */
247 if (!cpu_present(1)) {247 if (!cpu_present(1)) {
248 free_reserved_page(virt_to_page(&trapbase_cpu1));248 free_reserved_page(virt_to_page(&trapbase_cpu1[0]));
249 }249 }
250 if (!cpu_present(2)) {250 if (!cpu_present(2)) {
251 free_reserved_page(virt_to_page(&trapbase_cpu2));251 free_reserved_page(virt_to_page(&trapbase_cpu2[0]));
252 }252 }
253 if (!cpu_present(3)) {253 if (!cpu_present(3)) {
254 free_reserved_page(virt_to_page(&trapbase_cpu3));254 free_reserved_page(virt_to_page(&trapbase_cpu3[0]));
255 }255 }
256 /* Ok, they are spinning and ready to go. */256 /* Ok, they are spinning and ready to go. */
257 smp_processors_ready = 1;257 smp_processors_ready = 1;
arch/sparc/kernel/nmi.c+1−1
@@ -279,7 +279,7 @@ static int __init setup_nmi_watchdog(char *str) · 278 unmodified lines
279 if (!strncmp(str, "panic", 5))279 if (!strncmp(str, "panic", 5))
280 panic_on_timeout = 1;280 panic_on_timeout = 1;
281 281
282 return 0;282 return 1;
283}283}
284__setup("nmi_watchdog=", setup_nmi_watchdog);284__setup("nmi_watchdog=", setup_nmi_watchdog);
285 285
arch/sparc/kernel/of_device_64.c+1−1
@@ -560,7 +560,7 @@ static unsigned int __init build_one_device_irq(struct platform_device *op, · 559 unmodified lines
560 *560 *
561 * If we hit a bus type or situation we cannot handle, we561 * If we hit a bus type or situation we cannot handle, we
562 * stop and assume that the original IRQ number was in a562 * stop and assume that the original IRQ number was in a
563 * format which has special meaning to it's immediate parent.563 * format which has special meaning to its immediate parent.
564 */564 */
565 pp = dp->parent;565 pp = dp->parent;
566 ip = NULL;566 ip = NULL;
arch/sparc/kernel/pci.c+1−1
@@ -311,7 +311,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, · 310 unmodified lines
311 /* We can't actually use the firmware value, we have311 /* We can't actually use the firmware value, we have
312 * to read what is in the register right now. One312 * to read what is in the register right now. One
313 * reason is that in the case of IDE interfaces the313 * reason is that in the case of IDE interfaces the
314 * firmware can sample the value before the the IDE314 * firmware can sample the value before the IDE
315 * interface is programmed into native mode.315 * interface is programmed into native mode.
316 */316 */
317 pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);317 pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
arch/sparc/kernel/pci_impl.h+2−2
@@ -19,9 +19,9 @@ · 18 unmodified lines
19 * each with one (Sabre) or two (PSYCHO/SCHIZO) PCI bus modules19 * each with one (Sabre) or two (PSYCHO/SCHIZO) PCI bus modules
20 * underneath. Each PCI bus module uses an IOMMU (shared by both20 * underneath. Each PCI bus module uses an IOMMU (shared by both
21 * PBMs of a controller, or per-PBM), and if a streaming buffer21 * PBMs of a controller, or per-PBM), and if a streaming buffer
22 * is present, each PCI bus module has it's own. (ie. the IOMMU22 * is present, each PCI bus module has its own. (ie. the IOMMU
23 * might be shared between PBMs, the STC is never shared)23 * might be shared between PBMs, the STC is never shared)
24 * Furthermore, each PCI bus module controls it's own autonomous24 * Furthermore, each PCI bus module controls its own autonomous
25 * PCI bus.25 * PCI bus.
26 */26 */
27 27
arch/sparc/kernel/pci_schizo.c+2−2
@@ -145,7 +145,7 @@ static void __schizo_check_stc_error_pbm(struct pci_pbm_info *pbm, · 144 unmodified lines
145 145
146 /* This is __REALLY__ dangerous. When we put the146 /* This is __REALLY__ dangerous. When we put the
147 * streaming buffer into diagnostic mode to probe147 * streaming buffer into diagnostic mode to probe
148 * it's tags and error status, we _must_ clear all148 * its tags and error status, we _must_ clear all
149 * of the line tag valid bits before re-enabling149 * of the line tag valid bits before re-enabling
150 * the streaming buffer. If any dirty data lives150 * the streaming buffer. If any dirty data lives
151 * in the STC when we do this, we will end up151 * in the STC when we do this, we will end up
@@ -275,7 +275,7 @@ static void schizo_check_iommu_error_pbm(struct pci_pbm_info *pbm, · 123 unmodified lines
275 pbm->name, type_string);275 pbm->name, type_string);
276 276
277 /* Put the IOMMU into diagnostic mode and probe277 /* Put the IOMMU into diagnostic mode and probe
278 * it's TLB for entries with error status.278 * its TLB for entries with error status.
279 *279 *
280 * It is very possible for another DVMA to occur280 * It is very possible for another DVMA to occur
281 * while we do this probe, and corrupt the system281 * while we do this probe, and corrupt the system
arch/sparc/kernel/perf_event.c+1−1
@@ -979,7 +979,7 @@ out: · 978 unmodified lines
979 979
980static void sparc_pmu_start(struct perf_event *event, int flags);980static void sparc_pmu_start(struct perf_event *event, int flags);
981 981
982/* On this PMU each PIC has it's own PCR control register. */982/* On this PMU each PIC has its own PCR control register. */
983static void calculate_multiple_pcrs(struct cpu_hw_events *cpuc)983static void calculate_multiple_pcrs(struct cpu_hw_events *cpuc)
984{984{
985 int i;985 int i;
arch/sparc/kernel/prom_irqtrans.c+1−1
@@ -394,7 +394,7 @@ static unsigned int schizo_irq_build(struct device_node *dp, · 393 unmodified lines
394 iclr = schizo_ino_to_iclr(pbm_regs, ino);394 iclr = schizo_ino_to_iclr(pbm_regs, ino);
395 395
396 /* On Schizo, no inofixup occurs. This is because each396 /* On Schizo, no inofixup occurs. This is because each
397 * INO has it's own IMAP register. On Psycho and Sabre397 * INO has its own IMAP register. On Psycho and Sabre
398 * there is only one IMAP register for each PCI slot even398 * there is only one IMAP register for each PCI slot even
399 * though four different INOs can be generated by each399 * though four different INOs can be generated by each
400 * PCI slot.400 * PCI slot.
arch/sparc/kernel/psycho_common.c+1−1
@@ -50,7 +50,7 @@ static void psycho_check_stc_error(struct pci_pbm_info *pbm) · 49 unmodified lines
50 spin_lock(&stc_buf_lock);50 spin_lock(&stc_buf_lock);
51 51
52 /* This is __REALLY__ dangerous. When we put the streaming52 /* This is __REALLY__ dangerous. When we put the streaming
53 * buffer into diagnostic mode to probe it's tags and error53 * buffer into diagnostic mode to probe its tags and error
54 * status, we _must_ clear all of the line tag valid bits54 * status, we _must_ clear all of the line tag valid bits
55 * before re-enabling the streaming buffer. If any dirty data55 * before re-enabling the streaming buffer. If any dirty data
56 * lives in the STC when we do this, we will end up56 * lives in the STC when we do this, we will end up
arch/sparc/kernel/setup_32.c+2−2
@@ -67,7 +67,7 @@ static void prom_sync_me(void) · 66 unmodified lines
67 __asm__ __volatile__("wr %0, 0x0, %%tbr\n\t"67 __asm__ __volatile__("wr %0, 0x0, %%tbr\n\t"
68 "nop\n\t"68 "nop\n\t"
69 "nop\n\t"69 "nop\n\t"
70 "nop\n\t" : : "r" (&trapbase));70 "nop\n\t" : : "r" (&trapbase[0]));
71 71
72 prom_printf("PROM SYNC COMMAND...\n");72 prom_printf("PROM SYNC COMMAND...\n");
73 show_mem();73 show_mem();
@@ -285,7 +285,7 @@ void __init setup_arch(char **cmdline_p) · 211 unmodified lines
285 int i;285 int i;
286 unsigned long highest_paddr;286 unsigned long highest_paddr;
287 287
288 sparc_ttable = &trapbase;288 sparc_ttable = &trapbase[0];
289 289
290 /* Initialize PROM console and command line. */290 /* Initialize PROM console and command line. */
291 *cmdline_p = prom_getbootargs();291 *cmdline_p = prom_getbootargs();
arch/sparc/kernel/signal_32.c+1−1
@@ -473,7 +473,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) · 472 unmodified lines
473 *473 *
474 * %g7 is used as the "thread register". %g6 is not used in474 * %g7 is used as the "thread register". %g6 is not used in
475 * any fixed manner. %g6 is used as a scratch register and475 * any fixed manner. %g6 is used as a scratch register and
476 * a compiler temporary, but it's value is never used across476 * a compiler temporary, but its value is never used across
477 * a system call. Therefore %g6 is usable for orig_i0 storage.477 * a system call. Therefore %g6 is usable for orig_i0 storage.
478 */478 */
479 if (pt_regs_is_syscall(regs) && (regs->psr & PSR_C))479 if (pt_regs_is_syscall(regs) && (regs->psr & PSR_C))
arch/sparc/kernel/signal_64.c+1−1
@@ -494,7 +494,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) · 493 unmodified lines
494 *494 *
495 * %g7 is used as the "thread register". %g6 is not used in495 * %g7 is used as the "thread register". %g6 is not used in
496 * any fixed manner. %g6 is used as a scratch register and496 * any fixed manner. %g6 is used as a scratch register and
497 * a compiler temporary, but it's value is never used across497 * a compiler temporary, but its value is never used across
498 * a system call. Therefore %g6 is usable for orig_i0 storage.498 * a system call. Therefore %g6 is usable for orig_i0 storage.
499 */499 */
500 if (pt_regs_is_syscall(regs) &&500 if (pt_regs_is_syscall(regs) &&
arch/sparc/kernel/vio.c+1−1
@@ -149,7 +149,7 @@ static struct attribute *vio_dev_attrs[] = { · 148 unmodified lines
149 };149 };
150ATTRIBUTE_GROUPS(vio_dev);150ATTRIBUTE_GROUPS(vio_dev);
151 151
152static struct bus_type vio_bus_type = {152static const struct bus_type vio_bus_type = {
153 .name = "vio",153 .name = "vio",
154 .dev_groups = vio_dev_groups,154 .dev_groups = vio_dev_groups,
155 .uevent = vio_hotplug,155 .uevent = vio_hotplug,
arch/sparc/lib/Makefile+2−2
@@ -14,7 +14,7 @@ lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o · 13 unmodified lines
14lib-$(CONFIG_SPARC32) += copy_user.o locks.o14lib-$(CONFIG_SPARC32) += copy_user.o locks.o
15lib-$(CONFIG_SPARC64) += atomic_64.o15lib-$(CONFIG_SPARC64) += atomic_64.o
16lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o16lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o
17lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o17lib-$(CONFIG_SPARC32) += muldi3.o bitext.o
18lib-$(CONFIG_SPARC64) += multi3.o18lib-$(CONFIG_SPARC64) += multi3.o
19lib-$(CONFIG_SPARC64) += fls.o19lib-$(CONFIG_SPARC64) += fls.o
20lib-$(CONFIG_SPARC64) += fls64.o20lib-$(CONFIG_SPARC64) += fls64.o
@@ -51,5 +51,5 @@ lib-$(CONFIG_SPARC64) += copy_in_user.o memmove.o · 30 unmodified lines
51lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o51lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o
52 52
53obj-$(CONFIG_SPARC64) += iomap.o53obj-$(CONFIG_SPARC64) += iomap.o
54obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o54obj-$(CONFIG_SPARC32) += atomic32.o
55obj-$(CONFIG_SPARC64) += PeeCeeI.o55obj-$(CONFIG_SPARC64) += PeeCeeI.o
arch/sparc/lib/cmpdi2.c+0−28
@@ -1,28 +0,0 @@
1// SPDX-License-Identifier: GPL-2.0
2#include <linux/module.h>
3
4#include "libgcc.h"
5
6word_type __cmpdi2(long long a, long long b)
7{
8 const DWunion au = {
9 .ll = a
10 };
11 const DWunion bu = {
12 .ll = b
13 };
14
15 if (au.s.high < bu.s.high)
16 return 0;
17 else if (au.s.high > bu.s.high)
18 return 2;
19
20 if ((unsigned int) au.s.low < (unsigned int) bu.s.low)
21 return 0;
22 else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)
23 return 2;
24
25 return 1;
26}
27
28EXPORT_SYMBOL(__cmpdi2);
arch/sparc/lib/ucmpdi2.c+0−20
@@ -1,20 +0,0 @@
1// SPDX-License-Identifier: GPL-2.0
2#include <linux/module.h>
3#include "libgcc.h"
4
5word_type __ucmpdi2(unsigned long long a, unsigned long long b)
6{
7 const DWunion au = {.ll = a};
8 const DWunion bu = {.ll = b};
9
10 if ((unsigned int) au.s.high < (unsigned int) bu.s.high)
11 return 0;
12 else if ((unsigned int) au.s.high > (unsigned int) bu.s.high)
13 return 2;
14 if ((unsigned int) au.s.low < (unsigned int) bu.s.low)
15 return 0;
16 else if ((unsigned int) au.s.low > (unsigned int) bu.s.low)
17 return 2;
18 return 1;
19}
20EXPORT_SYMBOL(__ucmpdi2);
arch/sparc/mm/srmmu.c+1−1
@@ -1513,7 +1513,7 @@ static void __init init_viking(void) · 1512 unmodified lines
1513 1513
1514 /*1514 /*
1515 * We need this to make sure old viking takes no hits1515 * We need this to make sure old viking takes no hits
1516 * on it's cache for dma snoops to workaround the1516 * on its cache for dma snoops to workaround the
1517 * "load from non-cacheable memory" interrupt bug.1517 * "load from non-cacheable memory" interrupt bug.
1518 * This is only necessary because of the new way in1518 * This is only necessary because of the new way in
1519 * which we use the IOMMU.1519 * which we use the IOMMU.
arch/sparc/mm/tsb.c+1−1
@@ -385,7 +385,7 @@ static unsigned long tsb_size_to_rss_limit(unsigned long new_size) · 384 unmodified lines
385 * will not trigger any longer.385 * will not trigger any longer.
386 *386 *
387 * The TSB can be anywhere from 8K to 1MB in size, in increasing powers387 * The TSB can be anywhere from 8K to 1MB in size, in increasing powers
388 * of two. The TSB must be aligned to it's size, so f.e. a 512K TSB388 * of two. The TSB must be aligned to its size, so f.e. a 512K TSB
389 * must be 512K aligned. It also must be physically contiguous, so we389 * must be 512K aligned. It also must be physically contiguous, so we
390 * cannot use vmalloc().390 * cannot use vmalloc().
391 *391 *
arch/sparc/net/bpf_jit_comp_32.c+3−3
@@ -300,7 +300,7 @@ do { *prog++ = BR_OPC | WDISP22(OFF); \ · 299 unmodified lines
300 *300 *
301 * The most common case is to emit a branch at the end of such301 * The most common case is to emit a branch at the end of such
302 * a code sequence. So this would be two instructions, the302 * a code sequence. So this would be two instructions, the
303 * branch and it's delay slot.303 * branch and its delay slot.
304 *304 *
305 * Therefore by default the branch emitters calculate the branch305 * Therefore by default the branch emitters calculate the branch
306 * offset field as:306 * offset field as:
@@ -309,13 +309,13 @@ do { *prog++ = BR_OPC | WDISP22(OFF); \ · 2 unmodified lines
309 *309 *
310 * This "addrs[i] - 8" is the address of the branch itself or310 * This "addrs[i] - 8" is the address of the branch itself or
311 * what "." would be in assembler notation. The "8" part is311 * what "." would be in assembler notation. The "8" part is
312 * how we take into consideration the branch and it's delay312 * how we take into consideration the branch and its delay
313 * slot mentioned above.313 * slot mentioned above.
314 *314 *
315 * Sometimes we need to emit a branch earlier in the code315 * Sometimes we need to emit a branch earlier in the code
316 * sequence. And in these situations we adjust "destination"316 * sequence. And in these situations we adjust "destination"
317 * to accommodate this difference. For example, if we needed317 * to accommodate this difference. For example, if we needed
318 * to emit a branch (and it's delay slot) right before the318 * to emit a branch (and its delay slot) right before the
319 * final instruction emitted for a BPF opcode, we'd use319 * final instruction emitted for a BPF opcode, we'd use
320 * "destination + 4" instead of just plain "destination" above.320 * "destination + 4" instead of just plain "destination" above.
321 *321 *
arch/sparc/vdso/vma.c+3−4
@@ -449,9 +449,8 @@ static __init int vdso_setup(char *s) · 448 unmodified lines
449 unsigned long val;449 unsigned long val;
450 450
451 err = kstrtoul(s, 10, &val);451 err = kstrtoul(s, 10, &val);
452 if (err)452 if (!err)
453 return err;453 vdso_enabled = val;
454 vdso_enabled = val;454 return 1;
455 return 0;
456}455}
457__setup("vdso=", vdso_setup);456__setup("vdso=", vdso_setup);
drivers/mtd/maps/sun_uflash.c+1−1
@@ -47,7 +47,7 @@ struct map_info uflash_map_templ = { · 46 unmodified lines
47 .bankwidth = UFLASH_BUSWIDTH,47 .bankwidth = UFLASH_BUSWIDTH,
48};48};
49 49
50int uflash_devinit(struct platform_device *op, struct device_node *dp)50static int uflash_devinit(struct platform_device *op, struct device_node *dp)
51{51{
52 struct uflash_dev *up;52 struct uflash_dev *up;
53 53
drivers/sbus/char/bbc_i2c.c+2−7
@@ -358,9 +358,6 @@ fail: · 357 unmodified lines
358 return NULL;358 return NULL;
359}359}
360 360
361extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
362extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
363
364static int bbc_i2c_probe(struct platform_device *op)361static int bbc_i2c_probe(struct platform_device *op)
365{362{
366 struct bbc_i2c_bus *bp;363 struct bbc_i2c_bus *bp;
@@ -385,7 +382,7 @@ static int bbc_i2c_probe(struct platform_device *op) · 18 unmodified lines
385 return err;382 return err;
386}383}
387 384
388static int bbc_i2c_remove(struct platform_device *op)385static void bbc_i2c_remove(struct platform_device *op)
389{386{
390 struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);387 struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);
391 388
@@ -399,8 +396,6 @@ static int bbc_i2c_remove(struct platform_device *op) · 7 unmodified lines
399 of_iounmap(&op->resource[1], bp->i2c_control_regs, 2);396 of_iounmap(&op->resource[1], bp->i2c_control_regs, 2);
400 397
401 kfree(bp);398 kfree(bp);
402
403 return 0;
404}399}
405 400
406static const struct of_device_id bbc_i2c_match[] = {401static const struct of_device_id bbc_i2c_match[] = {
@@ -418,7 +413,7 @@ static struct platform_driver bbc_i2c_driver = { · 11 unmodified lines
418 .of_match_table = bbc_i2c_match,413 .of_match_table = bbc_i2c_match,
419 },414 },
420 .probe = bbc_i2c_probe,415 .probe = bbc_i2c_probe,
421 .remove = bbc_i2c_remove,416 .remove_new = bbc_i2c_remove,
422};417};
423 418
424module_platform_driver(bbc_i2c_driver);419module_platform_driver(bbc_i2c_driver);
drivers/sbus/char/bbc_i2c.h+3−0
@@ -82,4 +82,7 @@ extern int bbc_i2c_readb(struct bbc_i2c_client *, unsigned char *byte, int off); · 81 unmodified lines
82extern int bbc_i2c_write_buf(struct bbc_i2c_client *, char *buf, int len, int off);82extern int bbc_i2c_write_buf(struct bbc_i2c_client *, char *buf, int len, int off);
83extern int bbc_i2c_read_buf(struct bbc_i2c_client *, char *buf, int len, int off);83extern int bbc_i2c_read_buf(struct bbc_i2c_client *, char *buf, int len, int off);
84 84
85extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
86extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
87
85#endif /* _BBC_I2C_H */88#endif /* _BBC_I2C_H */
drivers/sbus/char/display7seg.c+2−4
@@ -229,7 +229,7 @@ out_iounmap: · 228 unmodified lines
229 goto out;229 goto out;
230}230}
231 231
232static int d7s_remove(struct platform_device *op)232static void d7s_remove(struct platform_device *op)
233{233{
234 struct d7s *p = dev_get_drvdata(&op->dev);234 struct d7s *p = dev_get_drvdata(&op->dev);
235 u8 regs = readb(p->regs);235 u8 regs = readb(p->regs);
@@ -245,8 +245,6 @@ static int d7s_remove(struct platform_device *op) · 9 unmodified lines
245 245
246 misc_deregister(&d7s_miscdev);246 misc_deregister(&d7s_miscdev);
247 of_iounmap(&op->resource[0], p->regs, sizeof(u8));247 of_iounmap(&op->resource[0], p->regs, sizeof(u8));
248
249 return 0;
250}248}
251 249
252static const struct of_device_id d7s_match[] = {250static const struct of_device_id d7s_match[] = {
@@ -263,7 +261,7 @@ static struct platform_driver d7s_driver = { · 10 unmodified lines
263 .of_match_table = d7s_match,261 .of_match_table = d7s_match,
264 },262 },
265 .probe = d7s_probe,263 .probe = d7s_probe,
266 .remove = d7s_remove,264 .remove_new = d7s_remove,
267};265};
268 266
269module_platform_driver(d7s_driver);267module_platform_driver(d7s_driver);
drivers/sbus/char/envctrl.c+2−4
@@ -1097,7 +1097,7 @@ out_iounmap: · 1096 unmodified lines
1097 return err;1097 return err;
1098}1098}
1099 1099
1100static int envctrl_remove(struct platform_device *op)1100static void envctrl_remove(struct platform_device *op)
1101{1101{
1102 int index;1102 int index;
1103 1103
@@ -1108,8 +1108,6 @@ static int envctrl_remove(struct platform_device *op) · 4 unmodified lines
1108 1108
1109 for (index = 0; index < ENVCTRL_MAX_CPU * 2; index++)1109 for (index = 0; index < ENVCTRL_MAX_CPU * 2; index++)
1110 kfree(i2c_childlist[index].tables);1110 kfree(i2c_childlist[index].tables);
1111
1112 return 0;
1113}1111}
1114 1112
1115static const struct of_device_id envctrl_match[] = {1113static const struct of_device_id envctrl_match[] = {
@@ -1127,7 +1125,7 @@ static struct platform_driver envctrl_driver = { · 11 unmodified lines
1127 .of_match_table = envctrl_match,1125 .of_match_table = envctrl_match,
1128 },1126 },
1129 .probe = envctrl_probe,1127 .probe = envctrl_probe,
1130 .remove = envctrl_remove,1128 .remove_new = envctrl_remove,
1131};1129};
1132 1130
1133module_platform_driver(envctrl_driver);1131module_platform_driver(envctrl_driver);
drivers/sbus/char/flash.c+2−4
@@ -187,11 +187,9 @@ static int flash_probe(struct platform_device *op) · 186 unmodified lines
187 return misc_register(&flash_dev);187 return misc_register(&flash_dev);
188}188}
189 189
190static int flash_remove(struct platform_device *op)190static void flash_remove(struct platform_device *op)
191{191{
192 misc_deregister(&flash_dev);192 misc_deregister(&flash_dev);
193
194 return 0;
195}193}
196 194
197static const struct of_device_id flash_match[] = {195static const struct of_device_id flash_match[] = {
@@ -208,7 +206,7 @@ static struct platform_driver flash_driver = { · 10 unmodified lines
208 .of_match_table = flash_match,206 .of_match_table = flash_match,
209 },207 },
210 .probe = flash_probe,208 .probe = flash_probe,
211 .remove = flash_remove,209 .remove_new = flash_remove,
212};210};
213 211
214module_platform_driver(flash_driver);212module_platform_driver(flash_driver);
drivers/sbus/char/uctrl.c+2−3
@@ -399,7 +399,7 @@ out_free: · 398 unmodified lines
399 goto out;399 goto out;
400}400}
401 401
402static int uctrl_remove(struct platform_device *op)402static void uctrl_remove(struct platform_device *op)
403{403{
404 struct uctrl_driver *p = dev_get_drvdata(&op->dev);404 struct uctrl_driver *p = dev_get_drvdata(&op->dev);
405 405
@@ -409,7 +409,6 @@ static int uctrl_remove(struct platform_device *op) · 3 unmodified lines
409 of_iounmap(&op->resource[0], p->regs, resource_size(&op->resource[0]));409 of_iounmap(&op->resource[0], p->regs, resource_size(&op->resource[0]));
410 kfree(p);410 kfree(p);
411 }411 }
412 return 0;
413}412}
414 413
415static const struct of_device_id uctrl_match[] = {414static const struct of_device_id uctrl_match[] = {
@@ -426,7 +425,7 @@ static struct platform_driver uctrl_driver = { · 10 unmodified lines
426 .of_match_table = uctrl_match,425 .of_match_table = uctrl_match,
427 },426 },
428 .probe = uctrl_probe,427 .probe = uctrl_probe,
429 .remove = uctrl_remove,428 .remove_new = uctrl_remove,
430};429};
431 430
432 431
lib/fonts/Kconfig+2−1
@@ -98,7 +98,8 @@ config FONT_10x18 · 97 unmodified lines
98 98
99config FONT_SUN8x1699config FONT_SUN8x16
100 bool "Sparc console 8x16 font"100 bool "Sparc console 8x16 font"
101 depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || BOOTX_TEXT101 depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || \
102 BOOTX_TEXT || EARLYFB
102 help103 help
103 This is the high resolution console font for Sun machines. Say Y.104 This is the high resolution console font for Sun machines. Say Y.
104 105

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t