* MIPS: generic: Fix machine compatible matching
@ 2018-02-02 22:14 James Hogan
0 siblings, 0 replies; 5+ messages in thread
From: James Hogan @ 2018-02-02 22:14 UTC (permalink / raw)
From: James Hogan <jhogan@kernel.org>
[ 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@kernel.org>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18580/
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@kernel.org are
queue-4.9/mips-ath79-fix-ar724x_pll_reg_pcie_config-offset.patch
queue-4.9/mips-txx9-use-is_builtin-for-config_leds_class.patch
queue-4.9/mips-octeon-fix-logging-messages-with-spurious-periods-after-newlines.patch
queue-4.9/mips-generic-fix-machine-compatible-matching.patch
^ permalink raw reply [flat|nested] 5+ messages in thread
* MIPS: generic: Fix machine compatible matching
@ 2018-02-02 22:14 James Hogan
0 siblings, 0 replies; 5+ messages in thread
From: James Hogan @ 2018-02-02 22:14 UTC (permalink / raw)
From: James Hogan <jhogan@kernel.org>
[ 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@kernel.org>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18580/
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@kernel.org are
queue-4.14/mips-generic-support-gic-in-eic-mode.patch
queue-4.14/mips-txx9-use-is_builtin-for-config_leds_class.patch
queue-4.14/mips-generic-fix-machine-compatible-matching.patch
queue-4.14/mips-fix-clean-of-vmlinuz.-32-ecoff-bin-srec.patch
^ permalink raw reply [flat|nested] 5+ messages in thread
* MIPS: generic: Fix machine compatible matching
@ 2018-02-02 22:14 James Hogan
0 siblings, 0 replies; 5+ messages in thread
From: James Hogan @ 2018-02-02 22:14 UTC (permalink / raw)
From: James Hogan <jhogan@kernel.org>
[ 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@kernel.org>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18580/
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@kernel.org are
queue-4.14/mips-ath79-fix-ar724x_pll_reg_pcie_config-offset.patch
queue-4.14/rtc-goldfish-add-missing-module_license.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
^ permalink raw reply [flat|nested] 5+ messages in thread
* MIPS: generic: Fix machine compatible matching
@ 2018-02-02 22:14 James Hogan
0 siblings, 0 replies; 5+ messages in thread
From: James Hogan @ 2018-02-02 22:14 UTC (permalink / raw)
From: James Hogan <jhogan@kernel.org>
[ 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@kernel.org>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18580/
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@kernel.org 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* MIPS: generic: Fix machine compatible matching
@ 2018-02-02 22:14 James Hogan
0 siblings, 0 replies; 5+ messages in thread
From: James Hogan @ 2018-02-02 22:14 UTC (permalink / raw)
From: James Hogan <jhogan@kernel.org>
[ 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@kernel.org>
Reviewed-by: Paul Burton <paul.burton@mips.com>
Reviewed-by: Matt Redfearn <matt.redfearn@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/18580/
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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@kernel.org are
queue-4.9/mips-ptrace-expose-fir-register-through-fp-regset.patch
queue-4.9/mips-ath79-fix-ar724x_pll_reg_pcie_config-offset.patch
queue-4.9/mips-txx9-use-is_builtin-for-config_leds_class.patch
queue-4.9/mips-octeon-fix-logging-messages-with-spurious-periods-after-newlines.patch
queue-4.9/mips-generic-fix-machine-compatible-matching.patch
queue-4.9/mips-fix-ptrace-2-ptrace_peekusr-and-ptrace_pokeusr-accesses-to-o32-fgrs.patch
queue-4.9/kvm-fix-spelling-mistake-cop_unsuable-cop_unusable.patch
queue-4.9/mips-c-r4k-fix-data-corruption-related-to-cache-coherence.patch
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-02-02 22:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-02 22:14 MIPS: generic: Fix machine compatible matching James Hogan
-- strict thread matches above, loose matches on Subject: below --
2018-02-02 22:14 James Hogan
2018-02-02 22:14 James Hogan
2018-02-02 22:14 James Hogan
2018-02-02 22:14 James Hogan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.