aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi-ip27
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-01-22 06:59:30 -0500
committerRalf Baechle <ralf@linux-mips.org>2013-02-01 04:00:22 -0500
commit7034228792cc561e79ff8600f02884bd4c80e287 (patch)
tree89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/sgi-ip27
parent405ab01c70e18058d9c01a1256769a61fc65413e (diff)
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this once and for all rather than dealing with this kind of patches trickling in forever. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/sgi-ip27')
-rw-r--r--arch/mips/sgi-ip27/ip27-berr.c4
-rw-r--r--arch/mips/sgi-ip27/ip27-hubio.c14
-rw-r--r--arch/mips/sgi-ip27/ip27-init.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-irq.c6
-rw-r--r--arch/mips/sgi-ip27/ip27-memory.c12
-rw-r--r--arch/mips/sgi-ip27/ip27-nmi.c6
-rw-r--r--arch/mips/sgi-ip27/ip27-reset.c2
-rw-r--r--arch/mips/sgi-ip27/ip27-smp.c4
-rw-r--r--arch/mips/sgi-ip27/ip27-timer.c6
-rw-r--r--arch/mips/sgi-ip27/ip27-xtalk.c16
10 files changed, 36 insertions, 36 deletions
diff --git a/arch/mips/sgi-ip27/ip27-berr.c b/arch/mips/sgi-ip27/ip27-berr.c
index 04cebadc2b3c..692778da9e76 100644
--- a/arch/mips/sgi-ip27/ip27-berr.c
+++ b/arch/mips/sgi-ip27/ip27-berr.c
@@ -39,7 +39,7 @@ static void dump_hub_information(unsigned long errst0, unsigned long errst1)
39 39
40 printk("Hub has valid error information:\n"); 40 printk("Hub has valid error information:\n");
41 if (errst0 & PI_ERR_ST0_OVERRUN_MASK) 41 if (errst0 & PI_ERR_ST0_OVERRUN_MASK)
42 printk("Overrun is set. Error stack may contain additional " 42 printk("Overrun is set. Error stack may contain additional "
43 "information.\n"); 43 "information.\n");
44 printk("Hub error address is %08lx\n", 44 printk("Hub error address is %08lx\n",
45 (errst0 & PI_ERR_ST0_ADDR_MASK) >> (PI_ERR_ST0_ADDR_SHFT - 3)); 45 (errst0 & PI_ERR_ST0_ADDR_MASK) >> (PI_ERR_ST0_ADDR_SHFT - 3));
@@ -85,7 +85,7 @@ void __init ip27_be_init(void)
85 board_be_handler = ip27_be_handler; 85 board_be_handler = ip27_be_handler;
86 86
87 LOCAL_HUB_S(PI_ERR_INT_PEND, 87 LOCAL_HUB_S(PI_ERR_INT_PEND,
88 cpu ? PI_ERR_CLEAR_ALL_B : PI_ERR_CLEAR_ALL_A); 88 cpu ? PI_ERR_CLEAR_ALL_B : PI_ERR_CLEAR_ALL_A);
89 LOCAL_HUB_S(PI_ERR_INT_MASK_A + cpuoff, 0); 89 LOCAL_HUB_S(PI_ERR_INT_MASK_A + cpuoff, 0);
90 LOCAL_HUB_S(PI_ERR_STACK_ADDR_A + cpuoff, 0); 90 LOCAL_HUB_S(PI_ERR_STACK_ADDR_A + cpuoff, 0);
91 LOCAL_HUB_S(PI_ERR_STACK_SIZE, 0); /* Disable error stack */ 91 LOCAL_HUB_S(PI_ERR_STACK_SIZE, 0); /* Disable error stack */
diff --git a/arch/mips/sgi-ip27/ip27-hubio.c b/arch/mips/sgi-ip27/ip27-hubio.c
index cd0d5b06cd83..328ceb3c86ec 100644
--- a/arch/mips/sgi-ip27/ip27-hubio.c
+++ b/arch/mips/sgi-ip27/ip27-hubio.c
@@ -17,11 +17,11 @@
17static int force_fire_and_forget = 1; 17static int force_fire_and_forget = 1;
18 18
19/** 19/**
20 * hub_pio_map - establish a HUB PIO mapping 20 * hub_pio_map - establish a HUB PIO mapping
21 * 21 *
22 * @hub: hub to perform PIO mapping on 22 * @hub: hub to perform PIO mapping on
23 * @widget: widget ID to perform PIO mapping for 23 * @widget: widget ID to perform PIO mapping for
24 * @xtalk_addr: xtalk_address that needs to be mapped 24 * @xtalk_addr: xtalk_address that needs to be mapped
25 * @size: size of the PIO mapping 25 * @size: size of the PIO mapping
26 * 26 *
27 **/ 27 **/
@@ -78,8 +78,8 @@ unsigned long hub_pio_map(cnodeid_t cnode, xwidgetnum_t widget,
78/* 78/*
79 * hub_setup_prb(nasid, prbnum, credits, conveyor) 79 * hub_setup_prb(nasid, prbnum, credits, conveyor)
80 * 80 *
81 * Put a PRB into fire-and-forget mode if conveyor isn't set. Otherwise, 81 * Put a PRB into fire-and-forget mode if conveyor isn't set. Otherwise,
82 * put it into conveyor belt mode with the specified number of credits. 82 * put it into conveyor belt mode with the specified number of credits.
83 */ 83 */
84static void hub_setup_prb(nasid_t nasid, int prbnum, int credits) 84static void hub_setup_prb(nasid_t nasid, int prbnum, int credits)
85{ 85{
@@ -125,12 +125,12 @@ static void hub_setup_prb(nasid_t nasid, int prbnum, int credits)
125 * so we turn off access to all widgets for the duration of the function. 125 * so we turn off access to all widgets for the duration of the function.
126 * 126 *
127 * XXX - This code should really check what kind of widget we're talking 127 * XXX - This code should really check what kind of widget we're talking
128 * to. Bridges can only handle three requests, but XG will do more. 128 * to. Bridges can only handle three requests, but XG will do more.
129 * How many can crossbow handle to widget 0? We're assuming 1. 129 * How many can crossbow handle to widget 0? We're assuming 1.
130 * 130 *
131 * XXX - There is a bug in the crossbow that link reset PIOs do not 131 * XXX - There is a bug in the crossbow that link reset PIOs do not
132 * return write responses. The easiest solution to this problem is to 132 * return write responses. The easiest solution to this problem is to
133 * leave widget 0 (xbow) in fire-and-forget mode at all times. This 133 * leave widget 0 (xbow) in fire-and-forget mode at all times. This
134 * only affects pio's to xbow registers, which should be rare. 134 * only affects pio's to xbow registers, which should be rare.
135 **/ 135 **/
136static void hub_set_piomode(nasid_t nasid) 136static void hub_set_piomode(nasid_t nasid)
@@ -167,7 +167,7 @@ static void hub_set_piomode(nasid_t nasid)
167} 167}
168 168
169/* 169/*
170 * hub_pio_init - PIO-related hub initialization 170 * hub_pio_init - PIO-related hub initialization
171 * 171 *
172 * @hub: hubinfo structure for our hub 172 * @hub: hubinfo structure for our hub
173 */ 173 */
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index 923c080f77bd..d41b1c6fb032 100644
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -151,7 +151,7 @@ nasid_t
151get_nasid(void) 151get_nasid(void)
152{ 152{
153 return (nasid_t)((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_NODEID_MASK) 153 return (nasid_t)((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_NODEID_MASK)
154 >> NSRI_NODEID_SHFT); 154 >> NSRI_NODEID_SHFT);
155} 155}
156 156
157/* 157/*
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 69a939ae65e4..2315cfeb2687 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -62,7 +62,7 @@ extern int irq_to_slot[];
62 * from the irq value 62 * from the irq value
63 */ 63 */
64#define IRQ_TO_BRIDGE(i) irq_to_bridge[(i)] 64#define IRQ_TO_BRIDGE(i) irq_to_bridge[(i)]
65#define SLOT_FROM_PCI_IRQ(i) irq_to_slot[i] 65#define SLOT_FROM_PCI_IRQ(i) irq_to_slot[i]
66 66
67static inline int alloc_level(int cpu, int irq) 67static inline int alloc_level(int cpu, int irq)
68{ 68{
@@ -281,11 +281,11 @@ static unsigned int startup_bridge_irq(struct irq_data *d)
281 device |= (pin << (pin*3)); 281 device |= (pin << (pin*3));
282 bridge->b_int_device = device; 282 bridge->b_int_device = device;
283 283
284 bridge->b_wid_tflush; 284 bridge->b_wid_tflush;
285 285
286 intr_connect_level(cpu, swlevel); 286 intr_connect_level(cpu, swlevel);
287 287
288 return 0; /* Never anything pending. */ 288 return 0; /* Never anything pending. */
289} 289}
290 290
291/* Shutdown one of the (PCI ...) IRQs routes over a bridge. */ 291/* Shutdown one of the (PCI ...) IRQs routes over a bridge. */
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index cd8fcab6b054..3505d08ff2fd 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -31,8 +31,8 @@
31#include <asm/sn/sn_private.h> 31#include <asm/sn/sn_private.h>
32 32
33 33
34#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT) 34#define SLOT_PFNSHIFT (SLOT_SHIFT - PAGE_SHIFT)
35#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT) 35#define PFN_NASIDSHFT (NASID_SHFT - PAGE_SHIFT)
36 36
37struct node_data *__node_data[MAX_COMPACT_NODES]; 37struct node_data *__node_data[MAX_COMPACT_NODES];
38 38
@@ -43,7 +43,7 @@ static int fine_mode;
43static int is_fine_dirmode(void) 43static int is_fine_dirmode(void)
44{ 44{
45 return (((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_REGIONSIZE_MASK) 45 return (((LOCAL_HUB_L(NI_STATUS_REV_ID) & NSRI_REGIONSIZE_MASK)
46 >> NSRI_REGIONSIZE_SHFT) & REGIONSIZE_FINE); 46 >> NSRI_REGIONSIZE_SHFT) & REGIONSIZE_FINE);
47} 47}
48 48
49static hubreg_t get_region(cnodeid_t cnode) 49static hubreg_t get_region(cnodeid_t cnode)
@@ -66,7 +66,7 @@ static void gen_region_mask(hubreg_t *region_mask)
66 } 66 }
67} 67}
68 68
69#define rou_rflag rou_flags 69#define rou_rflag rou_flags
70 70
71static int router_distance; 71static int router_distance;
72 72
@@ -412,7 +412,7 @@ static void __init node_mem_init(cnodeid_t node)
412 slot_freepfn += PFN_UP(sizeof(struct pglist_data) + 412 slot_freepfn += PFN_UP(sizeof(struct pglist_data) +
413 sizeof(struct hub_data)); 413 sizeof(struct hub_data));
414 414
415 bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn, 415 bootmap_size = init_bootmem_node(NODE_DATA(node), slot_freepfn,
416 start_pfn, end_pfn); 416 start_pfn, end_pfn);
417 free_bootmem_with_active_regions(node, end_pfn); 417 free_bootmem_with_active_regions(node, end_pfn);
418 reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT, 418 reserve_bootmem_node(NODE_DATA(node), slot_firstpfn << PAGE_SHIFT,
@@ -422,7 +422,7 @@ static void __init node_mem_init(cnodeid_t node)
422} 422}
423 423
424/* 424/*
425 * A node with nothing. We use it to avoid any special casing in 425 * A node with nothing. We use it to avoid any special casing in
426 * cpumask_of_node 426 * cpumask_of_node
427 */ 427 */
428static struct node_data null_node = { 428static struct node_data null_node = {
diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
index 005c29ed419a..a2358b44420c 100644
--- a/arch/mips/sgi-ip27/ip27-nmi.c
+++ b/arch/mips/sgi-ip27/ip27-nmi.c
@@ -54,7 +54,7 @@ void install_cpu_nmi_handler(int slice)
54void nmi_cpu_eframe_save(nasid_t nasid, int slice) 54void nmi_cpu_eframe_save(nasid_t nasid, int slice)
55{ 55{
56 struct reg_struct *nr; 56 struct reg_struct *nr;
57 int i; 57 int i;
58 58
59 /* Get the pointer to the current cpu's register set. */ 59 /* Get the pointer to the current cpu's register set. */
60 nr = (struct reg_struct *) 60 nr = (struct reg_struct *)
@@ -86,12 +86,12 @@ void nmi_cpu_eframe_save(nasid_t nasid, int slice)
86 printk("%s\n", print_tainted()); 86 printk("%s\n", print_tainted());
87 printk("ErrEPC: %016lx %pS\n", nr->error_epc, (void *) nr->error_epc); 87 printk("ErrEPC: %016lx %pS\n", nr->error_epc, (void *) nr->error_epc);
88 printk("ra : %016lx %pS\n", nr->gpr[31], (void *) nr->gpr[31]); 88 printk("ra : %016lx %pS\n", nr->gpr[31], (void *) nr->gpr[31]);
89 printk("Status: %08lx ", nr->sr); 89 printk("Status: %08lx ", nr->sr);
90 90
91 if (nr->sr & ST0_KX) 91 if (nr->sr & ST0_KX)
92 printk("KX "); 92 printk("KX ");
93 if (nr->sr & ST0_SX) 93 if (nr->sr & ST0_SX)
94 printk("SX "); 94 printk("SX ");
95 if (nr->sr & ST0_UX) 95 if (nr->sr & ST0_UX)
96 printk("UX "); 96 printk("UX ");
97 97
diff --git a/arch/mips/sgi-ip27/ip27-reset.c b/arch/mips/sgi-ip27/ip27-reset.c
index f347bc6b7954..ac37e54b3d5e 100644
--- a/arch/mips/sgi-ip27/ip27-reset.c
+++ b/arch/mips/sgi-ip27/ip27-reset.c
@@ -29,7 +29,7 @@ void machine_restart(char *command) __attribute__((noreturn));
29void machine_halt(void) __attribute__((noreturn)); 29void machine_halt(void) __attribute__((noreturn));
30void machine_power_off(void) __attribute__((noreturn)); 30void machine_power_off(void) __attribute__((noreturn));
31 31
32#define noreturn while(1); /* Silence gcc. */ 32#define noreturn while(1); /* Silence gcc. */
33 33
34/* XXX How to pass the reboot command to the firmware??? */ 34/* XXX How to pass the reboot command to the firmware??? */
35static void ip27_machine_restart(char *command) 35static void ip27_machine_restart(char *command)
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 735b43bf8f82..f94638141b20 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -191,7 +191,7 @@ static void __init ip27_cpus_done(void)
191} 191}
192 192
193/* 193/*
194 * Launch a slave into smp_bootstrap(). It doesn't take an argument, and we 194 * Launch a slave into smp_bootstrap(). It doesn't take an argument, and we
195 * set sp to the kernel stack of the newly created idle process, gp to the proc 195 * set sp to the kernel stack of the newly created idle process, gp to the proc
196 * struct so that current_thread_info() will work. 196 * struct so that current_thread_info() will work.
197 */ 197 */
@@ -219,7 +219,7 @@ static void __init ip27_smp_setup(void)
219 219
220 /* 220 /*
221 * Assumption to be fixed: we're always booted on logical / physical 221 * Assumption to be fixed: we're always booted on logical / physical
222 * processor 0. While we're always running on logical processor 0 222 * processor 0. While we're always running on logical processor 0
223 * this still means this is physical processor zero; it might for 223 * this still means this is physical processor zero; it might for
224 * example be disabled in the firmware. 224 * example be disabled in the firmware.
225 */ 225 */
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 13cfeab50528..fff58ac176f3 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -117,8 +117,8 @@ void __cpuinit hub_rt_clock_event_init(void)
117 cd->name = name; 117 cd->name = name;
118 cd->features = CLOCK_EVT_FEAT_ONESHOT; 118 cd->features = CLOCK_EVT_FEAT_ONESHOT;
119 clockevent_set_clock(cd, CYCLES_PER_SEC); 119 clockevent_set_clock(cd, CYCLES_PER_SEC);
120 cd->max_delta_ns = clockevent_delta2ns(0xfffffffffffff, cd); 120 cd->max_delta_ns = clockevent_delta2ns(0xfffffffffffff, cd);
121 cd->min_delta_ns = clockevent_delta2ns(0x300, cd); 121 cd->min_delta_ns = clockevent_delta2ns(0x300, cd);
122 cd->rating = 200; 122 cd->rating = 200;
123 cd->irq = irq; 123 cd->irq = irq;
124 cd->cpumask = cpumask_of(cpu); 124 cd->cpumask = cpumask_of(cpu);
@@ -153,7 +153,7 @@ static cycle_t hub_rt_read(struct clocksource *cs)
153 153
154struct clocksource hub_rt_clocksource = { 154struct clocksource hub_rt_clocksource = {
155 .name = "HUB-RT", 155 .name = "HUB-RT",
156 .rating = 200, 156 .rating = 200,
157 .read = hub_rt_read, 157 .read = hub_rt_read,
158 .mask = CLOCKSOURCE_MASK(52), 158 .mask = CLOCKSOURCE_MASK(52),
159 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 159 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
diff --git a/arch/mips/sgi-ip27/ip27-xtalk.c b/arch/mips/sgi-ip27/ip27-xtalk.c
index 5e871e75a8d9..a4df7d0f6f12 100644
--- a/arch/mips/sgi-ip27/ip27-xtalk.c
+++ b/arch/mips/sgi-ip27/ip27-xtalk.c
@@ -17,15 +17,15 @@
17#include <asm/xtalk/xtalk.h> 17#include <asm/xtalk/xtalk.h>
18 18
19 19
20#define XBOW_WIDGET_PART_NUM 0x0 20#define XBOW_WIDGET_PART_NUM 0x0
21#define XXBOW_WIDGET_PART_NUM 0xd000 /* Xbow in Xbridge */ 21#define XXBOW_WIDGET_PART_NUM 0xd000 /* Xbow in Xbridge */
22#define BASE_XBOW_PORT 8 /* Lowest external port */ 22#define BASE_XBOW_PORT 8 /* Lowest external port */
23 23
24extern int bridge_probe(nasid_t nasid, int widget, int masterwid); 24extern int bridge_probe(nasid_t nasid, int widget, int masterwid);
25 25
26static int __cpuinit probe_one_port(nasid_t nasid, int widget, int masterwid) 26static int __cpuinit probe_one_port(nasid_t nasid, int widget, int masterwid)
27{ 27{
28 widgetreg_t widget_id; 28 widgetreg_t widget_id;
29 xwidget_part_num_t partnum; 29 xwidget_part_num_t partnum;
30 30
31 widget_id = *(volatile widgetreg_t *) 31 widget_id = *(volatile widgetreg_t *)
@@ -102,10 +102,10 @@ static int __cpuinit xbow_probe(nasid_t nasid)
102 102
103void __cpuinit xtalk_probe_node(cnodeid_t nid) 103void __cpuinit xtalk_probe_node(cnodeid_t nid)
104{ 104{
105 volatile u64 hubreg; 105 volatile u64 hubreg;
106 nasid_t nasid; 106 nasid_t nasid;
107 xwidget_part_num_t partnum; 107 xwidget_part_num_t partnum;
108 widgetreg_t widget_id; 108 widgetreg_t widget_id;
109 109
110 nasid = COMPACT_TO_NASID_NODEID(nid); 110 nasid = COMPACT_TO_NASID_NODEID(nid);
111 hubreg = REMOTE_HUB_L(nasid, IIO_LLP_CSR); 111 hubreg = REMOTE_HUB_L(nasid, IIO_LLP_CSR);
@@ -115,7 +115,7 @@ void __cpuinit xtalk_probe_node(cnodeid_t nid)
115 return; 115 return;
116 116
117 widget_id = *(volatile widgetreg_t *) 117 widget_id = *(volatile widgetreg_t *)
118 (RAW_NODE_SWIN_BASE(nasid, 0x0) + WIDGET_ID); 118 (RAW_NODE_SWIN_BASE(nasid, 0x0) + WIDGET_ID);
119 partnum = XWIDGET_PART_NUM(widget_id); 119 partnum = XWIDGET_PART_NUM(widget_id);
120 120
121 printk(KERN_INFO "Cpu %d, Nasid 0x%x: partnum 0x%x is ", 121 printk(KERN_INFO "Cpu %d, Nasid 0x%x: partnum 0x%x is ",