From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 095EC386C1B for ; Mon, 1 Jun 2026 08:27:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780302446; cv=none; b=I4v8o18fq9yS0seOaIG1AKOYfNvGBXu0JCOYjASyRXFJxjj1AIwDv6/8g0LQFjzbrbS75LIVkAHgSl6KYuteIdsGqpYsHM6Mtv6oPwrwfxo5De1d8rcnNpIpcU0zlV3tL8Pcz5+TjI8nRN0JGhcP5vejBot8616QcQA0l0+29kA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780302446; c=relaxed/simple; bh=siOtx2PnyWasmO/zfgSD7vUqvfGwgVSmJy8p4cWT+pk=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=C9ExqeecnBZRTpHILNXmtVi4zcMZZOKuuxaiEECLwc2BVtYKzJJfzt6x9cTQwLkCag5X9FEr6CeFaKsCUdar0Pej5lePCstQpzMxodl2cQNUS4Qg6yB0nPQyolqeIFLAYq8UaifhLaCEKqmx69ekF8eaqVhSB4Xylbp9IdSNk/A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=zKTf4uRY; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="zKTf4uRY" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 61366C62471 for ; Mon, 1 Jun 2026 08:27:24 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 6946E602AB; Mon, 1 Jun 2026 08:27:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0978610888184; Mon, 1 Jun 2026 10:27:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1780302441; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=B9tMKdaDSBedzp8qAKz/UEFWM9tPRoPifmBmRGJiU5w=; b=zKTf4uRY/0T7zMNx8Z8+w4tOlBMbEz9sTfYqrVklUUWPJ4cu+qyA+e3VDa5hiEI8XaOQE3 faD0fiNnFmMOjl11Hc3tX/twyuIGfLq4NrkkXBHG4MwacEclrE7c5e25LAzxIyTLFDjiVE wvefP0Oq00i5IY0X9FwVf/4tJ3TWkLpMXujJ1jra0x95GUbf3L0tB60whIa71v+ysiVKsf AsDAooymVWRCdrN4Ruqo+ytWp8YWVO+aG5QHgnSH2JCPkNeAi5g1E+xKhpiyO9ImFVYVx9 EIE8WVqumpk/is66cma/L7AqIDSPf6HcX6g43rgoiWQsG/IAWGkT+KhwXJZejg== From: Gregory CLEMENT To: Ethan Nelson-Moore , linux-kernel@vger.kernel.org Cc: Ethan Nelson-Moore , Andrew Lunn , Sebastian Hesselbarth , Russell King Subject: Re: [PATCH v3] ARM: orion5x: update board check in mss2_pci_init() to use the DT In-Reply-To: <20260517023723.92731-1-enelsonmoore@gmail.com> References: <20260517023723.92731-1-enelsonmoore@gmail.com> Date: Mon, 01 Jun 2026 10:27:19 +0200 Message-ID: <87wlwizmvs.fsf@BLaptop.bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Last-TLS-Session-Version: TLSv1.3 Ethan Nelson-Moore writes: > The mss2_pci_init() function contains a check for the ARM machine ID > via the machine_is_mss2() macro. The board concerned now supports only > FDT booting, which does not use machine IDs, and therefore the code > should be updated to check the DT compatible property instead. The > machine was converted to FDT booting in commit fbf04d814d0a ("ARM: > orion5x: convert Maxtor Shared Storage II to the Device Tree"). The > presence of this machine ID check prevents the removal of machine IDs > no longer used by the kernel from arch/arm/tools/mach-types, because > the machine_is_*() macros are generated from mach-types. To resolve > this issue, use of_machine_is_compatible() instead. > > Signed-off-by: Ethan Nelson-Moore > --- > Changes from v1: Fix mistake in commit message and remove Fixes tag - > machine ID checks still work with DT booting if the bootloader passes > the ID > Changes from v2: correct changelog formatting (there were two --- > sections in v2) > Applied on mvebu/arm Thanks, Gregory > 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/b= oard-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 =3D { >=20=20 > 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); >=20=20 > return 0; > --=20 > 2.43.0 > --=20 Gr=C3=A9gory CLEMENT, Bootlin Embedded Linux and Kernel engineering https://bootlin.com