android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] ppc64: Formatting cleanups in arch/ppc64/kernel/ItLpQueue.c

Browse Source 
Just formatting cleanups:
 * rename some "nextLpEvent" variables to just "event"
 * make code fit in 80 columns
 * use brackets around if/else
 * use a temporary to make hvlpevent_clear_valid clearer

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Michael Ellerman 2005-06-30 15:16:48 +10:00 committed by Paul Mackerras
parent 38fcdcfe38
commit ffe1b7e14e
1 changed files with 43 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
arch/ppc64/kernel/ItLpQueue.c
View File

@ -74,24 +74,27 @@ unsigned long ItLpQueueInProcess = 0;
static struct HvLpEvent * get_next_hvlpevent(void) static struct HvLpEvent * get_next_hvlpevent(void)
{ {
struct HvLpEvent * nextLpEvent = struct HvLpEvent * event;
(struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr; event = (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;
if (nextLpEvent->xFlags.xValid) {
if (event->xFlags.xValid) {
/* rmb() needed only for weakly consistent machines (regatta) */ /* rmb() needed only for weakly consistent machines (regatta) */
rmb(); rmb();
/* Set pointer to next potential event */ /* Set pointer to next potential event */
hvlpevent_queue.xSlicCurEventPtr += ((nextLpEvent->xSizeMinus1 + hvlpevent_queue.xSlicCurEventPtr += ((event->xSizeMinus1 +
LpEventAlign) / LpEventAlign) / LpEventAlign) * LpEventAlign;
LpEventAlign) *
LpEventAlign;
/* Wrap to beginning if no room at end */
if (hvlpevent_queue.xSlicCurEventPtr > hvlpevent_queue.xSlicLastValidEventPtr)
hvlpevent_queue.xSlicCurEventPtr = hvlpevent_queue.xSlicEventStackPtr;
}
else
nextLpEvent = NULL;
return nextLpEvent; /* Wrap to beginning if no room at end */
if (hvlpevent_queue.xSlicCurEventPtr >
hvlpevent_queue.xSlicLastValidEventPtr) {
hvlpevent_queue.xSlicCurEventPtr =
hvlpevent_queue.xSlicEventStackPtr;
}
} else {
event = NULL;
}
return event;
} }
static unsigned long spread_lpevents = NR_CPUS; static unsigned long spread_lpevents = NR_CPUS;
@ -104,34 +107,41 @@ int hvlpevent_is_pending(void)
return 0; return 0;
next_event = (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr; next_event = (struct HvLpEvent *)hvlpevent_queue.xSlicCurEventPtr;
return next_event->xFlags.xValid | hvlpevent_queue.xPlicOverflowIntPending;
return next_event->xFlags.xValid |
hvlpevent_queue.xPlicOverflowIntPending;
} }
static void hvlpevent_clear_valid(struct HvLpEvent * event) static void hvlpevent_clear_valid(struct HvLpEvent * event)
{ {
/* Clear the valid bit of the event /* Tell the Hypervisor that we're done with this event.
* Also clear bits within this event that might * Also clear bits within this event that might look like valid bits.
* look like valid bits (on 64-byte boundaries) * ie. on 64-byte boundaries.
*/ */
struct HvLpEvent *tmp;
unsigned extra = ((event->xSizeMinus1 + LpEventAlign) / unsigned extra = ((event->xSizeMinus1 + LpEventAlign) /
LpEventAlign) - 1; LpEventAlign) - 1;
switch (extra) { switch (extra) {
case 3: case 3:
((struct HvLpEvent*)((char*)event+3*LpEventAlign))->xFlags.xValid=0; tmp = (struct HvLpEvent*)((char*)event + 3 * LpEventAlign);
tmp->xFlags.xValid = 0;
case 2: case 2:
((struct HvLpEvent*)((char*)event+2*LpEventAlign))->xFlags.xValid=0; tmp = (struct HvLpEvent*)((char*)event + 2 * LpEventAlign);
tmp->xFlags.xValid = 0;
case 1: case 1:
((struct HvLpEvent*)((char*)event+1*LpEventAlign))->xFlags.xValid=0; tmp = (struct HvLpEvent*)((char*)event + 1 * LpEventAlign);
case 0: tmp->xFlags.xValid = 0;
;
} }
mb(); mb();
event->xFlags.xValid = 0; event->xFlags.xValid = 0;
} }
void process_hvlpevents(struct pt_regs *regs) void process_hvlpevents(struct pt_regs *regs)
{ {
struct HvLpEvent * nextLpEvent; struct HvLpEvent * event;
/* If we have recursed, just return */ /* If we have recursed, just return */
if ( !set_inUse() ) if ( !set_inUse() )
@ -143,8 +153,8 @@ void process_hvlpevents(struct pt_regs *regs)
BUG(); BUG();
for (;;) { for (;;) {
nextLpEvent = get_next_hvlpevent(); event = get_next_hvlpevent();
if (nextLpEvent) { if (event) {
/* Call appropriate handler here, passing /* Call appropriate handler here, passing
* a pointer to the LpEvent. The handler * a pointer to the LpEvent. The handler
* must make a copy of the LpEvent if it * must make a copy of the LpEvent if it
@ -158,15 +168,15 @@ void process_hvlpevents(struct pt_regs *regs)
* registered for, so no type check is necessary * registered for, so no type check is necessary
* here! * here!
*/ */
if (nextLpEvent->xType < HvLpEvent_Type_NumTypes) if (event->xType < HvLpEvent_Type_NumTypes)
__get_cpu_var(hvlpevent_counts)[nextLpEvent->xType]++; __get_cpu_var(hvlpevent_counts)[event->xType]++;
if (nextLpEvent->xType < HvLpEvent_Type_NumTypes && if (event->xType < HvLpEvent_Type_NumTypes &&
lpEventHandler[nextLpEvent->xType]) lpEventHandler[event->xType])
lpEventHandler[nextLpEvent->xType](nextLpEvent, regs); lpEventHandler[event->xType](event, regs);
else else
printk(KERN_INFO "Unexpected Lp Event type=%d\n", nextLpEvent->xType ); printk(KERN_INFO "Unexpected Lp Event type=%d\n", event->xType );
hvlpevent_clear_valid(nextLpEvent); hvlpevent_clear_valid(event);
} else if (hvlpevent_queue.xPlicOverflowIntPending) } else if (hvlpevent_queue.xPlicOverflowIntPending)
/* /*
* No more valid events. If overflow events are * No more valid events. If overflow events are