From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 A56281F3B87 for ; Sun, 10 May 2026 22:44:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778453096; cv=none; b=j/W4M5anqLyIvvKgDSTJD72vLeJ3vEEdyGzIQquBKH5eD4FiT01rb4m0hiioXvTAZQtVgruWd0oiLrtbTL3BD0IesmR5M7AnyVl8lGFUKYXesXTokcmfa+1qK+zBk+XQPDVC2zq/aIoW3qvJJcSIszeuiS/8qFwBUug6NGYi7Xo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778453096; c=relaxed/simple; bh=f/UQZHUfoOhQCbKQZE6RPZee9esll9fU/i8VwCx2tZE=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=F2HH8Cp/a3EPldbW9ZOPThGs+FHZwQ8cS2050Q+iplPtPaG8vWpyX0CyRBvLlcr6ZcZuxxiCjm2+xKTC+7PL7uT5QeCvkprNa/G+MnSVJBgfPQMpE0XECgyhbDA4n25raFnuyDcNUWcagCz84Jb8MH4gk5CCX3b1hotSObcZ8Tw= 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=hJMO6vyL; arc=none smtp.client-ip=209.85.221.53 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="hJMO6vyL" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-441209fb77eso2146268f8f.1 for ; Sun, 10 May 2026 15:44:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778453093; x=1779057893; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ORkzaNhzQYND0OJ7hwNxMTACXc6PhBBMRkbKhdMyyXc=; b=hJMO6vyLa0ajdwrgWH5BSqCZG6x8Yd90qkvLkfsn3lGk+I4OP9w3OVh7JHyVeDSaHJ e+H7QxeXaT10dLnL3NING/cZhxvUzT7X/Li/045nnBZrfkKGS7ZmQekRLPFUp8shfAnO R4gDrymPyQ/IBveL1svs/1ZF6wdwTn9m8glDCPVoWHmtYfk4yYMaDQvOWJ79/Cm89KlG QL19Xwab/ZtuZOdGdeoiyvuNZW9mr5qQp8cjry6Hvw6ywV8K2yt3gOQLFznzS7rl9ct0 75fjQrwdPwAMDIwvonw8hffNNC+6FHc5vfG/wArpt/Ftu+bv45SIA3CxuiSGB0t2cFOW 14rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778453093; x=1779057893; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ORkzaNhzQYND0OJ7hwNxMTACXc6PhBBMRkbKhdMyyXc=; b=VepN9llv2IO0g5eHH9Rc/SPD+O4+rCIitkJ4Ea/pVhm8iSxEMlRklbZcVjQ2RStaUl qv6Ej9qwbmm554ktY2f31IBa/eGNXRFDhoE6fgL8WwGAFkB5JD6RYZEfi0x+k1WaCrj0 p8x7+Sg6RhePXKxO2ei9fzoB4R4MY+h5HmUas12xr4z/SAsIZAoi1Anc7FA6g91Aip/H xWbn/OJ6woRNnchwmIM3/5bnsLUth016ZdgO1EQA2fAHg5etWstdrhnllNErFSHcilJq THHyi85crOrd5Jv06bJr5LNZtCKzX2yNTIhEh2WCQMM3n5WRLZqT/+dkCBhRa6ZIK4QZ M7Qw== X-Forwarded-Encrypted: i=1; AFNElJ9R2DKOsUnWvFsl0Rbl+1MtCVmPMiePJW9RmIBhQbZiZt0j9Qsp1fij1MiGg5ZzZ8GX4xalBbWj5uqUbzs=@vger.kernel.org X-Gm-Message-State: AOJu0YxKUgUfXBQeZynrrIV8/0XNJPLB/gePPWnWIXAv49RWshCVqxAX YtCaP+M1G6LwquOg452EEL1F8kjawAWjXm2N+unfHfv/HZRfH2flV8ao X-Gm-Gg: Acq92OFb7W/BLrHNpkq6oh+2XwtHx0VxAwBsEIpn2cZz2YhyLvkhzuLBizAI65HIUzh A1Y2NmNJMVeGoGccqbq8L6/oL7IB/L39BsZNiqtXiN5Wt17VHdkT/IX4vxoLV1WNBMjZ+T/nuW0 C780dr0mHyraCD7tSvCpH0E9bpsuJpcTZ6ZR2lT63z82RwXwlNqMtfu0uO1udcrydnFyItS0qGQ rim1CBuGZb0U3TU9oj8xzXY7DtsVHGW7oHZshfgqCVA9piEwTxi6HBCl7suSXP6W1pFV79C0nen MRIAMwRpky/Skw4hbr2DvszfaTceyxCwG0rcWdHcqYqR0FX/662oojLxyyDbZZRcQJtlmWaQHhQ ESEAgGEfffRUGXz+YuZDs2U4rfACGf7HAGcpJeoj7dgTlmhge8tw80ZSi/n77RK28cEBJOEicPH oJqs7VB/zBKZ/64MUGrogHMoKvX70WhuP7LxHudIqLBiKxJSQMCpw0nrmN8NRRrvp6wZIZz0KeW xVUze1m800XLgBYAlyDIVB91gT1 X-Received: by 2002:a5d:4573:0:b0:456:3af2:853d with SMTP id ffacd0b85a97d-4563af2887bmr7559734f8f.7.1778453092929; Sun, 10 May 2026 15:44:52 -0700 (PDT) Received: from 0.1.2.1.2.0.a.2.dynamic.cust.swisscom.net ([2a02:1210:8642:2b00:82ee:73ff:feb8:99e3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4548e6a68ebsm19461175f8f.1.2026.05.10.15.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2026 15:44:52 -0700 (PDT) Message-ID: Subject: Re: [PATCH] arm: boot: ep93xx: don't rely on machine_is_*() for removed board files From: Alexander Sverdlin To: Ethan Nelson-Moore , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Russell King , Hartley Sweeten , Nikita Shubin Date: Mon, 11 May 2026 00:45:04 +0200 In-Reply-To: <20260509223820.50347-1-enelsonmoore@gmail.com> References: <20260509223820.50347-1-enelsonmoore@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.60.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi Ethan, On Sat, 2026-05-09 at 15:38 -0700, Ethan Nelson-Moore wrote: > Code in misc-ep93xx.h relies on machine_is_*() macros for several > boards that no longer have legacy board files. They were removed in > commit e5ef574dda70 ("ARM: ep93xx: delete all boardfiles"). This > prevents the removal of machine IDs no longer used by the kernel from > mach-types. To resolve this issue, create local copies of these macros. > (The checks themselves are still valid because the IDs are still passed > in by the bootloader on these machines.) Also take the opportunity to > remove three repeated checks for the same ID. >=20 > Signed-off-by: Ethan Nelson-Moore Acked-by: Alexander Sverdlin I'll pick the patch and send it to Arnd if there will be no objection during this week. > --- > =C2=A0arch/arm/boot/compressed/misc-ep93xx.h | 20 ++++++++++++++++---- > =C2=A01 file changed, 16 insertions(+), 4 deletions(-) >=20 > diff --git a/arch/arm/boot/compressed/misc-ep93xx.h b/arch/arm/boot/compr= essed/misc-ep93xx.h > index 65b4121d1490..b0a1b42aab31 100644 > --- a/arch/arm/boot/compressed/misc-ep93xx.h > +++ b/arch/arm/boot/compressed/misc-ep93xx.h > @@ -3,7 +3,22 @@ > =C2=A0 * Copyright (C) 2006 Lennert Buytenhek > =C2=A0 */ > =C2=A0 > -#include > +/* > + * These machine IDs are no longer used by the kernel since EP93xx was c= onverted > + * to DT booting, but they are still passed in by bootloaders, so we use= our own > + * local definitions of the relevant macros. > + */ > +#define machine_is_bk3() (__machine_arch_type =3D=3D 1880) > +#define machine_is_edb9301() (__machine_arch_type =3D=3D 462) > +#define machine_is_edb9302a() (__machine_arch_type =3D=3D 1127) > +#define machine_is_edb9302() (__machine_arch_type =3D=3D 538) > +#define machine_is_edb9307a() (__machine_arch_type =3D=3D 1128) > +#define machine_is_edb9307() (__machine_arch_type =3D=3D 607) > +#define machine_is_edb9312() (__machine_arch_type =3D=3D 451) > +#define machine_is_edb9315a() (__machine_arch_type =3D=3D 772) > +#define machine_is_edb9315() (__machine_arch_type =3D=3D 463) > +#define machine_is_ts72xx() (__machine_arch_type =3D=3D 673) > +#define machine_is_vision_ep9307() (__machine_arch_type =3D=3D 1578) > =C2=A0 > =C2=A0static inline unsigned int __raw_readl(unsigned int ptr) > =C2=A0{ > @@ -60,14 +75,11 @@ static inline void ep93xx_decomp_setup(void) > =C2=A0 if (machine_is_edb9301() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_edb9302() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_edb9302a() || > - =C2=A0=C2=A0=C2=A0 machine_is_edb9302a() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_edb9307() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_edb9307a() || > - =C2=A0=C2=A0=C2=A0 machine_is_edb9307a() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_edb9312() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_edb9315() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_edb9315a() || > - =C2=A0=C2=A0=C2=A0 machine_is_edb9315a() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_ts72xx() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_bk3() || > =C2=A0 =C2=A0=C2=A0=C2=A0 machine_is_vision_ep9307()) --=20 Alexander Sverdlin.