tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'vexpress-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes
ARM Vexpress fixes for 5.18
Couple of fixes to address negative array index access and kernel-doc
build warnings.
* tag 'vexpress-fixes-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
ARM: vexpress/spc: Fix all the kernel-doc build warnings
ARM: vexpress/spc: Fix kernel-doc build warning for ve_spc_cpu_in_wfi
ARM: vexpress/spc: Avoid negative array index when !SMP
Link: https://lore.kernel.org/r/20220407110828.1436206-1-sudeep.holla@arm.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+14
-14
+14
-14
arch/arm/mach-vexpress/spc.c
+14
-14
arch/arm/mach-vexpress/spc.c
···
122
122
}
123
123
124
124
/**
125
-
* ve_spc_global_wakeup_irq()
125
+
* ve_spc_global_wakeup_irq() - sets/clears global wakeup IRQs
126
+
*
127
+
* @set: if true, global wake-up IRQs are set, if false they are cleared
126
128
*
127
129
* Function to set/clear global wakeup IRQs. Not protected by locking since
128
130
* it might be used in code paths where normal cacheable locks are not
129
131
* working. Locking must be provided by the caller to ensure atomicity.
130
-
*
131
-
* @set: if true, global wake-up IRQs are set, if false they are cleared
132
132
*/
133
133
void ve_spc_global_wakeup_irq(bool set)
134
134
{
···
145
145
}
146
146
147
147
/**
148
-
* ve_spc_cpu_wakeup_irq()
149
-
*
150
-
* Function to set/clear per-CPU wake-up IRQs. Not protected by locking since
151
-
* it might be used in code paths where normal cacheable locks are not
152
-
* working. Locking must be provided by the caller to ensure atomicity.
148
+
* ve_spc_cpu_wakeup_irq() - sets/clears per-CPU wake-up IRQs
153
149
*
154
150
* @cluster: mpidr[15:8] bitfield describing cluster affinity level
155
151
* @cpu: mpidr[7:0] bitfield describing cpu affinity level
156
152
* @set: if true, wake-up IRQs are set, if false they are cleared
153
+
*
154
+
* Function to set/clear per-CPU wake-up IRQs. Not protected by locking since
155
+
* it might be used in code paths where normal cacheable locks are not
156
+
* working. Locking must be provided by the caller to ensure atomicity.
157
157
*/
158
158
void ve_spc_cpu_wakeup_irq(u32 cluster, u32 cpu, bool set)
159
159
{
···
200
200
}
201
201
202
202
/**
203
-
* ve_spc_powerdown()
203
+
* ve_spc_powerdown() - enables/disables cluster powerdown
204
+
*
205
+
* @cluster: mpidr[15:8] bitfield describing cluster affinity level
206
+
* @enable: if true enables powerdown, if false disables it
204
207
*
205
208
* Function to enable/disable cluster powerdown. Not protected by locking
206
209
* since it might be used in code paths where normal cacheable locks are not
207
210
* working. Locking must be provided by the caller to ensure atomicity.
208
-
*
209
-
* @cluster: mpidr[15:8] bitfield describing cluster affinity level
210
-
* @enable: if true enables powerdown, if false disables it
211
211
*/
212
212
void ve_spc_powerdown(u32 cluster, bool enable)
213
213
{
···
228
228
}
229
229
230
230
/**
231
-
* ve_spc_cpu_in_wfi(u32 cpu, u32 cluster)
231
+
* ve_spc_cpu_in_wfi() - Checks if the specified CPU is in WFI or not
232
232
*
233
233
* @cpu: mpidr[7:0] bitfield describing CPU affinity level within cluster
234
234
* @cluster: mpidr[15:8] bitfield describing cluster affinity level
···
580
580
}
581
581
582
582
cluster = topology_physical_package_id(cpu_dev->id);
583
-
if (init_opp_table[cluster])
583
+
if (cluster < 0 || init_opp_table[cluster])
584
584
continue;
585
585
586
586
if (ve_init_opp_table(cpu_dev))