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

Commit 5467bdda authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

x86/cpu: Clean up modalias feature matching 



We currently include commas on both sides of the feature ID in a
modalias, but this prevents the lowest numbered feature of a CPU from
being matched.  Since all feature IDs have the same length, we do not
need to worry about substring matches, so omit commas from the
modalias entirely.

Avoid generating multiple adjacent wildcards when there is no
feature ID to match.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Acked-by: default avatarThomas Renninger <trenn@suse.de>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70142a9d

arch/x86/kernel/cpu/match.c

+1 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ ssize_t arch_print_cpu_modalias(struct device *dev, 
		boot_cpu_data.x86_model);

	size -= n;

	buf += n;

	size -= 2;

	size -= 1;

	for (i = 0; i < NCAPINTS*32; i++) {

		if (boot_cpu_has(i)) {

			n = snprintf(buf, size, ",%04X", i);
@@ -75,7 +75,6 @@ ssize_t arch_print_cpu_modalias(struct device *dev, 
			buf += n;

		}

	}

	*buf++ = ',';

	*buf++ = '\n';

	return buf - bufptr;

}

scripts/mod/file2alias.c

+3 −2
Original line number Diff line number Diff line
@@ -1021,8 +1021,9 @@ static int do_x86cpu_entry(const char *filename, struct x86_cpu_id *id, 
	ADD(alias, "vendor:",  id->vendor != X86_VENDOR_ANY, id->vendor);

	ADD(alias, ":family:", id->family != X86_FAMILY_ANY, id->family);

	ADD(alias, ":model:",  id->model  != X86_MODEL_ANY,  id->model);

	ADD(alias, ":feature:*,", id->feature != X86_FEATURE_ANY, id->feature);

	strcat(alias, ",*");

	strcat(alias, ":feature:*");

	if (id->feature != X86_FEATURE_ANY)

		sprintf(alias + strlen(alias), "%04X*", id->feature);

	return 1;

}

ADD_TO_DEVTABLE("x86cpu", struct x86_cpu_id, do_x86cpu_entry);