| Submitter | Michael Neuling |
|---|---|
| Date | Nov. 7, 2012, 12:49 a.m. |
| Message ID | <1352249356-29671-1-git-send-email-mikey@neuling.org> |
| Download | mbox | patch |
| Permalink | /patch/197605/ |
| State | Accepted |
| Commit | 2f1d4ea7bcd96d3796eba4087388bdb37322ee7a |
| Delegated to: | Benjamin Herrenschmidt |
| Headers | show |
Comments
Hi Mikey, On Wed, 7 Nov 2012 11:49:15 +1100 Michael Neuling <mikey@neuling.org> wrote: > > 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: Michael Neuling <mikey@neuling.org> > cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> > cc: Linux PPC dev <linuxppc-dev@ozlabs.org> Reviewed-by: Stephen Rothwell <sfr@canb.auug.org.au>
Patch
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c index 0b0eff0..448c053 100644 --- a/arch/powerpc/platforms/pseries/firmware.c +++ b/arch/powerpc/platforms/pseries/firmware.c @@ -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"}, @@ -71,9 +76,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 */
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: Michael Neuling <mikey@neuling.org> cc: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> cc: Linux PPC dev <linuxppc-dev@ozlabs.org> --- arch/powerpc/platforms/pseries/firmware.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)