From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f195.google.com (mail-dy1-f195.google.com [74.125.82.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 455042BEC5F for ; Sat, 9 May 2026 02:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778293187; cv=none; b=GSXZf2rWpdsRtCYhMPou8kreXlRlQ7ZI4niP9he5q4OWEmTImY8ltSqYwR5DoPBaOdLlcoeh8gD1y+BSuvAQYccOAxk9iLs/VKi5ekIP0lOVAjL1e9axYcLDcf1P4j4ywUq/BCFupX9eABc1OwBFdqiCeY0Xfi2WZAqHBwYKjnE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778293187; c=relaxed/simple; bh=kTfUgBhBHNuBtL9eJOgwzYGCFRBPPNjKq226/ZPUROE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hHIlkcbsw+1lk83cZ7bFq2A4tXULF1LdFMkDe1GaQZVWq8MJ4+wOdRli3+B+VUbDa+iIjCeg4/fdlS07Ar0VPZxdjFT8ISC7fleXyqtzQDwuw8zAXlyGY5JvlQnle+NSeT+Yi8rgiLRgiMJ7Z5kLp06FxQGh6dlGja/GwnIdglg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EyTRX4yI; arc=none smtp.client-ip=74.125.82.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EyTRX4yI" Received: by mail-dy1-f195.google.com with SMTP id 5a478bee46e88-2ef38cf04f0so3239735eec.1 for ; Fri, 08 May 2026 19:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778293183; x=1778897983; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7rx5oAgzTfQrxNSItVjPyuKjULjUzEucljH1SJ8cUBc=; b=EyTRX4yIyXBdvHtGkI4sK/HhCikELmksbuPv/j9nXjrdy+Qy+aV2NcvJ5Fvq7a0rqw r/5H09wO3ofq4ozg95TRkLvNZkSUz5nnVhiBeOsU40DfAdkG92DMpg42kRkVm7/CYFTj 9jQ4LhePHb94b8dgBtkx+nB1yM/7HgUkB9H/Q3Y6TUgc9lEMa4KgwzxptdcajcqhA54u engSjjGUPy+Se73DANH9yJWFHESt8BzkbQZu2aWHFBTuojWOYa1pgdrg1M3xVfhY794y 5nvct9BN1W1uEYlEqElolVOAfF2CGoOt4w5FRw+AhWQ24reokF6l89awRz5t9/4XxSuX 2Y3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778293183; x=1778897983; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7rx5oAgzTfQrxNSItVjPyuKjULjUzEucljH1SJ8cUBc=; b=FeR8zhGdefwN54mqw3jYVT3N8VXguWzFv6fF/OvSpH7995a0i1nM1iz0ppSsqA2YGj h9wL2Y8RCxVYGtlYJHTZAzVLFO9N99+EiwjfSZNt/u1KbH7sAseiRSeLL/nPtN5AYoto iDObruFSz+2DtKi5EZLkemqJv3GNorct1mtaMv/sm0mcKIc2HDTz+dBGCVvZJtl1pFkl YRaT0J/18ytbTPWEjD8yJGdzVryjJHmAhS5AGHMFWc4tbylJOQaM86AUDTIyBXpNP30z CoHPVREfZcxIG2ENcsyP0LtNvommltbA7n/z6+ajEENWIFaHyCMrUthRfkjjg2voILbq ZDhw== X-Forwarded-Encrypted: i=1; AFNElJ8mnTZC0dKDD7myd+l/HaFcOMo0pyrfzr+uUL6SLUa4ca/TBkZcwF6fHDT7cU2ysN+Bz0qtCwnA5lGGnWs=@vger.kernel.org X-Gm-Message-State: AOJu0Yww26c+sWQiTopWk0PK36xQQDV4MUiVlA30b4WHH9+ROSN0FESz hFelUqGf+nQgHLmwceuzhDqGdK8XqJlE/Q9UYu4+PaR/9aESg4tdrfQC X-Gm-Gg: Acq92OExgr7OBpdyc0lJ1RXMsewCeQGTe0QQ207jRmiZp1FPN5/wAd+dJF9D4E8ryTL hXVnJLdseGx5MLXYOJdeZgq9tUbhTg4TGllgXxhKgMwjLUFk6YxwGwWwvxTJ68BT6Inj3CiOD7D 26v61RByQWh8DSdzoBuqNbeCOjl6fu68k+Wg+gZ3MScVFPA7oTtegqmQq1ylPApEdl38DTJVgLw caDqv5mriIVE6RGz8mXXfXAVU43QqgQrGGoqHSmPMIFIlCsFZuYrj3zRx4IXP0Ajd9ofbrXXdG7 5JcN98BNktfVUoTMN6Kr8NLyeFvcHFLJnB9DHRQNX2cPDyHks9YN6ypdr55QfU6/Eh4MU0EtrIx ZJcouOTDtsg9Mizc9U86+mlBzD6/Lruf7O0hwf/Z6eeTd9JcQbCeZSZ92fDotS34fLnwemYQv9e PHsOFgGi5BuhnKjIS4pOXte8lWp478/hcBz7adhdDEvczbTDHDnm1oHYqsjMaqWMVLBG7TnHb1w S7ib5XUSY9GI8mD3OYI9shimBPW/Ul99nikZUMkkYKglm/bow9OJ3CshQgFcDfdU8gNQmZgpJG5 StTAi6FAAub7eePFIw== X-Received: by 2002:a05:693c:2c11:b0:2df:7b88:a1b0 with SMTP id 5a478bee46e88-2fb4bdffa79mr234663eec.27.1778293183198; Fri, 08 May 2026 19:19:43 -0700 (PDT) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2f8860c7accsm4775298eec.8.2026.05.08.19.19.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 19:19:42 -0700 (PDT) From: Ethan Nelson-Moore To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Russell King , Ethan Nelson-Moore , stable@vger.kernel.org, Andrew Lunn , Sebastian Hesselbarth , Gregory Clement , Thomas Petazzoni , Jason Cooper Subject: [PATCH] arm: orion5x: correct machine ID check in mss2_pci_init() to use DT Date: Fri, 8 May 2026 19:19:34 -0700 Message-ID: <20260509021935.36898-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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 #include #include -#include +#include #include #include #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