Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f1d4ea7 authored by Michael Neuling's avatar Michael Neuling Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: Allow firmware features to match partial strings 



This allows firmware_features_table names to add a '*' at the end so that only
partial strings are matched.

When a '*' is added, only upto the '*' is matched when setting firmware feature
bits.

This is useful for the matching best energy feature.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
cc: Linux PPC dev <linuxppc-dev@ozlabs.org>
Reviewed-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1e18c17a

arch/powerpc/platforms/pseries/firmware.c

+18 −2
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ typedef struct { 
    char * name;

} firmware_feature_t;



/*

 * The names in this table match names in rtas/ibm,hypertas-functions.  If the

 * entry ends in a '*', only upto the '*' is matched.  Otherwise the entire

 * string must match.

 */

static __initdata firmware_feature_t

firmware_features_table[FIRMWARE_MAX_FEATURES] = {

	{FW_FEATURE_PFT,		"hcall-pft"},
@@ -72,9 +77,20 @@ void __init fw_feature_init(const char *hypertas, unsigned long len) 


	for (s = hypertas; s < hypertas + len; s += strlen(s) + 1) {

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

			const char *name = firmware_features_table[i].name;

			size_t size;

			/* check value against table of strings */

			if (!firmware_features_table[i].name ||

			    strcmp(firmware_features_table[i].name, s))

			if (!name)

				continue;

			/*

			 * If there is a '*' at the end of name, only check

			 * upto there

			 */

			size = strlen(name);

			if (size && name[size - 1] == '*') {

				if (strncmp(name, s, size - 1))

					continue;

			} else if (strcmp(name, s))

				continue;



			/* we have a match */