[PATCH] arm: orion5x: correct machine ID check in mss2_pci_init() to use DT

[PATCH] arm: orion5x: correct machine ID check in mss2_pci_init() to use DT

[Ethan Nelson-Moore]

The mss2_pci_init() function contains a check for the ARM machine ID
via the machine_is_mss2() macro. This check is incorrect because the
machine concerned now supports only FDT booting, which does not use
machine IDs, and therefore it will always fail. The machine was
converted to FDT booting in commit fbf04d814d0a ("ARM: orion5x: convert
Maxtor Shared Storage II to the Device Tree"). To resolve this issue,
use of_machine_is_compatible() instead.

Fixes: fbf04d814d0a ("ARM: orion5x: convert Maxtor Shared Storage II to the Device Tree")
Cc: stable@vger.kernel.org
Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
---
 arch/arm/mach-orion5x/board-mss2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-orion5x/board-mss2.c b/arch/arm/mach-orion5x/board-mss2.c
index 9e3d69891d2f..322ae29d05aa 100644
--- a/arch/arm/mach-orion5x/board-mss2.c
+++ b/arch/arm/mach-orion5x/board-mss2.c
@@ -10,7 +10,7 @@
 #include <linux/platform_device.h>
 #include <linux/pci.h>
 #include <linux/irq.h>
-#include <asm/mach-types.h>
+#include <linux/of.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include "orion5x.h"
@@ -47,7 +47,7 @@ static struct hw_pci mss2_pci __initdata = {
 
 static int __init mss2_pci_init(void)
 {
-	if (machine_is_mss2())
+	if (of_machine_is_compatible("maxtor,shared-storage-2"))
 		pci_common_init(&mss2_pci);
 
 	return 0;
-- 
2.43.0

Re: [PATCH] arm: orion5x: correct machine ID check in mss2_pci_init() to use DT

[Ethan Nelson-Moore]

On Fri, May 8, 2026 at 7:19 PM Ethan Nelson-Moore
<enelsonmoore@gmail.com> wrote:
> The mss2_pci_init() function contains a check for the ARM machine ID
> via the machine_is_mss2() macro. This check is incorrect because the
> machine concerned now supports only FDT booting, which does not use
> machine IDs, and therefore it will always fail.

I have been informed that this is not correct and the kernel still
considers the machine ID when booting with FDT, though there is still
value in updating the check because it allows removing the machine ID
from mach-types. I will resend this patch with a fixed commit message
after the 24-hour deadline.