Commit edc72ac4 authored by Nathan Lynch's avatar Nathan Lynch Committed by Paul Mackerras
Browse files

powerpc/pseries: Check for GIQ indicator before calling set-indicator 



Since "Factor out cpu joining/unjoining the GIQ"
(b4963255) the WARN_ON in
xics_set_cpu_giq() is being triggered during boot on JS20 because the
GIQ indicator is not available on that platform.  While the warning is
harmless and the system runs normally, it's nicer to check for the
existence of the indicator before trying to manipulate it.

Implement rtas_indicator_present(), which searches the
/rtas/rtas-indicators property for the given indicator token, and use
this function in xics_set_cpu_giq().

Also use a WARN statement in xics_set_cpu_giq to get better
information on failure.

Signed-off-by: default avatarNathan Lynch <ntl@pobox.com>
Acked-by: default avatarMilton Miller <miltonm@bga.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6ff04c53

arch/powerpc/include/asm/rtas.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ extern void rtas_os_term(char *str); 
extern int rtas_get_sensor(int sensor, int index, int *state);

extern int rtas_get_power_level(int powerdomain, int *level);

extern int rtas_set_power_level(int powerdomain, int level, int *setlevel);

extern bool rtas_indicator_present(int token, int *maxindex);

extern int rtas_set_indicator(int indicator, int index, int new_value);

extern int rtas_set_indicator_fast(int indicator, int index, int new_value);

extern void rtas_progress(char *s, unsigned short hex);

arch/powerpc/kernel/rtas.c

+26 −0
Original line number Diff line number Diff line
@@ -566,6 +566,32 @@ int rtas_get_sensor(int sensor, int index, int *state) 
}

EXPORT_SYMBOL(rtas_get_sensor);



bool rtas_indicator_present(int token, int *maxindex)

{

	int proplen, count, i;

	const struct indicator_elem {

		u32 token;

		u32 maxindex;

	} *indicators;



	indicators = of_get_property(rtas.dev, "rtas-indicators", &proplen);

	if (!indicators)

		return false;



	count = proplen / sizeof(struct indicator_elem);



	for (i = 0; i < count; i++) {

		if (indicators[i].token != token)

			continue;

		if (maxindex)

			*maxindex = indicators[i].maxindex;

		return true;

	}



	return false;

}

EXPORT_SYMBOL(rtas_indicator_present);



int rtas_set_indicator(int indicator, int index, int new_value)

{

	int token = rtas_token("set-indicator");

arch/powerpc/platforms/pseries/xics.c

+12 −3
Original line number Diff line number Diff line
@@ -744,9 +744,18 @@ static void xics_set_cpu_priority(unsigned char cppr) 
/* Have the calling processor join or leave the specified global queue */

static void xics_set_cpu_giq(unsigned int gserver, unsigned int join)

{

	int status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,

		(1UL << interrupt_server_size) - 1 - gserver, join);

	WARN_ON(status < 0);

	int index;

	int status;



	if (!rtas_indicator_present(GLOBAL_INTERRUPT_QUEUE, NULL))

		return;



	index = (1UL << interrupt_server_size) - 1 - gserver;



	status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE, index, join);



	WARN(status < 0, "set-indicator(%d, %d, %u) returned %d\n",

	     GLOBAL_INTERRUPT_QUEUE, index, join, status);

}



void xics_setup_cpu(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE