This is a note to let you know that I've just added the patch titled
MIPS: generic: Fix machine compatible matching
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mips-generic-fix-machine-compatible-matching.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun May 27 16:52:54 CEST 2018
From: James Hogan <jhogan@xxxxxxxxxx>
Date: Fri, 2 Feb 2018 22:14:09 +0000
Subject: MIPS: generic: Fix machine compatible matching
From: James Hogan <jhogan@xxxxxxxxxx>
[ Upstream commit 9a9ab3078e2744a1a55163cfaec73a5798aae33e ]
We now have a platform (Ranchu) in the "generic" platform which matches
based on the FDT compatible string using mips_machine_is_compatible(),
however that function doesn't stop at a blank struct
of_device_id::compatible as that is an array in the struct, not a
pointer to a string.
Fix the loop completion to check the first byte of the compatible array
rather than the address of the compatible array in the struct.
Fixes: eed0eabd12ef ("MIPS: generic: Introduce generic DT-based board support")
Signed-off-by: James Hogan <jhogan@xxxxxxxxxx>
Reviewed-by: Paul Burton <paul.burton@xxxxxxxx>
Reviewed-by: Matt Redfearn <matt.redfearn@xxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Cc: linux-mips@xxxxxxxxxxxxxx
Patchwork: https://patchwork.linux-mips.org/patch/18580/
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/mips/include/asm/machine.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/mips/include/asm/machine.h
+++ b/arch/mips/include/asm/machine.h
@@ -52,7 +52,7 @@ mips_machine_is_compatible(const struct
if (!mach->matches)
return NULL;
- for (match = mach->matches; match->compatible; match++) {
+ for (match = mach->matches; match->compatible[0]; match++) {
if (fdt_node_check_compatible(fdt, 0, match->compatible) == 0)
return match;
}
Patches currently in stable-queue which might be from jhogan@xxxxxxxxxx are
queue-4.14/mips-ptrace-expose-fir-register-through-fp-regset.patch
queue-4.14/mips-ath79-fix-ar724x_pll_reg_pcie_config-offset.patch
queue-4.14/mips-octeon-fix-logging-messages-with-spurious-periods-after-newlines.patch
queue-4.14/mips-generic-fix-machine-compatible-matching.patch
queue-4.14/mips-fix-ptrace-2-ptrace_peekusr-and-ptrace_pokeusr-accesses-to-o32-fgrs.patch
queue-4.14/kvm-fix-spelling-mistake-cop_unsuable-cop_unusable.patch
queue-4.14/mips-c-r4k-fix-data-corruption-related-to-cache-coherence.patch
